项目结构调整

src/modules/admin/api.js

@@ -1,7 +1,5 @@
 import { $post, $postParam, qsRepeatParams } from "@/plugins/axios";
 
-// common-select
-
 // user-manage
 export const userListPage = (datas) => {
   return $postParam("/api/admin/user/query", datas);
@@ -21,6 +19,84 @@ export const userInsertOrUpdate = (datas) => {
     paramsSerializer: qsRepeatParams,
   });
 };
+export const userPermissionQuery = (userId) => {
+  return $postParam("/api/admin/user/permission/query", { userId });
+};
+export const userPermissionSave = (datas) => {
+  return $post("/api/admin/user/permission/save", datas);
+};
+
+// org-manage
+export const orgTypesList = () => {
+  return $postParam("/api/admin/org/types", {});
+};
+export const orgQuery = (datas) => {
+  return $postParam("/api/admin/org/query", datas);
+};
+export const orgInsertOrUpdate = (datas) => {
+  let formData = new FormData();
+  Object.entries(datas).forEach(([key, val]) => {
+    // if (val === null || val === "null" || val === "") return;
+
+    if (key === "subTypes") {
+      if (val.length) {
+        val.forEach((type) => formData.append("subTypes", type));
+      } else {
+        formData.append("subTypes", "");
+      }
+    } else {
+      formData.append(key, datas[key]);
+    }
+  });
+
+  if (datas.id) {
+    return $post("/api/admin/org/update", formData);
+  } else {
+    return $post("/api/admin/org/insert", formData);
+  }
+};
+// 启用/禁用
+export const orgToggle = (datas) => {
+  return $postParam("/api/admin/org/toggle", datas);
+};
+
+// wechat-app-manage
+/**
+ * @description 微信小程序查询
+ * @params { string } id  // 应用ID
+ * @params { string } nameStartWith  // 名称前缀
+ * @params { string } pageNumber  // 页码
+ * @params { string } pageSize  // 数量
+ */
+export const getWeChatAppList = (data) => {
+  const params = Object.entries(data).reduce((p, [key, val]) => {
+    if (val) {
+      p[key] = val;
+    }
+    return p;
+  }, {});
+  return $post("/api/admin/wxapp/query", new URLSearchParams(params));
+};
+
+/**
+ * @description 微信小程序新增
+ * @params { string } id  // 应用ID
+ * @params { string } name  // 名称
+ * @params { string } secret  // 密钥
+ */
+export const insertWeChatApp = (data) => {
+  return $post("/api/admin/wxapp/insert", new URLSearchParams(data));
+};
+
+/**
+ * @description 微信小程序修改
+ * @params { string } id  // 应用ID
+ * @params { string } name  // 名称
+ * @params { string } secret  // 密钥
+ */
+export const updateWeChatApp = (data) => {
+  return $post("/api/admin/wxapp/update", new URLSearchParams(data));
+};
 
 // app-manage
 export const appQuery = (datas) => {
@@ -184,74 +260,3 @@ export const appDeployDeviceDelete = ({ deployId, deviceId }) => {
     deviceId,
   });
 };
