From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

---
 src/api/system.ts |   88 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/src/api/system.ts b/src/api/system.ts
index 5559e5c..91216d5 100644
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -255,6 +255,13 @@
   });
 };
 
+export const getAppUpgradeNotice = (query: any) => {
+  return request({
+    url: "/data/api-v/app/upgrade/notice",
+    method: "get",
+    params: query
+  });
+};
 
 export const fileUpload = "/data/api-v/sysset/patchUpdate"
 
@@ -274,25 +281,61 @@
   });
 };
 
-export const checkNewVersion = (query: any) => {
+export const checkNewVersion = () => {
   return request({
     url: "/version/check",
     method: "get"
   });
 };
 
-export const upgradeNewVersion = (query: any) => {
+export const upgradeNewVersion = () => {
   return request({
     url: "/version/upgrade",
     method: "get"
   });
 };
 
+export const getUpgradeNotice = () => {
+  return request({
+    url: "/version/notice",
+    method: "get"
+  });
+};
+
+
+
+export const delayUpgradeNotice = (query: any) => {
+  return request({
+    url: "/version/notice/delay",
+    method: "post",
+    data: qs.stringify(query)
+  });
+};
+
+
+export const delayAppNotice = (query: any) => {
+  return request({
+    url: "/data/api-v/app/upgrade/notice/delay",
+    method: "post",
+    data: qs.stringify(query)
+  });
+};
+
+
+
 export const uploadUpgradePkg = (data: any) => {
   return request({
     url: "/version/upload/zip",
     method: "post",
     data
+  })
+}
+
+export const rollback = (query: any) => {
+  return request({
+    url: "/version/rollback",
+    method: "post",
+    data: qs.stringify(query)
   })
 }
 
@@ -304,7 +347,7 @@
   })
 }
 
-export const getSettings = (query: any) => {
+export const getSettings = () => {
   return request({
     url: "/version/settings",
     method: "get",
@@ -319,3 +362,42 @@
   })
 }
 
+export const getActiveQrCode = (query: any) => {
+  return request({
+    url: "/version/offline/qrcode",
+    method: "get",
+    params: query
+  })
+}
+
+export const getSN = (query: any) => {
+  return request({
+    url: "/version/sn",
+    method: "get",
+    params: query
+  })
+}
+
+export const cancelAuthorization = (query: any) => {
+  return request({
+    url: "/version/cancelAuthorization",
+    method: "post",
+    data: qs.stringify(query),
+    responseType: "blob"
+  })
+}
+
+export const activateVersion = (query: any) => {
+  return request({
+    url: "/version/authorization",
+    method: "post",
+    data: qs.stringify(query)
+  })
+}
+export const uploadKey = (data: any) => {
+  return request({
+    url: "/version/authorization/upload",
+    method: "post",
+    data
+  })
+}

--
Gitblit v1.8.0