add moss-ui

Author: xujin

moss-ui/.gitignore

@@ -0,0 +1,19 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/npm-debug.log*
+/yarn-error.log
+/yarn.lock
+/package-lock.json
+
+# production
+/dist
+dist.zip
+
+# misc
+.DS_Store
+
+# umi
+.umi
+.umi-production

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

@@ -100,9 +100,12 @@ const application = {
 
     return fetch({
       method: 'get',
+<<<<<<< HEAD
       headers: {
         Accept: '*/*'
       },
+=======
+>>>>>>> 07edb6c... add moss-ui
       url: `admin/instances/${id}/actuator/health`,
     })
       .then(data => {
@@ -147,9 +150,12 @@ const application = {
 
   fetchApplicationGCLog: (id: string, page = 1, size = 100): Promise<GCLogData> => {
     return fetch({
+<<<<<<< HEAD
       header: {
         Accept: 'application/json'
       },
+=======
+>>>>>>> 07edb6c... add moss-ui
       url: `admin/instances/${id}/actuator/gc?page=${page}&size=${size}`,
     }).then(data => {
       return model.GCLog(data)
@@ -188,7 +194,11 @@ const application = {
     const requestConf: any = {
       method: 'get',
       responseType: 'Arraybuffer',
+<<<<<<< HEAD
       url: `admin/instances/${id}/actuator/logfile/${value}`,
+=======
+      url: `admin/instances/${id}/actuator/${value}logfile`,
+>>>>>>> 07edb6c... add moss-ui
     }
 
     if (offset && offset > 0) {