-// org-manage
-export const orgTypesList = () => {
-  return $postParam("/api/admin/org/types", {});
-};
-export const orgQuery = (datas) => {
-  return $postParam("/api/admin/org/query", datas);
-};
-export const orgInsertOrUpdate = (datas) => {
-  let formData = new FormData();
-  Object.entries(datas).forEach(([key, val]) => {
-    // if (val === null || val === "null" || val === "") return;
-
-    if (key === "subTypes") {
-      if (val.length) {
-        val.forEach((type) => formData.append("subTypes", type));
-      } else {
-        formData.append("subTypes", "");
-      }
-    } else {
-      formData.append(key, datas[key]);
-    }
-  });
-
-  if (datas.id) {
-    return $post("/api/admin/org/update", formData);
-  } else {
-    return $post("/api/admin/org/insert", formData);
-  }
-};
-// 启用/禁用
-export const orgToggle = (datas) => {
-  return $postParam("/api/admin/org/toggle", datas);
-};
-
-// wechat-app-manage
-/**
- * @description 微信小程序查询
- * @params { string } id  // 应用ID
- * @params { string } nameStartWith  // 名称前缀
- * @params { string } pageNumber  // 页码
- * @params { string } pageSize  // 数量
- */
-export const getWeChatAppList = (data) => {
-  const params = Object.entries(data).reduce((p, [key, val]) => {
-    if (val) {
-      p[key] = val;
-    }
-    return p;
-  }, {});
-  return $post("/api/admin/wxapp/query", new URLSearchParams(params));
-};
-
-/**
- * @description 微信小程序新增
- * @params { string } id  // 应用ID
- * @params { string } name  // 名称
- * @params { string } secret  // 密钥
- */
-export const insertWeChatApp = (data) => {
-  return $post("/api/admin/wxapp/insert", new URLSearchParams(data));
-};
-
-/**
- * @description 微信小程序修改
- * @params { string } id  // 应用ID
- * @params { string } name  // 名称
- * @params { string } secret  // 密钥
- */
-export const updateWeChatApp = (data) => {
-  return $post("/api/admin/wxapp/update", new URLSearchParams(data));
-};

src/modules/admin/components/AppConfigManage.vue → src/modules/admin/app-config/AppConfigManage.vue

@@ -198,9 +198,9 @@ import {
   appConfigList,
   appConfigItemDelete,
 } from "../api";
