Skip to content

Commit 10de96e

Browse files
committed
Support retrieve logfile type dynamically
1 parent 846f004 commit 10de96e

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

moss-ui/src/models/application/service.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,9 @@ const application = {
100100

101101
return fetch({
102102
method: 'get',
103-
<<<<<<< HEAD
104103
headers: {
105104
Accept: '*/*'
106105
},
107-
=======
108-
>>>>>>> 07edb6c... add moss-ui
109106
url: `admin/instances/${id}/actuator/health`,
110107
})
111108
.then(data => {
@@ -150,12 +147,9 @@ const application = {
150147

151148
fetchApplicationGCLog: (id: string, page = 1, size = 100): Promise<GCLogData> => {
152149
return fetch({
153-
<<<<<<< HEAD
154150
header: {
155151
Accept: 'application/json'
156152
},
157-
=======
158-
>>>>>>> 07edb6c... add moss-ui
159153
url: `admin/instances/${id}/actuator/gc?page=${page}&size=${size}`,
160154
}).then(data => {
161155
return model.GCLog(data)
@@ -194,11 +188,7 @@ const application = {
194188
const requestConf: any = {
195189
method: 'get',
196190
responseType: 'Arraybuffer',
197-
<<<<<<< HEAD
198191
url: `admin/instances/${id}/actuator/logfile/${value}`,
199-
=======
200-
url: `admin/instances/${id}/actuator/${value}logfile`,
201-
>>>>>>> 07edb6c... add moss-ui
202192
}
203193

204194
if (offset && offset > 0) {

0 commit comments

Comments
 (0)