File tree Expand file tree Collapse file tree 1 file changed +0
-10
lines changed
moss-ui/src/models/application Expand file tree Collapse file tree 1 file changed +0
-10
lines changed Original file line number Diff line number Diff line change @@ -100,12 +100,9 @@ const application = {
100
100
101
101
return fetch ( {
102
102
method : 'get' ,
103
- < << << << HEAD
104
103
headers : {
105
104
Accept : '*/*'
106
105
} ,
107
- = === ===
108
- >>> >>> > 07 edb6c ... add moss - ui
109
106
url : `admin/instances/${ id } /actuator/health` ,
110
107
} )
111
108
. then ( data => {
@@ -150,12 +147,9 @@ const application = {
150
147
151
148
fetchApplicationGCLog : ( id : string , page = 1 , size = 100 ) : Promise < GCLogData > => {
152
149
return fetch ( {
153
- < << << << HEAD
154
150
header : {
155
151
Accept : 'application/json'
156
152
} ,
157
- = === ===
158
- >>> > >>> 07 edb6c ... add moss - ui
159
153
url : `admin/instances/${ id } /actuator/gc?page=${ page } &size=${ size } ` ,
160
154
} ) . then ( data => {
161
155
return model . GCLog ( data )
@@ -194,11 +188,7 @@ const application = {
194
188
const requestConf : any = {
195
189
method : 'get' ,
196
190
responseType : 'Arraybuffer' ,
197
- < << << << HEAD
198
191
url : `admin/instances/${ id } /actuator/logfile/${ value } ` ,
199
- = === ===
200
- url : `admin/instances/${ id } /actuator/${ value } logfile` ,
201
- > >>> >>> 07 edb6c ... add moss - ui
202
192
}
203
193
204
194
if ( offset && offset > 0 ) {
You can’t perform that action at this time.
0 commit comments