Merge pull request #3 from hiparker/development

Development
hiparker · Jan 6, 2022 · 7dff0ea · 7dff0ea
2 parents de4c810 + 6864c82
commit 7dff0ea
Show file tree

Hide file tree

Showing 33 changed files with 391 additions and 183 deletions.
diff --git a/push.bat b/push.bat
@@ -2,8 +2,8 @@
 echo "Git Pushing ......"
 echo ""
 
-git push "[email protected]:hiparker/opsli-ui.git" master
-git push -f "[email protected]:hiparker/opsli-ui.git" master
+git push "[email protected]:hiparker/opsli-ui.git" development
+git push -f "[email protected]:hiparker/opsli-ui.git" development
 
 
 

diff --git a/push.sh b/push.sh
@@ -2,8 +2,8 @@
 echo "Git Pushing ......"
 echo ""
 
-git push "[email protected]:hiparker/opsli-ui.git" master
-git push -f "[email protected]:hiparker/opsli-ui.git" master
+git push "[email protected]:hiparker/opsli-ui.git" development
+git push -f "[email protected]:hiparker/opsli-ui.git" development
 
 
 

diff --git a/vue-admin-beautiful/package.json b/vue-admin-beautiful/package.json
@@ -48,6 +48,7 @@
     "clipboard": "^2.0.6",
     "codemirror": "5.45.0",
     "core-js": "^3.6.5",
+    "crypto-js": "^4.1.1",
     "dayjs": "^1.9.0",
     "echarts": "^4.9.0",
     "echarts-wordcloud": "^1.1.3",

diff --git a/vue-admin-beautiful/push.bat b/vue-admin-beautiful/push.bat
@@ -2,8 +2,8 @@
 echo "Git Pushing ......"
 echo ""
 
-git push "[email protected]:hiparker/opsli-ui.git" master
-git push -f "[email protected]:hiparker/opsli-ui.git" master
+git push "[email protected]:hiparker/opsli-ui.git" development
+git push -f "[email protected]:hiparker/opsli-ui.git" development
 
 
 

diff --git a/vue-admin-beautiful/push.sh b/vue-admin-beautiful/push.sh
@@ -2,8 +2,8 @@
 echo "Git Pushing ......"
 echo ""
 
-git push "[email protected]:hiparker/opsli-ui.git" master
-git push -f "[email protected]:hiparker/opsli-ui.git" master
+git push "[email protected]:hiparker/opsli-ui.git" development
+git push -f "[email protected]:hiparker/opsli-ui.git" development
 
 
 

