Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
db627bbe
Commit
db627bbe
authored
Jan 14, 2023
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix::测试接口
parent
e3b6a302
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
68 additions
and
60 deletions
+68
-60
device-manager-ui/admin/.env
device-manager-ui/admin/.env
+2
-4
device-manager-ui/admin/.env.development
device-manager-ui/admin/.env.development
+3
-0
device-manager-ui/admin/.env.production
device-manager-ui/admin/.env.production
+5
-2
device-manager-ui/admin/.env.test
device-manager-ui/admin/.env.test
+2
-2
device-manager-ui/admin/src/assets/utils/ajax.js
device-manager-ui/admin/src/assets/utils/ajax.js
+56
-52
No files found.
device-manager-ui/admin/.env
View file @
db627bbe
# 开发环境配置
NODE_ENV = development
# 地址
VUE_APP_BASE_API =
http://plm.testnew.com:8084
/m
VUE_APP_BASE_API =
127.0.0.1:18222
/m
# websocket地址
VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
#
VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
# 门户登录地址
VUE_APP_PORTAL_URL = http://192.168.0.98:11072
...
...
device-manager-ui/admin/.env.development
0 → 100644
View file @
db627bbe
#开发环境
NODE_ENV = "development"
VUE_APP_API_BASE_URL= http://192.168.0.98:11091/m
device-manager-ui/admin/.env.production
View file @
db627bbe
# 生产环境配置
NODE_ENV = production
# 地址
VUE_APP_BASE_API = /basics_api/m
# websocket地址
VUE_APP_WEBSOCKET_API =192.168.0.
251
:18222/m
VUE_APP_WEBSOCKET_API =192.168.0.
98
:18222/m
# 门户登录地址
VUE_APP_PORTAL_URL =/portal_home
# 站点请求地址
VUE_APP_SITETREE_URL = http://192.168.0.251:11078/base/site/siteTree
\ No newline at end of file
VUE_APP_SITETREE_URL = /basics_api/base/site/siteTree
\ No newline at end of file
device-manager-ui/admin/.env.test
View file @
db627bbe
...
...
@@ -2,7 +2,7 @@
NODE_ENV
=
'test'
# 地址
VUE_APP_BASE_API
=
http
://
192.168
.
0.98
:
11091
/
m
VUE_APP_BASE_API
=
/
basics_api
/
m
# websocket地址
VUE_APP_WEBSOCKET_API
=
192.168
.
0.98
:
18222
/
m
...
...
@@ -12,4 +12,4 @@ VUE_APP_PORTAL_URL =/portal_home
# 站点请求地址
VUE_APP_SITETREE_URL
=
http
://
192.168
.
0.98
:
11078
/
base
/
site
/
siteTree
\ No newline at end of file
VUE_APP_SITETREE_URL
=
/
basics_api
/
base
/
site
/
siteTree
\ No newline at end of file
device-manager-ui/admin/src/assets/utils/ajax.js
View file @
db627bbe
import
axios
from
'
axios
'
;
import
Qs
from
'
qs
'
;
const
JSONbig
=
require
(
'
json-bigint
'
)({
"
storeAsString
"
:
true
});
import
cookie
from
'
./cookie
'
;
import
httpErrorHandler
from
'
./httpErrorHandler
'
;
import
axios
from
"
axios
"
;
// import Qs from "qs"
;
const
JSONbig
=
require
(
"
json-bigint
"
)({
storeAsString
:
true
});
// import cookie from "./cookie"
;
import
httpErrorHandler
from
"
./httpErrorHandler
"
;
const
instance
=
axios
.
create
({
baseURL
:
'
/m
'
,
baseURL
:
process
.
env
.
VUE_APP_BASE_API
,
headers
:
{
post
:
{
'
Content-Type
'
:
'
application/json;charset=UTF-8
'
,
'
dataType
'
:
'
json
'
,
}
"
Content-Type
"
:
"
application/json;charset=UTF-8
"
,
dataType
:
"
json
"
,
}
,
},
transformResponse
:
[
data
=>
{
try
{
JSON
.
parse
(
data
);
return
JSONbig
.
parse
(
data
);
}
catch
(
error
)
{
return
data
;
}
}],
transformResponse
:
[
(
data
)
=>
{
try
{
JSON
.
parse
(
data
);
return
JSONbig
.
parse
(
data
);
}
catch
(
error
)
{
return
data
;
}
},
],
});
instance
.
interceptors
.
request
.
use
(
(
config
)
=>
{
//config.data = Qs.stringify(config.data, {arrayFormat: 'repeat', allowDots: true});
//config.data = Qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true});
//brackets
// 也可以在这里给请求添加token之类的字段
// config.headers['Content-Type'] = 'application/json;charset=UTF-8'
// config.headers.timestamp = Math.floor(new Date().getTime() / 1000)
// console.log("sessionStorage",window.sessionStorage)
config
.
headers
.
Authorization
=
window
.
sessionStorage
.
getItem
(
"
token
"
)
||
""
;
//console.log("request config and session",config,window.sessionStorage);
console
.
log
(
"
>>>
"
,
config
);
return
config
;
},
(
err
)
=>
{
return
Promise
.
reject
(
err
);
}
);
instance
.
interceptors
.
request
.
use
(
config
=>
{
//config.data = Qs.stringify(config.data, {arrayFormat: 'repeat', allowDots: true});
//config.data = Qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true});
//brackets
// 也可以在这里给请求添加token之类的字段
// config.headers['Content-Type'] = 'application/json;charset=UTF-8'
// config.headers.timestamp = Math.floor(new Date().getTime() / 1000)
// console.log("sessionStorage",window.sessionStorage)
config
.
headers
.
Authorization
=
window
.
sessionStorage
.
getItem
(
'
token
'
)
||
''
//console.log("request config and session",config,window.sessionStorage);
return
config
;
},
err
=>
{
return
Promise
.
reject
(
err
);
});
instance
.
interceptors
.
response
.
use
(
response
=>
{
return
response
.
data
},
httpErrorHandler
);
instance
.
interceptors
.
response
.
use
((
response
)
=>
{
return
response
.
data
;
},
httpErrorHandler
);
/**
* 封装后的axios post方法
...
...
@@ -52,9 +57,9 @@ instance.interceptors.response.use(response=>{
*/
export
function
post
(
url
,
option
,
config
=
{})
{
const
data
=
Object
.
assign
({},
option
,
{
// __mortals_token__: cookie.getItem('__mortals_token__'),
})
return
instance
.
post
(
url
,
data
,
config
)
// __mortals_token__: cookie.getItem('__mortals_token__'),
})
;
return
instance
.
post
(
url
,
data
,
config
)
;
}
/**
...
...
@@ -68,24 +73,23 @@ export function post(url, option, config = {}) {
export
function
get
(
url
,
option
,
config
=
{})
{
const
data
=
Object
.
assign
({},
option
,
{
//__mortals_token__: cookie.getItem('__mortals_token__'),
})
return
instance
.
get
(
url
,
{
params
:
data
},
config
)
})
;
return
instance
.
get
(
url
,
{
params
:
data
},
config
)
;
}
// 文件上传
const
uploadInstance
=
axios
.
create
({
baseURL
:
'
/m
'
,
baseURL
:
"
/m
"
,
headers
:
{
post
:
{
'
Content-Type
'
:
'
multipart/form-data
'
,
}
}
"
Content-Type
"
:
"
multipart/form-data
"
,
}
,
}
,
});
uploadInstance
.
interceptors
.
response
.
use
(
response
=>
{
return
response
.
data
},
httpErrorHandler
);
uploadInstance
.
interceptors
.
response
.
use
(
(
response
)
=>
{
return
response
.
data
;
},
httpErrorHandler
);
/**
* 封装后的axios upload方法
...
...
@@ -97,8 +101,8 @@ uploadInstance.interceptors.response.use(response=>{
*/
export
function
upload
(
url
,
option
,
config
=
{})
{
let
formdata
=
new
FormData
();
Object
.
keys
(
option
).
forEach
(
key
=>
{
formdata
.
append
(
key
,
option
[
key
])
})
return
uploadInstance
.
post
(
url
,
formdata
,
config
)
Object
.
keys
(
option
).
forEach
(
(
key
)
=>
{
formdata
.
append
(
key
,
option
[
key
])
;
})
;
return
uploadInstance
.
post
(
url
,
formdata
,
config
)
;
}
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