-import UpdateAppBaseline from "../components/UpdateAppBaseline.vue";
-import ModifyAppBaselineItem from "../components/ModifyAppBaselineItem.vue";
-import ModifyAppConfigItem from "../components/ModifyAppConfigItem.vue";
+import UpdateAppBaseline from "./UpdateAppBaseline.vue";
+import ModifyAppBaselineItem from "./ModifyAppBaselineItem.vue";
+import ModifyAppConfigItem from "./ModifyAppConfigItem.vue";
 import { deepCopy } from "@/plugins/utils";
 
 export default {

src/modules/admin/components/UpdateAppBaseline.vue → src/modules/admin/app-config/UpdateAppBaseline.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import UploadFetchFile from "../../../components/UploadFetchFile.vue";
+import UploadFetchFile from "@/components/UploadFetchFile.vue";
 import { appConfigBaselineUpdate } from "../api";
 
 export default {

src/modules/admin/components/AppDeployBindDevice.vue → src/modules/admin/app-deploy/AppDeployBindDevice.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { downloadBlob } from "../../../plugins/utils";
+import { downloadBlob } from "@/plugins/utils";
 import {
   appDeployDeviceList,
   appDeployDeviceDelete,

src/modules/admin/components/AppDeployDeviceUpload.vue → src/modules/admin/app-deploy/AppDeployDeviceUpload.vue

@@ -46,7 +46,7 @@
 
 <script>
 import { appDeployDeviceSave } from "../api";
-import UploadFetchFile from "../../../components/UploadFetchFile.vue";
+import UploadFetchFile from "@/components/UploadFetchFile.vue";
 
 const initModalForm = {
   id: "",

src/modules/admin/components/ModifyAppDeploy.vue → src/modules/admin/app-deploy/ModifyAppDeploy.vue

@@ -62,8 +62,8 @@
 </template>
 
 <script>
-import { DEPLOY_CONTROL_KEYS } from "../../../constants/enumerate";
-import { clearData } from "../../../plugins/utils";
+import { DEPLOY_CONTROL_KEYS } from "@/constants/enumerate";
+import { clearData } from "@/plugins/utils";
 import { appDeployInsertOrUpdate } from "../api";
 import AppDeployControlKey from "./AppDeployControlKey.vue";
 

src/modules/admin/components/AppEnvManage.vue → src/modules/admin/app-env/AppEnvManage.vue

@@ -84,8 +84,8 @@
 
 <script>
 import { appEnvList, appEnvTypes } from "../api";
-import { ABLE_TYPE } from "../../../constants/enumerate";
-import ModifyAppEnv from "../components/ModifyAppEnv.vue";
+import { ABLE_TYPE } from "@/constants/enumerate";
+import ModifyAppEnv from "./ModifyAppEnv.vue";
 
 export default {
   name: "app-env-manage",

src/modules/admin/components/AppModuleManage.vue → src/modules/admin/app-module/AppModuleManage.vue

@@ -116,8 +116,8 @@
 
 <script>
 import { appModuleList, appModuleEnable, appModuleTypes } from "../api";
-import { ABLE_TYPE } from "../../../constants/enumerate";
-import ModifyAppModule from "../components/ModifyAppModule.vue";
+import { ABLE_TYPE } from "@/constants/enumerate";
+import ModifyAppModule from "./ModifyAppModule.vue";
 
 export default {
   name: "app-module-manage",

src/modules/admin/components/AppUserManage.vue → src/modules/admin/app-user/AppUserManage.vue

@@ -86,7 +86,7 @@
 </template>
 
 <script>
-import { appUserList, appBindUser, userRoleList, userListPage } from "../api";
+import { userRoleList, userListPage, appUserList, appBindUser } from "../api";
 
 export default {
   name: "app-user-manage",

src/modules/admin/components/AppVersionManage.vue → src/modules/admin/app-version/AppVersionManage.vue

@@ -136,8 +136,8 @@ import {
   appVersionInsertOrUpdate,
   appSetMasterVersion,
 } from "../api";
-import { ARCHIVED_TYPE } from "../../../constants/enumerate";
-import ModifyAppVersion from "../components/ModifyAppVersion.vue";
+import { ARCHIVED_TYPE } from "@/constants/enumerate";
+import ModifyAppVersion from "./ModifyAppVersion.vue";
 
 export default {
   name: "app-version-manage",

src/modules/admin/views/AppManage.vue → src/modules/admin/app/AppManage.vue

@@ -139,14 +139,14 @@
 
 <script>
 import { appQuery } from "../api";
-import ModifyApp from "../components/ModifyApp";
-import AppUserManage from "../components/AppUserManage.vue";
-import AppDeployManage from "../components/AppDeployManage.vue";
-import AppModuleManage from "../components/AppModuleManage.vue";
-import AppVersionManage from "../components/AppVersionManage.vue";
-import AppEnvManage from "../components/AppEnvManage.vue";
-import AppConfigManage from "../components/AppConfigManage.vue";
-import AppNginxManage from "../components/AppNginxManage.vue";
+import ModifyApp from "./ModifyApp";
+import AppUserManage from "../app-user/AppUserManage.vue";
+import AppDeployManage from "../app-deploy/AppDeployManage.vue";
+import AppModuleManage from "../app-module/AppModuleManage.vue";
+import AppVersionManage from "../app-version/AppVersionManage.vue";
+import AppEnvManage from "../app-version/AppVersionManage.vue";
+import AppConfigManage from "../app-config/AppConfigManage.vue";
+import AppNginxManage from "../app-nginx/AppNginxManage.vue";
 
 export default {
   name: "app-manage",

src/modules/admin/components/ModifyOrg.vue → src/modules/admin/org/ModifyOrg.vue

@@ -95,7 +95,7 @@
 
 <script>
 import { orgInsertOrUpdate } from "../api";
-import UploadFetchFile from "../../../components/UploadFetchFile.vue";
+import UploadFetchFile from "@/components/UploadFetchFile.vue";
 
 const initModalForm = {
   id: "",

src/modules/admin/views/OrgManage.vue → src/modules/admin/org/OrgManage.vue

@@ -172,7 +172,7 @@
 <script>
 import { orgQuery, orgToggle } from "../api";
 import { ABLE_TYPE } from "@/constants/enumerate";
-import ModifyOrg from "../components/ModifyOrg";
+import ModifyOrg from "./ModifyOrg";
 
 export default {
   name: "org-manage",

src/modules/admin/router.js

@@ -1,12 +1,13 @@
-import AppManage from "./views/AppManage.vue";
-import OrgManage from "./views/OrgManage.vue";
-import WeChatAppManage from "./views/WeChatAppManage.vue";
+import AppManage from "./app/AppManage.vue";
+import UserManage from "./user/UserManage.vue";
+import OrgManage from "./org/OrgManage.vue";
+import WeChatAppManage from "./wx/WeChatAppManage.vue";
 
 export default [
   {
-    path: "app-manage",
-    name: "AppManage",
-    component: AppManage,
+    path: "user-manage",
+    name: "UserManage",
+    component: UserManage,
   },
   {
     path: "org-manage",
@@ -18,4 +19,9 @@ export default [
     name: "WeChatAppManage",
     component: WeChatAppManage,
   },
+  {
+    path: "app-manage",
+    name: "AppManage",
+    component: AppManage,
+  },
 ];

src/modules/base/api.js

@@ -1,27 +0,0 @@
-import { $post, $postParam, qsRepeatParams } from "@/plugins/axios";
-
-// user-manage
-export const userListPage = (datas) => {
-  return $postParam("/api/admin/user/query", datas);
-};
-export const userRoleList = (datas) => {
-  return $postParam("/api/admin/user/roles", datas);
-};
-export const userListQuery = (datas) => {
-  return $postParam("/api/admin/user/list", datas);
-};
-export const resetPwd = (password) => {
-  return $postParam("/api/admin/user/change_password", { password });
-};
-export const userInsertOrUpdate = (datas) => {
-  const url = datas.id ? "/api/admin/user/update" : "/api/admin/user/insert";
-  return $postParam(url, datas, {
-    paramsSerializer: qsRepeatParams,
-  });
-};
-export const userPermissionQuery = (userId) => {
-  return $postParam("/api/admin/user/permission/query", { userId });
-};
-export const userPermissionSave = (datas) => {
-  return $post("/api/admin/user/permission/save", datas);
-};

src/modules/base/router.js

@@ -1,21 +0,0 @@
-import UserManage from "./user/UserManage.vue";
-// import OrgManage from "./views/OrgManage.vue";
-// import WeChatAppManage from "./views/WeChatAppManage.vue";
-
-export default [
-  {
-    path: "user-manage",
-    name: "UserManage",
-    component: UserManage,
-  },
-  // {
-  //   path: "org-manage",
-  //   name: "OrgManage",
-  //   component: OrgManage,
-  // },
-  // {
-  //   path: "wxapp-manage",
-  //   name: "WeChatAppManage",
-  //   component: WeChatAppManage,
-  // },
-];

src/modules/login/views/Login.vue

@@ -49,8 +49,8 @@
 
 <script>
 import { login } from "../api";
-import { orgTypesList } from "../../../modules/admin/api";
-import { APP_TITLE } from "../../../constants/app";
+import { orgTypesList } from "../../admin/api";
+import { APP_TITLE } from "@/constants/app";
 
 export default {
   name: "login",

src/router.js

@@ -5,7 +5,6 @@ import Home from "./views/Home.vue";
 import login from "./modules/login/router";
 // module-admin
 import admin from "./modules/admin/router";
-import base from "./modules/base/router";
 
 // ignore NavigationDuplicated. https://github.com/vuejs/vue-router/issues/2881
 const originalPush = Router.prototype.push;
@@ -35,7 +34,7 @@ let router = new Router({
       path: "/admin",
       name: "Home",
       component: Home,
-      children: [...admin, ...base],
+      children: [...admin],
     },
     // [lazy-loaded] route level code-splitting
     // {

src/views/Home.vue

@@ -80,8 +80,8 @@
 
 <script>
 import { navs } from "@/constants/navs";
-import { APP_TITLE } from "../constants/app";
-import ResetPwd from "../modules/admin/components/ResetPwd";
+import { APP_TITLE } from "@/constants/app";
+import ResetPwd from "../modules/admin/user/ResetPwd";
 
 export default {
   name: "home",