diff --git a/vue-admin-beautiful/src/api/generator/tableManagement.js b/vue-admin-beautiful/src/api/generator/tableManagement.js
@@ -2,39 +2,39 @@ import request from "@/utils/request";
 
 export function getList(data) {
   return request({
-    url: "/api/generator/table/v1/findPage",
+    url: "/api/v1/generator/table/findPage",
     method: "get",
     params: data,
   });
 }
 
 export function doInsert(data) {
   return request({
-    url: "/api/generator/table/v1/insert",
+    url: "/api/v1/generator/table/insert",
     method: "post",
     data,
   });
 }
 
 export function doUpdate(data) {
   return request({
-    url: "/api/generator/table/v1/update",
+    url: "/api/v1/generator/table/update",
     method: "post",
     data,
   });
 }
 
 export function doDelete(data) {
   return request({
-    url: "/api/generator/table/v1/del",
+    url: "/api/v1/generator/table/del",
     method: "post",
     params: data,
   });
 }
 
 export function doDeleteAll(data) {
   return request({
-    url: "/api/generator/table/v1/delAll",
+    url: "/api/v1/generator/table/delAll",
     method: "post",
     params: data,
   });
@@ -44,30 +44,30 @@ export function doDeleteAll(data) {
 
 export function getSubList(data) {
   return request({
-    url: "/api/generator/table/v1/get",
+    url: "/api/v1/generator/table/get",
     method: "get",
     params: data,
   });
 }
 
 export function doSync(data) {
   return request({
-    url: "/api/generator/table/v1/sync",
+    url: "/api/v1/generator/table/sync",
     method: "post",
     params: data,
   });
 }
 
 export function getTables() {
   return request({
-    url: "/api/generator/table/v1/getTables",
+    url: "/api/v1/generator/table/getTables",
     method: "get",
   });
 }
 
 export function doImportTables(data) {
   return request({
-    url: "/api/generator/table/v1/importTables",
+    url: "/api/v1/generator/table/importTables",
     method: "post",
     params: data,
   });
@@ -77,15 +77,15 @@ export function doImportTables(data) {
 
 export function getGenLogs(data) {
   return request({
-    url: "/api/generator/logs/v1/getByTableId",
+    url: "/api/v1/generator/logs/getByTableId",
     method: "get",
     params: data,
   });
 }
 
 export function doCreate(data) {
   return request({
-    url: "/api/generator/logs/v1/create",
+    url: "/api/v1/generator/logs/create",
     method: "post",
     // 重要
     responseType: "blob",
@@ -95,37 +95,37 @@ export function doCreate(data) {
 
 export function doCreateMenu(data) {
   return request({
-    url: "/api/generator/logs/v1/createMenu",
+    url: "/api/v1/generator/logs/createMenu",
     method: "post",
     params: data,
   });
 }
 
 export function doCreateJson(data) {
   return {
-    url: "/api/generator/logs/v1/create",
+    url: "/api/v1/generator/logs/create",
     method: "get",
     params: data,
   };
 }
 
 export function getFieldTypes() {
   return request({
-    url: "/api/generator/table/v1/getFieldTypes",
+    url: "/api/v1/generator/table/getFieldTypes",
     method: "get",
   });
 }
 
 export function getJavaFieldTypes() {
   return request({
-    url: "/api/generator/table/v1/getJavaFieldTypes",
+    url: "/api/v1/generator/table/getJavaFieldTypes",
     method: "get",
   });
 }
 
 export function getJavaFieldTypesBySafety() {
   return request({
-    url: "/api/generator/table/v1/getJavaFieldTypesBySafety",
+    url: "/api/v1/generator/table/getJavaFieldTypesBySafety",
     method: "get",
   });
 }
diff --git a/vue-admin-beautiful/src/api/generator/template/GenTemplateManagement.js b/vue-admin-beautiful/src/api/generator/template/GenTemplateManagement.js
@@ -3,7 +3,7 @@ import { downloadFileByData } from "@/utils/download";
 
 export function getDetailListByParentId(parentId) {
   return request({
-    url: "/api/generator/template/detail/v1/findListByParentId",
+    url: "/api/v1/generator/template/detail/findListByParentId",
     method: "get",
     params: {
       parentId: parentId,
@@ -13,39 +13,39 @@ export function getDetailListByParentId(parentId) {
 
 export function getList(data) {
   return request({
-    url: "/api/generator/template/v1/findPage",
+    url: "/api/v1/generator/template/findPage",
     method: "get",
     params: data,
   });
 }
 
 export function doInsert(data) {
   return request({
-    url: "/api/generator/template/v1/insertAndDetail",
+    url: "/api/v1/generator/template/insertAndDetail",
     method: "post",
     data,
   });
 }
 
 export function doUpdate(data) {
   return request({
-    url: "/api/generator/template/v1/updateAndDetail",
+    url: "/api/v1/generator/template/updateAndDetail",
     method: "post",
     data,
   });
 }
 
 export function doCopy(data) {
   return request({
-    url: "/api/generator/template/v1/copy",
+    url: "/api/v1/generator/template/copy",
     method: "post",
     data,
   });
 }
 
 export function doDelete(data) {
   return request({
-    url: "/api/generator/template/v1/del",
+    url: "/api/v1/generator/template/del",
     method: "post",
     params: data,
   });

diff --git a/vue-admin-beautiful/src/api/gentest/carinfo/TestCarManagement.js b/vue-admin-beautiful/src/api/gentest/carinfo/TestCarManagement.js
@@ -3,39 +3,39 @@ import { downloadFileByData } from "@/utils/download";
 
 export function getList(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/findPage",
+    url: "/api/v1/gentest/carinfo/findPage",
     method: "get",
     params: data,
   });
 }
 
 export function doInsert(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/insert",
+    url: "/api/v1/gentest/carinfo/insert",
     method: "post",
     data,
   });
 }
 
 export function doUpdate(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/update",
+    url: "/api/v1/gentest/carinfo/update",
     method: "post",
     data,
   });
 }
 
 export function doDelete(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/del",
+    url: "/api/v1/gentest/carinfo/del",
     method: "post",
     params: data,
   });
 }
 
 export function doDeleteAll(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/delAll",
+    url: "/api/v1/gentest/carinfo/delAll",
     method: "post",
     params: data,
   });
@@ -47,7 +47,7 @@ export function doDeleteAll(data) {
  * @returns file
  */
 export function doExportExcel(data) {
-  let requestURL = "/api/gentest/carinfo/v1/exportExcel";
+  let requestURL = "/api/v1/gentest/carinfo/exportExcel";
   // 下载文件
   downloadFileByData(requestURL, data);
 }
@@ -58,7 +58,7 @@ export function doExportExcel(data) {
  */
 export function doDownloadTemplate() {
   let data = {};
-  let requestURL = "/api/gentest/carinfo/v1/importExcel/template";
+  let requestURL = "/api/v1/gentest/carinfo/importExcel/template";
   // 下载文件
   downloadFileByData(requestURL, data);
 }
@@ -69,7 +69,7 @@ export function doDownloadTemplate() {
  */
 export function doImportExcel(data) {
   return request({
-    url: "/api/gentest/carinfo/v1/importExcel",
+    url: "/api/v1/gentest/carinfo/importExcel",
     method: "post",
     // 最长超时时间 3分钟
     timeout: 180000,

diff --git a/vue-admin-beautiful/src/api/gentest/user/TestUserManagement.js b/vue-admin-beautiful/src/api/gentest/user/TestUserManagement.js
@@ -3,39 +3,39 @@ import { downloadFileByData } from "@/utils/download";
 
 export function getList(data) {
   return request({
-    url: "/api/gentest/user/v1/findPage",
+    url: "/api/v1/gentest/user/findPage",
     method: "get",
     params: data,
   });
 }
 
 export function doInsert(data) {
   return request({
-    url: "/api/gentest/user/v1/insert",
+    url: "/api/v1/gentest/user/insert",
     method: "post",
     data,
   });
 }
 
 export function doUpdate(data) {
   return request({
-    url: "/api/gentest/user/v1/update",
+    url: "/api/v1/gentest/user/update",
     method: "post",
     data,
   });
 }
 
 export function doDelete(data) {
   return request({
-    url: "/api/gentest/user/v1/del",
+    url: "/api/v1/gentest/user/del",
     method: "post",
     params: data,
   });
 }
 
 export function doDeleteAll(data) {
   return request({
-    url: "/api/gentest/user/v1/delAll",
+    url: "/api/v1/gentest/user/delAll",
     method: "post",
     params: data,
   });
@@ -47,7 +47,7 @@ export function doDeleteAll(data) {
  * @returns file
  */
 export function doExportExcel(data) {
-  let requestURL = "/api/gentest/user/v1/exportExcel";
+  let requestURL = "/api/v1/gentest/user/exportExcel";
   // 下载文件
   downloadFileByData(requestURL, data);
 }
@@ -58,7 +58,7 @@ export function doExportExcel(data) {
  */
 export function doDownloadTemplate() {
   let data = {};
-  let requestURL = "/api/gentest/user/v1/importExcel/template";
+  let requestURL = "/api/v1/gentest/user/importExcel/template";
   // 下载文件
   downloadFileByData(requestURL, data);
 }
@@ -69,7 +69,7 @@ export function doDownloadTemplate() {
  */
 export function doImportExcel(data) {
   return request({
-    url: "/api/gentest/user/v1/importExcel",
+    url: "/api/v1/gentest/user/importExcel",
     method: "post",
     // 最长超时时间 3分钟
     timeout: 180000,

diff --git a/vue-admin-beautiful/src/api/router.js b/vue-admin-beautiful/src/api/router.js
@@ -2,7 +2,7 @@ import request from "@/utils/request";
 
 export function getRouterList(data) {
   return request({
-    url: "/api/system/menu/v1/findMenuTree",
+    url: "/api/v1/system/menu/findMenuTree",
     method: "post",
     data,
   });