Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base
#	vite.config.js

.env

@@ -1,6 +1,9 @@
 # 标题
 VITE_APP_TITLE=CRM管理系统
 
+# 开发环境
+VITE_NODE_ENV=development
+
 # 项目本地运行端口号
 VITE_PORT=80
 
@@ -8,7 +11,7 @@ VITE_PORT=80
 VITE_OPEN=true
 
 # 租户开关
-VITE_APP_TENANT_ENABLE=true
+VITE_APP_TENANT_ENABLE=false
 
 # 验证码的开关
 VITE_APP_CAPTCHA_ENABLE=true

.env.dev

@@ -1,5 +1,5 @@
 # 开发环境
-NODE_ENV=production
+VITE_NODE_ENV=production
 
 VITE_DEV=false
 

.env.front

@@ -1,10 +1,10 @@
 # 本地开发环境
-NODE_ENV=development
+VITE_NODE_ENV=development
 
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='http://118.31.23.45:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'

.env.pro

@@ -1,5 +1,5 @@
 # 生产环境
-NODE_ENV=production
+VITE_NODE_ENV=production
 
 VITE_DEV=false
 

.env.stage

@@ -1,5 +1,5 @@
 # 生产环境
-NODE_ENV=production
+VITE_NODE_ENV=production
 
 VITE_DEV=false
 

.env.static

@@ -1,5 +1,5 @@
 # 开发环境
-NODE_ENV=production
+VITE_NODE_ENV=production
 
 VITE_DEV=false
 

.env.test

@@ -1,5 +1,5 @@
 # 测试环境
-NODE_ENV=production
+VITE_NODE_ENV=production
 
 VITE_DEV=false
 

.vscode/settings.json

@@ -14,7 +14,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
   },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "yudao-ui-admin-vue3",
-  "version": "1.7.3-snapshot",
-  "description": "基于vue3、vite4、element-plus、typesScript",
-  "author": "xingyu",
+  "name": "ss-crm-manage",
+  "version": "1.0.0",
+  "description": "莳松crm管理系统",
+  "author": "ss",
   "private": false,
   "scripts": {
     "i": "pnpm install",
@@ -137,13 +137,5 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/yudaocode/yudao-ui-admin-vue3"
-  },
-  "bugs": {
-    "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
-  },
-  "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3"
+  "license": "MIT"
 }

src/api/bpm/activity/index.ts

@@ -1,8 +0,0 @@
-import request from '@/config/axios'
-
-export const getActivityList = async (params) => {
-  return await request.get({
-    url: '/bpm/activity/list',
-    params
-  })
-}

src/api/bpm/definition/index.ts

@@ -1,21 +0,0 @@
-import request from '@/config/axios'
-
-export const getProcessDefinitionBpmnXML = async (id: number) => {
-  return await request.get({
-    url: '/bpm/process-definition/get-bpmn-xml?id=' + id
-  })
-}
-
-export const getProcessDefinitionPage = async (params) => {
-  return await request.get({
-    url: '/bpm/process-definition/page',
-    params
-  })
-}
-
-export const getProcessDefinitionList = async (params) => {
-  return await request.get({
-    url: '/bpm/process-definition/list',
-    params
-  })
-}

src/api/bpm/form/index.ts

@@ -1,56 +0,0 @@
-import request from '@/config/axios'
-
-export type FormVO = {
-  id: number
-  name: string
-  conf: string
-  fields: string[]
-  status: number
-  remark: string
-  createTime: string
-}
-
-// 创建工作流的表单定义
-export const createForm = async (data: FormVO) => {
-  return await request.post({
-    url: '/bpm/form/create',
-    data: data
-  })
-}
-
-// 更新工作流的表单定义
-export const updateForm = async (data: FormVO) => {
-  return await request.put({
-    url: '/bpm/form/update',
-    data: data
-  })
-}
-
-// 删除工作流的表单定义
-export const deleteForm = async (id: number) => {
-  return await request.delete({
-    url: '/bpm/form/delete?id=' + id
-  })
-}
-
-// 获得工作流的表单定义
-export const getForm = async (id: number) => {
-  return await request.get({
-    url: '/bpm/form/get?id=' + id
-  })
-}
-
-// 获得工作流的表单定义分页
-export const getFormPage = async (params) => {
-  return await request.get({
-    url: '/bpm/form/page',
-    params
-  })
-}
-
-// 获得动态表单的精简列表
-export const getSimpleFormList = async () => {
-  return await request.get({
-    url: '/bpm/form/list-all-simple'
-  })
-}

src/api/bpm/leave/index.ts

@@ -1,27 +0,0 @@
-import request from '@/config/axios'
-
-export type LeaveVO = {
-  id: number
-  result: number
-  type: number
-  reason: string
-  processInstanceId: string
-  startTime: string
-  endTime: string
-  createTime: string
-}
-
-// 创建请假申请
-export const createLeave = async (data: LeaveVO) => {
-  return await request.post({ url: '/bpm/oa/leave/create', data: data })
-}
-
-// 获得请假申请
-export const getLeave = async (id: number) => {
-  return await request.get({ url: '/bpm/oa/leave/get?id=' + id })
-}
-
-// 获得请假申请分页
-export const getLeavePage = async (params: PageParam) => {
-  return await request.get({ url: '/bpm/oa/leave/page', params })
-}

src/api/bpm/model/index.ts

@@ -1,59 +0,0 @@
-import request from '@/config/axios'
-
-export type ProcessDefinitionVO = {
-  id: string
-  version: number
-  deploymentTIme: string
-  suspensionState: number
-}
-
-export type ModelVO = {
-  id: number
-  formName: string
-  key: string
-  name: string
-  description: string
-  category: string
-  formType: number
-  formId: number
-  formCustomCreatePath: string
-  formCustomViewPath: string
-  processDefinition: ProcessDefinitionVO
-  status: number
-  remark: string
-  createTime: string
-  bpmnXml: string
-}
-
-export const getModelPage = async (params) => {
-  return await request.get({ url: '/bpm/model/page', params })
-}
-
-export const getModel = async (id: number) => {
-  return await request.get({ url: '/bpm/model/get?id=' + id })
-}
-
-export const updateModel = async (data: ModelVO) => {
-  return await request.put({ url: '/bpm/model/update', data: data })
-}
-
-// 任务状态修改
-export const updateModelState = async (id: number, state: number) => {
-  const data = {
-    id: id,
-    state: state
-  }
-  return await request.put({ url: '/bpm/model/update-state', data: data })
-}
-
-export const createModel = async (data: ModelVO) => {
-  return await request.post({ url: '/bpm/model/create', data: data })
-}
-
-export const deleteModel = async (id: number) => {
-  return await request.delete({ url: '/bpm/model/delete?id=' + id })
-}
-
-export const deployModel = async (id: number) => {
-  return await request.post({ url: '/bpm/model/deploy?id=' + id })
-}

src/api/bpm/processInstance/index.ts

@@ -1,41 +0,0 @@
-import request from '@/config/axios'
-
-export type Task = {
-  id: string
-  name: string
-}
-
-export type ProcessInstanceVO = {
-  id: number
-  name: string
-  processDefinitionId: string
-  category: string
-  result: number
-  tasks: Task[]
-  fields: string[]
-  status: number
-  remark: string
-  businessKey: string
-  createTime: string
-  endTime: string
-}
-
-export const getMyProcessInstancePage = async (params) => {
-  return await request.get({ url: '/bpm/process-instance/my-page', params })
-}
-
-export const createProcessInstance = async (data) => {
-  return await request.post({ url: '/bpm/process-instance/create', data: data })
-}
-
-export const cancelProcessInstance = async (id: number, reason: string) => {
-  const data = {
-    id: id,
-    reason: reason
-  }
-  return await request.delete({ url: '/bpm/process-instance/cancel', data: data })
-}
-
-export const getProcessInstance = async (id: number) => {
-  return await request.get({ url: '/bpm/process-instance/get?id=' + id })
-}

src/api/bpm/task/index.ts

@@ -1,43 +0,0 @@
-import request from '@/config/axios'
-
-export type TaskVO = {
-  id: number
-}
-
-export const getTodoTaskPage = async (params) => {
-  return await request.get({ url: '/bpm/task/todo-page', params })
-}
-
-export const getDoneTaskPage = async (params) => {
-  return await request.get({ url: '/bpm/task/done-page', params })
-}
-
-export const completeTask = async (data) => {
-  return await request.put({ url: '/bpm/task/complete', data })
-}
-
-export const approveTask = async (data) => {
-  return await request.put({ url: '/bpm/task/approve', data })
-}
-
-export const rejectTask = async (data) => {
-  return await request.put({ url: '/bpm/task/reject', data })
-}
-export const backTask = async (data) => {
-  return await request.put({ url: '/bpm/task/back', data })
-}
-
-export const updateTaskAssignee = async (data) => {
-  return await request.put({ url: '/bpm/task/update-assignee', data })
-}
-
-export const getTaskListByProcessInstanceId = async (processInstanceId) => {
-  return await request.get({
-    url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId
-  })
-}
-
-// 导出任务
-export const exportTask = async (params) => {
-  return await request.download({ url: '/bpm/task/export', params })
-}

src/api/bpm/taskAssignRule/index.ts

@@ -1,29 +0,0 @@
-import request from '@/config/axios'
-
-export type TaskAssignVO = {
-  id: number
-  modelId: string
-  processDefinitionId: string
-  taskDefinitionKey: string
-  taskDefinitionName: string
-  options: string[]
-  type: number
-}
-
-export const getTaskAssignRuleList = async (params) => {
-  return await request.get({ url: '/bpm/task-assign-rule/list', params })
-}
-
-export const createTaskAssignRule = async (data: TaskAssignVO) => {
-  return await request.post({
-    url: '/bpm/task-assign-rule/create',
-    data: data
-  })
-}
-
-export const updateTaskAssignRule = async (data: TaskAssignVO) => {
-  return await request.put({
-    url: '/bpm/task-assign-rule/update',
-    data: data
-  })
-}

src/api/bpm/userGroup/index.ts

@@ -1,47 +0,0 @@
-import request from '@/config/axios'
-
-export type UserGroupVO = {
-  id: number
-  name: string
-  description: string
-  memberUserIds: number[]
-  status: number
-  remark: string
-  createTime: string
-}
-
-// 创建用户组
-export const createUserGroup = async (data: UserGroupVO) => {
-  return await request.post({
-    url: '/bpm/user-group/create',
-    data: data
-  })
-}
-
-// 更新用户组
-export const updateUserGroup = async (data: UserGroupVO) => {
-  return await request.put({
-    url: '/bpm/user-group/update',
-    data: data
-  })
-}
-
-// 删除用户组
-export const deleteUserGroup = async (id: number) => {
-  return await request.delete({ url: '/bpm/user-group/delete?id=' + id })
-}
-
-// 获得用户组
-export const getUserGroup = async (id: number) => {
-  return await request.get({ url: '/bpm/user-group/get?id=' + id })
-}
-
-// 获得用户组分页
-export const getUserGroupPage = async (params) => {
-  return await request.get({ url: '/bpm/user-group/page', params })
-}
-
-// 获取用户组精简信息列表
-export const getSimpleUserGroupList = async (): Promise<UserGroupVO[]> => {
-  return await request.get({ url: '/bpm/user-group/list-all-simple' })
-}

src/api/infra/apiAccessLog/index.ts

@@ -1,30 +0,0 @@
-import request from '@/config/axios'
-
-export interface ApiAccessLogVO {
-  id: number
-  traceId: string
-  userId: number
-  userType: number
-  applicationName: string
-  requestMethod: string
-  requestParams: string
-  requestUrl: string
-  userIp: string
-  userAgent: string
-  beginTime: Date
-  endTIme: Date
-  duration: number
-  resultCode: number
-  resultMsg: string
-  createTime: Date
-}
-
-// 查询列表API 访问日志
-export const getApiAccessLogPage = (params: PageParam) => {
-  return request.get({ url: '/infra/api-access-log/page', params })
-}
-
-// 导出API 访问日志
-export const exportApiAccessLog = (params) => {
-  return request.download({ url: '/infra/api-access-log/export-excel', params })
-}

src/api/infra/apiErrorLog/index.ts

@@ -1,48 +0,0 @@
-import request from '@/config/axios'
-
-export interface ApiErrorLogVO {
-  id: number
-  traceId: string
-  userId: number
-  userType: number
-  applicationName: string
-  requestMethod: string
-  requestParams: string
-  requestUrl: string
-  userIp: string
-  userAgent: string
-  exceptionTime: Date
-  exceptionName: string
-  exceptionMessage: string
-  exceptionRootCauseMessage: string
-  exceptionStackTrace: string
-  exceptionClassName: string
-  exceptionFileName: string
-  exceptionMethodName: string
-  exceptionLineNumber: number
-  processUserId: number
-  processStatus: number
-  processTime: Date
-  resultCode: number
-  createTime: Date
-}
-
-// 查询列表API 访问日志
-export const getApiErrorLogPage = (params: PageParam) => {
-  return request.get({ url: '/infra/api-error-log/page', params })
-}
-
-// 更新 API 错误日志的处理状态
-export const updateApiErrorLogPage = (id: number, processStatus: number) => {
-  return request.put({
-    url: '/infra/api-error-log/update-status?id=' + id + '&processStatus=' + processStatus
-  })
-}
-
-// 导出API 访问日志
-export const exportApiErrorLog = (params) => {
-  return request.download({
-    url: '/infra/api-error-log/export-excel',
-    params
-  })
-}

src/api/infra/codegen/index.ts

@@ -1,123 +0,0 @@
-import request from '@/config/axios'
-
-export type CodegenTableVO = {
-  id: number
-  tableId: number
-  isParentMenuIdValid: boolean
-  dataSourceConfigId: number
-  scene: number
-  tableName: string
-  tableComment: string
-  remark: string
-  moduleName: string
-  businessName: string
-  className: string
-  classComment: string
-  author: string
-  createTime: Date
-  updateTime: Date
-  templateType: number
-  parentMenuId: number
-}
-
-export type CodegenColumnVO = {
-  id: number
-  tableId: number
-  columnName: string
-  dataType: string
-  columnComment: string
-  nullable: number
-  primaryKey: number
-  autoIncrement: string
-  ordinalPosition: number
-  javaType: string
-  javaField: string
-  dictType: string
-  example: string
-  createOperation: number
-  updateOperation: number
-  listOperation: number
-  listOperationCondition: string
-  listOperationResult: number
-  htmlType: string
-}
-
-export type DatabaseTableVO = {
-  name: string
-  comment: string
-}
-
-export type CodegenDetailVO = {
-  table: CodegenTableVO
-  columns: CodegenColumnVO[]
-}
-
-export type CodegenPreviewVO = {
-  filePath: string
-  code: string
-}
-
-export type CodegenUpdateReqVO = {
-  table: CodegenTableVO | any
-  columns: CodegenColumnVO[]
-}
-
-export type CodegenCreateListReqVO = {
-  dataSourceConfigId: number
-  tableNames: string[]
-}
-
-// 查询列表代码生成表定义
-export const getCodegenTablePage = (params: PageParam) => {
-  return request.get({ url: '/infra/codegen/table/page', params })
-}
-
-// 查询详情代码生成表定义
-export const getCodegenTable = (id: number) => {
-  return request.get({ url: '/infra/codegen/detail?tableId=' + id })
-}
-
-// 新增代码生成表定义
-export const createCodegenTable = (data: CodegenCreateListReqVO) => {
-  return request.post({ url: '/infra/codegen/create', data })
-}
-
-// 修改代码生成表定义
-export const updateCodegenTable = (data: CodegenUpdateReqVO) => {
-  return request.put({ url: '/infra/codegen/update', data })
-}
-
-// 基于数据库的表结构，同步数据库的表和字段定义
-export const syncCodegenFromDB = (id: number) => {
-  return request.put({ url: '/infra/codegen/sync-from-db?tableId=' + id })
-}
-
-// 基于 SQL 建表语句，同步数据库的表和字段定义
-export const syncCodegenFromSQL = (id: number, sql: string) => {
-  return request.put({ url: '/infra/codegen/sync-from-sql?tableId=' + id + '&sql=' + sql })
-}
-
-// 预览生成代码
-export const previewCodegen = (id: number) => {
-  return request.get({ url: '/infra/codegen/preview?tableId=' + id })
-}
-
-// 下载生成代码
-export const downloadCodegen = (id: number) => {
-  return request.download({ url: '/infra/codegen/download?tableId=' + id })
-}
-
-// 获得表定义
-export const getSchemaTableList = (params) => {
-  return request.get({ url: '/infra/codegen/db/table/list', params })
-}
-
-// 基于数据库的表结构，创建代码生成器的表定义
-export const createCodegenList = (data) => {
-  return request.post({ url: '/infra/codegen/create-list', data })
-}
-
-// 删除代码生成表定义
-export const deleteCodegenTable = (id: number) => {
-  return request.delete({ url: '/infra/codegen/delete?tableId=' + id })
-}

src/api/infra/config/index.ts

@@ -1,48 +0,0 @@
-import request from '@/config/axios'
-
-export interface ConfigVO {
-  id: number | undefined
-  category: string
-  name: string
-  key: string
-  value: string
-  type: number
-  visible: boolean
-  remark: string
-  createTime: Date
-}
-
-// 查询参数列表
-export const getConfigPage = (params: PageParam) => {
-  return request.get({ url: '/infra/config/page', params })
-}
-
-// 查询参数详情
-export const getConfig = (id: number) => {
-  return request.get({ url: '/infra/config/get?id=' + id })
-}
-
-// 根据参数键名查询参数值
-export const getConfigKey = (configKey: string) => {
-  return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey })
-}
-
-// 新增参数
-export const createConfig = (data: ConfigVO) => {
-  return request.post({ url: '/infra/config/create', data })
-}
-
-// 修改参数
-export const updateConfig = (data: ConfigVO) => {
-  return request.put({ url: '/infra/config/update', data })
-}
-
-// 删除参数
-export const deleteConfig = (id: number) => {
-  return request.delete({ url: '/infra/config/delete?id=' + id })
-}
-
-// 导出参数
-export const exportConfig = (params) => {
-  return request.download({ url: '/infra/config/export', params })
-}

src/api/infra/dataSourceConfig/index.ts

@@ -1,35 +0,0 @@
-import request from '@/config/axios'
-
-export interface DataSourceConfigVO {
-  id: number | undefined
-  name: string
-  url: string
-  username: string
-  password: string
-  createTime?: Date
-}
-
-// 新增数据源配置
-export const createDataSourceConfig = (data: DataSourceConfigVO) => {
-  return request.post({ url: '/infra/data-source-config/create', data })
-}
-
-// 修改数据源配置
-export const updateDataSourceConfig = (data: DataSourceConfigVO) => {
-  return request.put({ url: '/infra/data-source-config/update', data })
-}
-
-// 删除数据源配置
-export const deleteDataSourceConfig = (id: number) => {
-  return request.delete({ url: '/infra/data-source-config/delete?id=' + id })
-}
-
-// 查询数据源配置详情
-export const getDataSourceConfig = (id: number) => {
-  return request.get({ url: '/infra/data-source-config/get?id=' + id })
-}
-
-// 查询数据源配置列表
-export const getDataSourceConfigList = () => {
-  return request.get({ url: '/infra/data-source-config/list' })
-}

src/api/infra/dbDoc/index.ts

@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 导出Html
-export const exportHtml = () => {
-  return request.download({ url: '/infra/db-doc/export-html' })
-}
-
-// 导出Word
-export const exportWord = () => {
-  return request.download({ url: '/infra/db-doc/export-word' })
-}
-
-// 导出Markdown
-export const exportMarkdown = () => {
-  return request.download({ url: '/infra/db-doc/export-markdown' })
-}

src/api/infra/file/index.ts

@@ -1,17 +0,0 @@
-import request from '@/config/axios'
-
-export interface FilePageReqVO extends PageParam {
-  path?: string
-  type?: string
-  createTime?: Date[]
-}
-
-// 查询文件列表
-export const getFilePage = (params: FilePageReqVO) => {
-  return request.get({ url: '/infra/file/page', params })
-}
-
-// 删除文件
-export const deleteFile = (id: number) => {
-  return request.delete({ url: '/infra/file/delete?id=' + id })
-}

src/api/infra/fileConfig/index.ts

@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-export interface FileClientConfig {
-  basePath: string
-  host?: string
-  port?: number
-  username?: string
-  password?: string
-  mode?: string
-  endpoint?: string
-  bucket?: string
-  accessKey?: string
-  accessSecret?: string
-  domain: string
-}
-
-export interface FileConfigVO {
-  id: number
-  name: string
-  storage: any
-  master: boolean
-  visible: boolean
-  config: FileClientConfig
-  remark: string
-  createTime: Date
-}
-
-// 查询文件配置列表
-export const getFileConfigPage = (params: PageParam) => {
-  return request.get({ url: '/infra/file-config/page', params })
-}
-
-// 查询文件配置详情
-export const getFileConfig = (id: number) => {
-  return request.get({ url: '/infra/file-config/get?id=' + id })
-}
-
-// 更新文件配置为主配置
-export const updateFileConfigMaster = (id: number) => {
-  return request.put({ url: '/infra/file-config/update-master?id=' + id })
-}
-
-// 新增文件配置
-export const createFileConfig = (data: FileConfigVO) => {
-  return request.post({ url: '/infra/file-config/create', data })
-}
-
-// 修改文件配置
-export const updateFileConfig = (data: FileConfigVO) => {
-  return request.put({ url: '/infra/file-config/update', data })
-}
-
-// 删除文件配置
-export const deleteFileConfig = (id: number) => {
-  return request.delete({ url: '/infra/file-config/delete?id=' + id })
-}
-
-// 测试文件配置
-export const testFileConfig = (id: number) => {
-  return request.get({ url: '/infra/file-config/test?id=' + id })
-}

src/api/infra/job/index.ts

@@ -1,63 +0,0 @@
-import request from '@/config/axios'
-
-export interface JobVO {
-  id: number
-  name: string
-  status: number
-  handlerName: string
-  handlerParam: string
-  cronExpression: string
-  retryCount: number
-  retryInterval: number
-  monitorTimeout: number
-  createTime: Date
-}
-
-// 任务列表
-export const getJobPage = (params: PageParam) => {
-  return request.get({ url: '/infra/job/page', params })
-}
-
-// 任务详情
-export const getJob = (id: number) => {
-  return request.get({ url: '/infra/job/get?id=' + id })
-}
-
-// 新增任务
-export const createJob = (data: JobVO) => {
-  return request.post({ url: '/infra/job/create', data })
-}
-
-// 修改定时任务调度
-export const updateJob = (data: JobVO) => {
-  return request.put({ url: '/infra/job/update', data })
-}
-
-// 删除定时任务调度
-export const deleteJob = (id: number) => {
-  return request.delete({ url: '/infra/job/delete?id=' + id })
-}
-
-// 导出定时任务调度
-export const exportJob = (params) => {
-  return request.download({ url: '/infra/job/export-excel', params })
-}
-
-// 任务状态修改
-export const updateJobStatus = (id: number, status: number) => {
-  const params = {
-    id,
-    status
-  }
-  return request.put({ url: '/infra/job/update-status', params })
-}
-
-// 定时任务立即执行一次
-export const runJob = (id: number) => {
-  return request.put({ url: '/infra/job/trigger?id=' + id })
-}
-
-// 获得定时任务的下 n 次执行时间
-export const getJobNextTimes = (id: number) => {
-  return request.get({ url: '/infra/job/get_next_times?id=' + id })
-}

src/api/infra/jobLog/index.ts

@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-
-export interface JobLogVO {
-  id: number
-  jobId: number
-  handlerName: string
-  handlerParam: string
-  cronExpression: string
-  executeIndex: string
-  beginTime: string
-  endTime: string
-  duration: string
-  status: number
-  createTime: string
-}
-
-// 任务日志列表
-export const getJobLogPage = (params: PageParam) => {
-  return request.get({ url: '/infra/job-log/page', params })
-}
-
-// 任务日志详情
-export const getJobLog = (id: number) => {
-  return request.get({ url: '/infra/job-log/get?id=' + id })
-}
-
-// 导出定时任务日志
-export const exportJobLog = (params) => {
-  return request.download({
-    url: '/infra/job-log/export-excel',
-    params
-  })
-}

src/api/infra/redis/index.ts

@@ -1,8 +0,0 @@
-import request from '@/config/axios'
-
-/**
- * 获取redis 监控信息
- */
-export const getCache = () => {
-  return request.get({ url: '/infra/redis/get-monitor-info' })
-}

src/api/infra/redis/types.ts

@@ -1,176 +0,0 @@
-export interface RedisMonitorInfoVO {
-  info: RedisInfoVO
-  dbSize: number
-  commandStats: RedisCommandStatsVO[]
-}
-
-export interface RedisInfoVO {
-  io_threaded_reads_processed: string
-  tracking_clients: string
-  uptime_in_seconds: string
-  cluster_connections: string
-  current_cow_size: string
-  maxmemory_human: string
-  aof_last_cow_size: string
-  master_replid2: string
-  mem_replication_backlog: string
-  aof_rewrite_scheduled: string
-  total_net_input_bytes: string
-  rss_overhead_ratio: string
-  hz: string
-  current_cow_size_age: string
-  redis_build_id: string
-  errorstat_BUSYGROUP: string
-  aof_last_bgrewrite_status: string
-  multiplexing_api: string
-  client_recent_max_output_buffer: string
-  allocator_resident: string
-  mem_fragmentation_bytes: string
-  aof_current_size: string
-  repl_backlog_first_byte_offset: string
-  tracking_total_prefixes: string
-  redis_mode: string
-  redis_git_dirty: string
-  aof_delayed_fsync: string
-  allocator_rss_bytes: string
-  repl_backlog_histlen: string
-  io_threads_active: string
-  rss_overhead_bytes: string
-  total_system_memory: string
-  loading: string
-  evicted_keys: string
-  maxclients: string
-  cluster_enabled: string
-  redis_version: string
-  repl_backlog_active: string
-  mem_aof_buffer: string
-  allocator_frag_bytes: string
-  io_threaded_writes_processed: string
-  instantaneous_ops_per_sec: string
-  used_memory_human: string
-  total_error_replies: string
-  role: string
-  maxmemory: string
-  used_memory_lua: string
-  rdb_current_bgsave_time_sec: string
-  used_memory_startup: string
-  used_cpu_sys_main_thread: string
-  lazyfree_pending_objects: string
-  aof_pending_bio_fsync: string
-  used_memory_dataset_perc: string
-  allocator_frag_ratio: string
-  arch_bits: string
-  used_cpu_user_main_thread: string
-  mem_clients_normal: string
-  expired_time_cap_reached_count: string
-  unexpected_error_replies: string
-  mem_fragmentation_ratio: string
-  aof_last_rewrite_time_sec: string
-  master_replid: string
-  aof_rewrite_in_progress: string
-  lru_clock: string
-  maxmemory_policy: string
-  run_id: string
-  latest_fork_usec: string
-  tracking_total_items: string
-  total_commands_processed: string
-  expired_keys: string
-  errorstat_ERR: string
-  used_memory: string
-  module_fork_in_progress: string
-  errorstat_WRONGPASS: string
-  aof_buffer_length: string
-  dump_payload_sanitizations: string
-  mem_clients_slaves: string
-  keyspace_misses: string
-  server_time_usec: string
-  executable: string
-  lazyfreed_objects: string
-  db0: string
-  used_memory_peak_human: string
-  keyspace_hits: string
-  rdb_last_cow_size: string
-  aof_pending_rewrite: string
-  used_memory_overhead: string
-  active_defrag_hits: string
-  tcp_port: string
-  uptime_in_days: string
-  used_memory_peak_perc: string
-  current_save_keys_processed: string
-  blocked_clients: string
-  total_reads_processed: string
-  expire_cycle_cpu_milliseconds: string
-  sync_partial_err: string
-  used_memory_scripts_human: string
-  aof_current_rewrite_time_sec: string
-  aof_enabled: string
-  process_supervised: string
-  master_repl_offset: string
-  used_memory_dataset: string
-  used_cpu_user: string
-  rdb_last_bgsave_status: string
-  tracking_total_keys: string
-  atomicvar_api: string
-  allocator_rss_ratio: string
-  client_recent_max_input_buffer: string
-  clients_in_timeout_table: string
-  aof_last_write_status: string
-  mem_allocator: string
-  used_memory_scripts: string
-  used_memory_peak: string
-  process_id: string
-  master_failover_state: string
-  errorstat_NOAUTH: string
-  used_cpu_sys: string
-  repl_backlog_size: string
-  connected_slaves: string
-  current_save_keys_total: string
-  gcc_version: string
-  total_system_memory_human: string
-  sync_full: string
-  connected_clients: string
-  module_fork_last_cow_size: string
-  total_writes_processed: string
-  allocator_active: string
-  total_net_output_bytes: string
-  pubsub_channels: string
-  current_fork_perc: string
-  active_defrag_key_hits: string
-  rdb_changes_since_last_save: string
-  instantaneous_input_kbps: string
-  used_memory_rss_human: string
-  configured_hz: string
-  expired_stale_perc: string
-  active_defrag_misses: string
-  used_cpu_sys_children: string
-  number_of_cached_scripts: string
-  sync_partial_ok: string
-  used_memory_lua_human: string
-  rdb_last_save_time: string
-  pubsub_patterns: string
-  slave_expires_tracked_keys: string
-  redis_git_sha1: string
-  used_memory_rss: string
-  rdb_last_bgsave_time_sec: string
-  os: string
-  mem_not_counted_for_evict: string
-  active_defrag_running: string
-  rejected_connections: string
-  aof_rewrite_buffer_length: string
-  total_forks: string
-  active_defrag_key_misses: string
-  allocator_allocated: string
-  aof_base_size: string
-  instantaneous_output_kbps: string
-  second_repl_offset: string
-  rdb_bgsave_in_progress: string
-  used_cpu_user_children: string
-  total_connections_received: string
-  migrate_cached_sockets: string
-}
-
-export interface RedisCommandStatsVO {
-  command: string
-  calls: number
-  usec: number
-}

src/api/login/index.ts

@@ -14,56 +14,60 @@ export interface SmsLoginVO {
 
 // 登录
 export const login = (data: UserLoginVO) => {
-  return request.post({ url: '/system/auth/login', data })
+  return request.post({ url: '/admin-api/system/auth/login', data })
 }
 
 // 刷新访问令牌
 export const refreshToken = () => {
-  return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })
+  return request.post({
+    url: '/admin-api/system/auth/refresh-token?refreshToken=' + getRefreshToken()
+  })
 }
 
 // 使用租户名，获得租户编号
 export const getTenantIdByName = (name: string) => {
-  return request.get({ url: '/system/tenant/get-id-by-name?name=' + name })
+  return request.get({ url: '/admin-api/system/tenant/get-id-by-name?name=' + name })
 }
 
 // 登出
 export const loginOut = () => {
-  return request.post({ url: '/system/auth/logout' })
+  return request.post({ url: '/admin-api/system/auth/logout' })
 }
 
 // 获取用户权限信息
-export const getInfo = () => {
-  return request.get({ url: '/system/auth/get-permission-info' })
-}
-
-// 路由
-export const getAsyncRoutes = () => {
-  return request.get({ url: '/system/auth/list-menus' })
+export const getInfo = (data) => {
+  return request.get({ url: '/admin-api/system/auth/get-permission-info', data })
 }
 
 //获取登录验证码
 export const sendSmsCode = (data: SmsCodeVO) => {
-  return request.post({ url: '/system/auth/send-sms-code', data })
+  return request.post({ url: '/admin-api/system/auth/send-sms-code', data })
 }
 
 // 短信验证码登录
 export const smsLogin = (data: SmsLoginVO) => {
-  return request.post({ url: '/system/auth/sms-login', data })
+  return request.post({ url: '/admin-api/system/auth/sms-login', data })
 }
 
 // 社交授权的跳转
 export const socialAuthRedirect = (type: number, redirectUri: string) => {
   return request.get({
-    url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
+    url: '/admin-api/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
   })
 }
 // 获取验证图片以及 token
 export const getCode = (data) => {
-  return request.postOriginal({ url: 'system/captcha/get', data })
+  return request.postOriginal({ url: '/admin-api/system/captcha/get', data })
 }
 
 // 滑动或者点选验证
 export const reqCheck = (data) => {
-  return request.postOriginal({ url: 'system/captcha/check', data })
+  return request.postOriginal({ url: '/admin-api/system/captcha/check', data })
+}
+
+// 获取应用信息
+export const getAppInfo = (instanceId: number) => {
+  return request.get({
+    url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
+  })
 }

src/api/login/oauth2/index.ts

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 // 获得授权信息
 export const getAuthorize = (clientId: string) => {
-  return request.get({ url: '/system/oauth2/authorize?clientId=' + clientId })
+  return request.get({ url: '/admin-api/system/oauth2/authorize?clientId=' + clientId })
 }
 
 // 发起授权
@@ -25,7 +25,7 @@ export const authorize = (
   }
   // 发起请求
   return request.post({
-    url: '/system/oauth2/authorize',
+    url: '/admin-api/system/oauth2/authorize',
     headers: {
       'Content-type': 'application/x-www-form-urlencoded'
     },

src/api/mp/account/index.ts

@@ -1,46 +0,0 @@
-import request from '@/config/axios'
-
-export interface AccountVO {
-  id: number
-  name: string
-}
-
-// 创建公众号账号
-export const createAccount = async (data) => {
-  return await request.post({ url: '/mp/account/create', data })
-}
-
-// 更新公众号账号
-export const updateAccount = async (data) => {
-  return request.put({ url: '/mp/account/update', data: data })
-}
-
-// 删除公众号账号
-export const deleteAccount = async (id) => {
-  return request.delete({ url: '/mp/account/delete?id=' + id, method: 'delete' })
-}
-
-// 获得公众号账号
-export const getAccount = async (id) => {
-  return request.get({ url: '/mp/account/get?id=' + id })
-}
-
-// 获得公众号账号分页
-export const getAccountPage = async (query) => {
-  return request.get({ url: '/mp/account/page', params: query })
-}
-
-// 获取公众号账号精简信息列表
-export const getSimpleAccountList = async () => {
-  return request.get({ url: '/mp/account/list-all-simple' })
-}
-
-// 生成公众号二维码
-export const generateAccountQrCode = async (id) => {
-  return request.put({ url: '/mp/account/generate-qr-code?id=' + id })
-}
-
-// 清空公众号 API 配额
-export const clearAccountQuota = async (id) => {
-  return request.put({ url: '/mp/account/clear-quota?id=' + id })
-}

src/api/mp/autoReply/index.ts

@@ -1,39 +0,0 @@
-import request from '@/config/axios'
-
-// 创建公众号的自动回复
-export const createAutoReply = (data) => {
-  return request.post({
-    url: '/mp/auto-reply/create',
-    data: data
-  })
-}
-
-// 更新公众号的自动回复
-export const updateAutoReply = (data) => {
-  return request.put({
-    url: '/mp/auto-reply/update',
-    data: data
-  })
-}
-
-// 删除公众号的自动回复
-export const deleteAutoReply = (id) => {
-  return request.delete({
-    url: '/mp/auto-reply/delete?id=' + id
-  })
-}
-
-// 获得公众号的自动回复
-export const getAutoReply = (id) => {
-  return request.get({
-    url: '/mp/auto-reply/get?id=' + id
-  })
-}
-
-// 获得公众号的自动回复分页
-export const getAutoReplyPage = (query) => {
-  return request.get({
-    url: '/mp/auto-reply/page',
-    params: query
-  })
-}

src/api/mp/draft/index.ts

@@ -1,35 +0,0 @@
-import request from '@/config/axios'
-
-// 获得公众号草稿分页
-export const getDraftPage = (query) => {
-  return request.get({
-    url: '/mp/draft/page',
-    params: query
-  })
-}
-
-// 创建公众号草稿
-export const createDraft = (accountId, articles) => {
-  return request.post({
-    url: '/mp/draft/create?accountId=' + accountId,
-    data: {
-      articles
-    }
-  })
-}
-
-// 更新公众号草稿
-export const updateDraft = (accountId, mediaId, articles) => {
-  return request.put({
-    url: '/mp/draft/update?accountId=' + accountId + '&mediaId=' + mediaId,
-    method: 'put',
-    data: articles
-  })
-}
-
-// 删除公众号草稿
-export const deleteDraft = (accountId, mediaId) => {
-  return request.delete({
-    url: '/mp/draft/delete?accountId=' + accountId + '&mediaId=' + mediaId
-  })
-}

src/api/mp/freePublish/index.ts

@@ -1,23 +0,0 @@
-import request from '@/config/axios'
-
-// 获得公众号素材分页
-export const getFreePublishPage = (query) => {
-  return request.get({
-    url: '/mp/free-publish/page',
-    params: query
-  })
-}
-
-// 删除公众号素材
-export const deleteFreePublish = (accountId, articleId) => {
-  return request.delete({
-    url: '/mp/free-publish/delete?accountId=' + accountId + '&articleId=' + articleId
-  })
-}
-
-// 发布公众号素材
-export const submitFreePublish = (accountId, mediaId) => {
-  return request.post({
-    url: '/mp/free-publish/submit?accountId=' + accountId + '&mediaId=' + mediaId
-  })
-}

src/api/mp/material/index.ts

@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 获得公众号素材分页
-export const getMaterialPage = (query) => {
-  return request.get({
-    url: '/mp/material/page',
-    params: query
-  })
-}
-
-// 删除公众号永久素材
-export const deletePermanentMaterial = (id) => {
-  return request.delete({
-    url: '/mp/material/delete-permanent?id=' + id
-  })
-}

src/api/mp/menu/index.ts

@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 获得公众号菜单列表
-export const getMenuList = (accountId) => {
-  return request.get({
-    url: '/mp/menu/list?accountId=' + accountId
-  })
-}
-
-// 保存公众号菜单
-export const saveMenu = (accountId, menus) => {
-  return request.post({
-    url: '/mp/menu/save',
-    data: {
-      accountId,
-      menus
-    }
-  })
-}
-
-// 删除公众号菜单
-export const deleteMenu = (accountId) => {
-  return request.delete({
-    url: '/mp/menu/delete?accountId=' + accountId
-  })
-}

src/api/mp/message/index.ts

@@ -1,17 +0,0 @@
-import request from '@/config/axios'
-
-// 获得公众号消息分页
-export const getMessagePage = (query: PageParam) => {
-  return request.get({
-    url: '/mp/message/page',
-    params: query
-  })
-}
-
-// 给粉丝发送消息
-export const sendMessage = (data) => {
-  return request.post({
-    url: '/mp/message/send',
-    data: data
-  })
-}

src/api/mp/statistics/index.ts

@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-
-// 获取消息发送概况数据
-export const getUpstreamMessage = (query) => {
-  return request.get({
-    url: '/mp/statistics/upstream-message',
-    params: query
-  })
-}
-
-// 用户增减数据
-export const getUserSummary = (query) => {
-  return request.get({
-    url: '/mp/statistics/user-summary',
-    params: query
-  })
-}
-
-// 获得用户累计数据
-export const getUserCumulate = (query) => {
-  return request.get({
-    url: '/mp/statistics/user-cumulate',
-    params: query
-  })
-}
-
-// 获得接口分析数据
-export const getInterfaceSummary = (query) => {
-  return request.get({
-    url: '/mp/statistics/interface-summary',
-    params: query
-  })
-}

src/api/mp/tag/index.ts

@@ -1,60 +0,0 @@
-import request from '@/config/axios'
-
-export interface TagVO {
-  id?: number
-  name: string
-  accountId: number
-  createTime: Date
-}
-
-// 创建公众号标签
-export const createTag = (data: TagVO) => {
-  return request.post({
-    url: '/mp/tag/create',
-    data: data
-  })
-}
-
-// 更新公众号标签
-export const updateTag = (data: TagVO) => {
-  return request.put({
-    url: '/mp/tag/update',
-    data: data
-  })
-}
-
-// 删除公众号标签
-export const deleteTag = (id: number) => {
-  return request.delete({
-    url: '/mp/tag/delete?id=' + id
-  })
-}
-
-// 获得公众号标签
-export const getTag = (id: number) => {
-  return request.get({
-    url: '/mp/tag/get?id=' + id
-  })
-}
-
-// 获得公众号标签分页
-export const getTagPage = (query: PageParam) => {
-  return request.get({
-    url: '/mp/tag/page',
-    params: query
-  })
-}
-
-// 获取公众号标签精简信息列表
-export const getSimpleTagList = () => {
-  return request.get({
-    url: '/mp/tag/list-all-simple'
-  })
-}
-
-// 同步公众号标签
-export const syncTag = (accountId: number) => {
-  return request.post({
-    url: '/mp/tag/sync?accountId=' + accountId
-  })
-}

src/api/mp/user/index.ts

@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 更新公众号粉丝
-export const updateUser = (data) => {
-  return request.put({
-    url: '/mp/user/update',
-    data: data
-  })
-}
-
-// 获得公众号粉丝
-export const getUser = (id) => {
-  return request.get({
-    url: '/mp/user/get?id=' + id
-  })
-}
-
-// 获得公众号粉丝分页
-export const getUserPage = (query) => {
-  return request.get({
-    url: '/mp/user/page',
-    params: query
-  })
-}
-
-// 同步公众号粉丝
-export const syncUser = (accountId) => {
-  return request.post({
-    url: '/mp/tag/sync?accountId=' + accountId
-  })
-}

src/api/pay/app/index.ts

@@ -1,78 +0,0 @@
-import request from '@/config/axios'
-
-export interface AppVO {
-  id: number
-  name: string
-  status: number
-  remark: string
-  payNotifyUrl: string
-  refundNotifyUrl: string
-  merchantId: number
-  merchantName: string
-  createTime: Date
-}
-
-export interface AppPageReqVO extends PageParam {
-  name?: string
-  status?: number
-  remark?: string
-  payNotifyUrl?: string
-  refundNotifyUrl?: string
-  merchantName?: string
-  createTime?: Date[]
-}
-
-export interface AppExportReqVO {
-  name?: string
-  status?: number
-  remark?: string
-  payNotifyUrl?: string
-  refundNotifyUrl?: string
-  merchantName?: string
-  createTime?: Date[]
-}
-
-export interface AppUpdateStatusReqVO {
-  id: number
-  status: number
-}
-
-// 查询列表支付应用
-export const getAppPage = (params: AppPageReqVO) => {
-  return request.get({ url: '/pay/app/page', params })
-}
-
-// 查询详情支付应用
-export const getApp = (id: number) => {
-  return request.get({ url: '/pay/app/get?id=' + id })
-}
-
-// 新增支付应用
-export const createApp = (data: AppVO) => {
-  return request.post({ url: '/pay/app/create', data })
-}
-
-// 修改支付应用
-export const updateApp = (data: AppVO) => {
-  return request.put({ url: '/pay/app/update', data })
-}
-
-// 支付应用信息状态修改
-export const changeAppStatus = (data: AppUpdateStatusReqVO) => {
-  return request.put({ url: '/pay/app/update-status', data: data })
-}
-
-// 删除支付应用
-export const deleteApp = (id: number) => {
-  return request.delete({ url: '/pay/app/delete?id=' + id })
-}
-
-// 导出支付应用
-export const exportApp = (params: AppExportReqVO) => {
-  return request.download({ url: '/pay/app/export-excel', params })
-}
-
-// 根据商ID称搜索应用列表
-export const getAppListByMerchantId = (merchantId: number) => {
-  return request.get({ url: '/pay/app/list-merchant-id', params: { merchantId: merchantId } })
-}

src/api/pay/channel/index.ts

@@ -1,48 +0,0 @@
-import request from '@/config/axios'
-
-export interface ChannelVO {
-  id: number
-  code: string
-  config: string
-  status: number
-  remark: string
-  feeRate: number
-  merchantId: number
-  appId: number
-  createTime: Date
-}
-
-// 查询列表支付渠道
-export const getChannelPage = (params: PageParam) => {
-  return request.get({ url: '/pay/channel/page', params })
-}
-
-// 查询详情支付渠道
-export const getChannel = (merchantId: number, appId: string, code: string) => {
-  const params = {
-    merchantId: merchantId,
-    appId: appId,
-    code: code
-  }
-  return request.get({ url: '/pay/channel/get-channel', params: params })
-}
-
-// 新增支付渠道
-export const createChannel = (data: ChannelVO) => {
-  return request.post({ url: '/pay/channel/create', data })
-}
-
-// 修改支付渠道
-export const updateChannel = (data: ChannelVO) => {
-  return request.put({ url: '/pay/channel/update', data })
-}
-
-// 删除支付渠道
-export const deleteChannel = (id: number) => {
-  return request.delete({ url: '/pay/channel/delete?id=' + id })
-}
-
-// 导出支付渠道
-export const exportChannel = (params) => {
-  return request.download({ url: '/pay/channel/export-excel', params })
-}

src/api/pay/merchant/index.ts

@@ -1,78 +0,0 @@
-import request from '@/config/axios'
-
-export interface MerchantVO {
-  id: number
-  no: string
-  name: string
-  shortName: string
-  status: number
-  remark: string
-  createTime: Date
-}
-
-export interface MerchantPageReqVO extends PageParam {
-  no?: string
-  name?: string
-  shortName?: string
-  status?: number
-  remark?: string
-  createTime?: Date[]
-}
-
-export interface MerchantExportReqVO {
-  no?: string
-  name?: string
-  shortName?: string
-  status?: number
-  remark?: string
-  createTime?: Date[]
-}
-
-// 查询列表支付商户
-export const getMerchantPage = (params: MerchantPageReqVO) => {
-  return request.get({ url: '/pay/merchant/page', params })
-}
-
-// 查询详情支付商户
-export const getMerchant = (id: number) => {
-  return request.get({ url: '/pay/merchant/get?id=' + id })
-}
-
-// 根据商户名称搜索商户列表
-export const getMerchantListByName = (name?: string) => {
-  return request.get({
-    url: '/pay/merchant/list-by-name',
-    params: {
-      name: name
-    }
-  })
-}
-
-// 新增支付商户
-export const createMerchant = (data: MerchantVO) => {
-  return request.post({ url: '/pay/merchant/create', data })
-}
-
-// 修改支付商户
-export const updateMerchant = (data: MerchantVO) => {
-  return request.put({ url: '/pay/merchant/update', data })
-}
-
-// 删除支付商户
-export const deleteMerchant = (id: number) => {
-  return request.delete({ url: '/pay/merchant/delete?id=' + id })
-}
-
-// 导出支付商户
-export const exportMerchant = (params: MerchantExportReqVO) => {
-  return request.download({ url: '/pay/merchant/export-excel', params })
-}
-
-// 支付商户状态修改
-export const updateMerchantStatus = (id: number, status: number) => {
-  const data = {
-    id,
-    status
-  }
-  return request.put({ url: '/pay/merchant/update-status', data: data })
-}

src/api/pay/order/index.ts

@@ -1,114 +0,0 @@
-import request from '@/config/axios'
-
-export interface OrderVO {
-  id: number
-  merchantId: number
-  appId: number
-  channelId: number
-  channelCode: string
-  merchantOrderId: string
-  subject: string
-  body: string
-  notifyUrl: string
-  notifyStatus: number
-  amount: number
-  channelFeeRate: number
-  channelFeeAmount: number
-  status: number
-  userIp: string
-  expireTime: Date
-  successTime: Date
-  notifyTime: Date
-  successExtensionId: number
-  refundStatus: number
-  refundTimes: number
-  refundAmount: number
-  channelUserId: string
-  channelOrderNo: string
-  createTime: Date
-}
-
-export interface OrderPageReqVO extends PageParam {
-  merchantId?: number
-  appId?: number
-  channelId?: number
-  channelCode?: string
-  merchantOrderId?: string
-  subject?: string
-  body?: string
-  notifyUrl?: string
-  notifyStatus?: number
-  amount?: number
-  channelFeeRate?: number
-  channelFeeAmount?: number
-  status?: number
-  expireTime?: Date[]
-  successTime?: Date[]
-  notifyTime?: Date[]
-  successExtensionId?: number
-  refundStatus?: number
-  refundTimes?: number
-  channelUserId?: string
-  channelOrderNo?: string
-  createTime?: Date[]
-}
-
-export interface OrderExportReqVO {
-  merchantId?: number
-  appId?: number
-  channelId?: number
-  channelCode?: string
-  merchantOrderId?: string
-  subject?: string
-  body?: string
-  notifyUrl?: string
-  notifyStatus?: number
-  amount?: number
-  channelFeeRate?: number
-  channelFeeAmount?: number
-  status?: number
-  expireTime?: Date[]
-  successTime?: Date[]
-  notifyTime?: Date[]
-  successExtensionId?: number
-  refundStatus?: number
-  refundTimes?: number
-  channelUserId?: string
-  channelOrderNo?: string
-  createTime?: Date[]
-}
-
-// 查询列表支付订单
-export const getOrderPage = async (params: OrderPageReqVO) => {
-  return await request.get({ url: '/pay/order/page', params })
-}
-
-// 查询详情支付订单
-export const getOrder = async (id: number) => {
-  return await request.get({ url: '/pay/order/get?id=' + id })
-}
-
-// 获得支付订单的明细
-export const getOrderDetail = async (id: number) => {
-  return await request.get({ url: '/pay/order/get-detail?id=' + id })
-}
-
-// 新增支付订单
-export const createOrder = async (data: OrderVO) => {
-  return await request.post({ url: '/pay/order/create', data })
-}
-
-// 修改支付订单
-export const updateOrder = async (data: OrderVO) => {
-  return await request.put({ url: '/pay/order/update', data })
-}
-
-// 删除支付订单
-export const deleteOrder = async (id: number) => {
-  return await request.delete({ url: '/pay/order/delete?id=' + id })
-}
-
-// 导出支付订单
-export const exportOrder = async (params: OrderExportReqVO) => {
-  return await request.download({ url: '/pay/order/export-excel', params })
-}

src/api/pay/refund/index.ts

@@ -1,116 +0,0 @@
-import request from '@/config/axios'
-
-export interface RefundVO {
-  id: number
-  merchantId: number
-  appId: number
-  channelId: number
-  channelCode: string
-  orderId: string
-  tradeNo: string
-  merchantOrderId: string
-  merchantRefundNo: string
-  notifyUrl: string
-  notifyStatus: number
-  status: number
-  type: number
-  payAmount: number
-  refundAmount: number
-  reason: string
-  userIp: string
-  channelOrderNo: string
-  channelRefundNo: string
-  channelErrorCode: string
-  channelErrorMsg: string
-  channelExtras: string
-  expireTime: Date
-  successTime: Date
-  notifyTime: Date
-  createTime: Date
-}
-
-export interface RefundPageReqVO extends PageParam {
-  merchantId?: number
-  appId?: number
-  channelId?: number
-  channelCode?: string
-  orderId?: string
-  tradeNo?: string
-  merchantOrderId?: string
-  merchantRefundNo?: string
-  notifyUrl?: string
-  notifyStatus?: number
-  status?: number
-  type?: number
-  payAmount?: number
-  refundAmount?: number
-  reason?: string
-  userIp?: string
-  channelOrderNo?: string
-  channelRefundNo?: string
-  channelErrorCode?: string
-  channelErrorMsg?: string
-  channelExtras?: string
-  expireTime?: Date[]
-  successTime?: Date[]
-  notifyTime?: Date[]
-  createTime?: Date[]
-}
-
-export interface PayRefundExportReqVO {
-  merchantId?: number
-  appId?: number
-  channelId?: number
-  channelCode?: string
-  orderId?: string
-  tradeNo?: string
-  merchantOrderId?: string
-  merchantRefundNo?: string
-  notifyUrl?: string
-  notifyStatus?: number
-  status?: number
-  type?: number
-  payAmount?: number
-  refundAmount?: number
-  reason?: string
-  userIp?: string
-  channelOrderNo?: string
-  channelRefundNo?: string
-  channelErrorCode?: string
-  channelErrorMsg?: string
-  channelExtras?: string
-  expireTime?: Date[]
-  successTime?: Date[]
-  notifyTime?: Date[]
-  createTime?: Date[]
-}
-
-// 查询列表退款订单
-export const getRefundPage = (params: RefundPageReqVO) => {
-  return request.get({ url: '/pay/refund/page', params })
-}
-
-// 查询详情退款订单
-export const getRefund = (id: number) => {
-  return request.get({ url: '/pay/refund/get?id=' + id })
-}
-
-// 新增退款订单
-export const createRefund = (data: RefundVO) => {
-  return request.post({ url: '/pay/refund/create', data })
-}
-
-// 修改退款订单
-export const updateRefund = (data: RefundVO) => {
-  return request.put({ url: '/pay/refund/update', data })
-}
-
-// 删除退款订单
-export const deleteRefund = (id: number) => {
-  return request.delete({ url: '/pay/refund/delete?id=' + id })
-}
-
-// 导出退款订单
-export const exportRefund = (params: PayRefundExportReqVO) => {
-  return request.download({ url: '/pay/refund/export-excel', params })
-}

src/api/system/area/index.ts

@@ -1,19 +0,0 @@
-import request from '@/config/axios'
-
-// 获得地区树
-export const getAreaTree = async () => {
-  return await request.get({ url: '/system/area/tree' })
-}
-
-export const getChildrenArea = async (id: number) => {
-  return await request.get({ url: '/system/area/get-children?id=' + id })
-}
-
-export const getAreaListByIds = async (ids) => {
-  return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
-}
-
-// 获得 IP 对应的地区名
-export const getAreaByIp = async (ip: string) => {
-  return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })
-}

src/api/system/dept/index.ts

@@ -14,30 +14,30 @@ export interface DeptVO {
 
 // 查询部门（精简)列表
 export const getSimpleDeptList = async (): Promise<DeptVO[]> => {
-  return await request.get({ url: '/system/dept/list-all-simple' })
+  return await request.get({ url: '/admin-api/system/dept/list-all-simple' })
 }
 
 // 查询部门列表
-export const getDeptPage = async (params: PageParam) => {
-  return await request.get({ url: '/system/dept/list', params })
+export const getDeptPage = async (params) => {
+  return await request.get({ url: '/admin-api/system/dept/list', params })
 }
 
 // 查询部门详情
 export const getDept = async (id: number) => {
-  return await request.get({ url: '/system/dept/get?id=' + id })
+  return await request.get({ url: '/admin-api/system/dept/get?id=' + id })
 }
 
 // 新增部门
 export const createDept = async (data: DeptVO) => {
-  return await request.post({ url: '/system/dept/create', data: data })
+  return await request.post({ url: '/admin-api/system/dept/create', data: data })
 }
 
 // 修改部门
 export const updateDept = async (params: DeptVO) => {
-  return await request.put({ url: '/system/dept/update', data: params })
+  return await request.put({ url: '/admin-api/system/dept/update', data: params })
 }
 
 // 删除部门
 export const deleteDept = async (id: number) => {
-  return await request.delete({ url: '/system/dept/delete?id=' + id })
+  return await request.delete({ url: '/admin-api/system/dept/delete?id=' + id })
 }

src/api/system/dict/dict.data.ts

@@ -15,35 +15,35 @@ export type DictDataVO = {
 
 // 查询字典数据（精简)列表
 export const listSimpleDictData = () => {
-  return request.get({ url: '/system/dict-data/list-all-simple' })
+  return request.get({ url: '/admin-api/system/dict-data/list-all-simple' })
 }
 
 // 查询字典数据列表
 export const getDictDataPage = (params: PageParam) => {
-  return request.get({ url: '/system/dict-data/page', params })
+  return request.get({ url: '/admin-api/system/dict-data/page', params })
 }
 
 // 查询字典数据详情
 export const getDictData = (id: number) => {
-  return request.get({ url: '/system/dict-data/get?id=' + id })
+  return request.get({ url: '/admin-api/system/dict-data/get?id=' + id })
 }
 
 // 新增字典数据
 export const createDictData = (data: DictDataVO) => {
-  return request.post({ url: '/system/dict-data/create', data })
+  return request.post({ url: '/admin-api/system/dict-data/create', data })
 }
 
 // 修改字典数据
 export const updateDictData = (data: DictDataVO) => {
-  return request.put({ url: '/system/dict-data/update', data })
+  return request.put({ url: '/admin-api/system/dict-data/update', data })
 }
 
 // 删除字典数据
 export const deleteDictData = (id: number) => {
-  return request.delete({ url: '/system/dict-data/delete?id=' + id })
+  return request.delete({ url: '/admin-api/system/dict-data/delete?id=' + id })
 }
 
 // 导出字典类型数据
 export const exportDictData = (params) => {
-  return request.get({ url: '/system/dict-data/export', params })
+  return request.get({ url: '/admin-api/system/dict-data/export', params })
 }

src/api/system/dict/dict.type.ts

@@ -11,34 +11,34 @@ export type DictTypeVO = {
 
 // 查询字典（精简)列表
 export const getSimpleDictTypeList = () => {
-  return request.get({ url: '/system/dict-type/list-all-simple' })
+  return request.get({ url: '/admin-api/system/dict-type/list-all-simple' })
 }
 
 // 查询字典列表
 export const getDictTypePage = (params: PageParam) => {
-  return request.get({ url: '/system/dict-type/page', params })
+  return request.get({ url: '/admin-api/system/dict-type/page', params })
 }
 
 // 查询字典详情
 export const getDictType = (id: number) => {
-  return request.get({ url: '/system/dict-type/get?id=' + id })
+  return request.get({ url: '/admin-api/system/dict-type/get?id=' + id })
 }
 
 // 新增字典
 export const createDictType = (data: DictTypeVO) => {
-  return request.post({ url: '/system/dict-type/create', data })
+  return request.post({ url: '/admin-api/system/dict-type/create', data })
 }
 
 // 修改字典
 export const updateDictType = (data: DictTypeVO) => {
-  return request.put({ url: '/system/dict-type/update', data })
+  return request.put({ url: '/admin-api/system/dict-type/update', data })
 }
 
 // 删除字典
 export const deleteDictType = (id: number) => {
-  return request.delete({ url: '/system/dict-type/delete?id=' + id })
+  return request.delete({ url: '/admin-api/system/dict-type/delete?id=' + id })
 }
 // 导出字典类型
 export const exportDictType = (params) => {
-  return request.get({ url: '/system/dict-type/export', params })
+  return request.get({ url: '/admin-api/system/dict-type/export', params })
 }

src/api/system/errorCode/index.ts

@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-export interface ErrorCodeVO {
-  id: number | undefined
-  type: number
-  applicationName: string
-  code: number | undefined
-  message: string
-  memo: string
-  createTime: Date
-}
-
-// 查询错误码列表
-export const getErrorCodePage = (params: PageParam) => {
-  return request.get({ url: '/system/error-code/page', params })
-}
-
-// 查询错误码详情
-export const getErrorCode = (id: number) => {
-  return request.get({ url: '/system/error-code/get?id=' + id })
-}
-
-// 新增错误码
-export const createErrorCode = (data: ErrorCodeVO) => {
-  return request.post({ url: '/system/error-code/create', data })
-}
-
-// 修改错误码
-export const updateErrorCode = (data: ErrorCodeVO) => {
-  return request.put({ url: '/system/error-code/update', data })
-}
-
-// 删除错误码
-export const deleteErrorCode = (id: number) => {
-  return request.delete({ url: '/system/error-code/delete?id=' + id })
-}
-// 导出错误码
-export const excelErrorCode = (params) => {
-  return request.download({ url: '/system/error-code/export-excel', params })
-}

src/api/system/loginLog/index.ts

@@ -1,24 +0,0 @@
-import request from '@/config/axios'
-
-export interface LoginLogVO {
-  id: number
-  logType: number
-  traceId: number
-  userId: number
-  userType: number
-  username: string
-  status: number
-  userIp: string
-  userAgent: string
-  createTime: Date
-}
-
-// 查询登录日志列表
-export const getLoginLogPage = (params: PageParam) => {
-  return request.get({ url: '/system/login-log/page', params })
-}
-
-// 导出登录日志
-export const exportLoginLog = (params) => {
-  return request.download({ url: '/system/login-log/export', params })
-}

src/api/system/mail/account/index.ts

@@ -1,41 +0,0 @@
-import request from '@/config/axios'
-
-export interface MailAccountVO {
-  id: number
-  mail: string
-  username: string
-  password: string
-  host: string
-  port: number
-  sslEnable: boolean
-}
-
-// 查询邮箱账号列表
-export const getMailAccountPage = async (params: PageParam) => {
-  return await request.get({ url: '/system/mail-account/page', params })
-}
-
-// 查询邮箱账号详情
-export const getMailAccount = async (id: number) => {
-  return await request.get({ url: '/system/mail-account/get?id=' + id })
-}
-
-// 新增邮箱账号
-export const createMailAccount = async (data: MailAccountVO) => {
-  return await request.post({ url: '/system/mail-account/create', data })
-}
-
-// 修改邮箱账号
-export const updateMailAccount = async (data: MailAccountVO) => {
-  return await request.put({ url: '/system/mail-account/update', data })
-}
-
-// 删除邮箱账号
-export const deleteMailAccount = async (id: number) => {
-  return await request.delete({ url: '/system/mail-account/delete?id=' + id })
-}
-
-// 获得邮箱账号精简列表
-export const getSimpleMailAccountList = async () => {
-  return request.get({ url: '/system/mail-account/list-all-simple' })
-}

src/api/system/mail/log/index.ts

@@ -1,30 +0,0 @@
-import request from '@/config/axios'
-
-export interface MailLogVO {
-  id: number
-  userId: number
-  userType: number
-  toMail: string
-  accountId: number
-  fromMail: string
-  templateId: number
-  templateCode: string
-  templateNickname: string
-  templateTitle: string
-  templateContent: string
-  templateParams: string
-  sendStatus: number
-  sendTime: Date
-  sendMessageId: string
-  sendException: string
-}
-
-// 查询邮件日志列表
-export const getMailLogPage = async (params: PageParam) => {
-  return await request.get({ url: '/system/mail-log/page', params })
-}
-
-// 查询邮件日志详情
-export const getMailLog = async (id: number) => {
-  return await request.get({ url: '/system/mail-log/get?id=' + id })
-}

src/api/system/mail/template/index.ts

@@ -1,50 +0,0 @@
-import request from '@/config/axios'
-
-export interface MailTemplateVO {
-  id: number
-  name: string
-  code: string
-  accountId: number
-  nickname: string
-  title: string
-  content: string
-  params: string
-  status: number
-  remark: string
-}
-
-export interface MailSendReqVO {
-  mail: string
-  templateCode: string
-  templateParams: Map<String, Object>
-}
-
-// 查询邮件模版列表
-export const getMailTemplatePage = async (params: PageParam) => {
-  return await request.get({ url: '/system/mail-template/page', params })
-}
-
-// 查询邮件模版详情
-export const getMailTemplate = async (id: number) => {
-  return await request.get({ url: '/system/mail-template/get?id=' + id })
-}
-
-// 新增邮件模版
-export const createMailTemplate = async (data: MailTemplateVO) => {
-  return await request.post({ url: '/system/mail-template/create', data })
-}
-
-// 修改邮件模版
-export const updateMailTemplate = async (data: MailTemplateVO) => {
-  return await request.put({ url: '/system/mail-template/update', data })
-}
-
-// 删除邮件模版
-export const deleteMailTemplate = async (id: number) => {
-  return await request.delete({ url: '/system/mail-template/delete?id=' + id })
-}
-
-// 发送邮件
-export const sendMail = (data: MailSendReqVO) => {
-  return request.post({ url: '/system/mail-template/send-mail', data })
-}

src/api/system/menu/index.ts

@@ -20,30 +20,30 @@ export interface MenuVO {
 
 // 查询菜单（精简）列表
 export const getSimpleMenusList = () => {
-  return request.get({ url: '/system/menu/list-all-simple' })
+  return request.get({ url: '/admin-api/system/menu/list-all-simple' })
 }
 
 // 查询菜单列表
 export const getMenuList = (params) => {
-  return request.get({ url: '/system/menu/list', params })
+  return request.get({ url: '/admin-api/system/menu/list', params })
 }
 
 // 获取菜单详情
 export const getMenu = (id: number) => {
-  return request.get({ url: '/system/menu/get?id=' + id })
+  return request.get({ url: '/admin-api/system/menu/get?id=' + id })
 }
 
 // 新增菜单
 export const createMenu = (data: MenuVO) => {
-  return request.post({ url: '/system/menu/create', data })
+  return request.post({ url: '/admin-api/system/menu/create', data })
 }
 
 // 修改菜单
 export const updateMenu = (data: MenuVO) => {
-  return request.put({ url: '/system/menu/update', data })
+  return request.put({ url: '/admin-api/system/menu/update', data })
 }
 
 // 删除菜单
 export const deleteMenu = (id: number) => {
-  return request.delete({ url: '/system/menu/delete?id=' + id })
+  return request.delete({ url: '/admin-api/system/menu/delete?id=' + id })
 }

src/api/system/notice/index.ts

@@ -1,37 +0,0 @@
-import request from '@/config/axios'
-
-export interface NoticeVO {
-  id: number | undefined
-  title: string
-  type: number
-  content: string
-  status: number
-  remark: string
-  creator: string
-  createTime: Date
-}
-
-// 查询公告列表
-export const getNoticePage = (params: PageParam) => {
-  return request.get({ url: '/system/notice/page', params })
-}
-
-// 查询公告详情
-export const getNotice = (id: number) => {
-  return request.get({ url: '/system/notice/get?id=' + id })
-}
-
-// 新增公告
-export const createNotice = (data: NoticeVO) => {
-  return request.post({ url: '/system/notice/create', data })
-}
-
-// 修改公告
-export const updateNotice = (data: NoticeVO) => {
-  return request.put({ url: '/system/notice/update', data })
-}
-
-// 删除公告
-export const deleteNotice = (id: number) => {
-  return request.delete({ url: '/system/notice/delete?id=' + id })
-}

src/api/system/notify/message/index.ts

@@ -17,32 +17,34 @@ export interface NotifyMessageVO {
 
 // 查询站内信消息列表
 export const getNotifyMessagePage = async (params: PageParam) => {
-  return await request.get({ url: '/system/notify-message/page', params })
+  return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
 export const getMyNotifyMessagePage = async (params: PageParam) => {
-  return await request.get({ url: '/system/notify-message/my-page', params })
+  return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
 export const updateNotifyMessageRead = async (ids) => {
   return await request.put({
-    url: '/system/notify-message/update-read?' + qs.stringify({ ids: ids }, { indices: false })
+    url:
+      '/admin-api/system/notify-message/update-read?' +
+      qs.stringify({ ids: ids }, { indices: false })
   })
 }
 
 // 标记所有站内信为已读
 export const updateAllNotifyMessageRead = async () => {
-  return await request.put({ url: '/system/notify-message/update-all-read' })
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
 }
 
 // 获取当前用户的最新站内信列表
 export const getUnreadNotifyMessageList = async () => {
-  return await request.get({ url: '/system/notify-message/get-unread-list' })
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
 }
 
 // 获得当前用户的未读站内信数量
 export const getUnreadNotifyMessageCount = async () => {
-  return await request.get({ url: '/system/notify-message/get-unread-count' })
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
 }

src/api/system/oauth2/client.ts

@@ -1,47 +0,0 @@
-import request from '@/config/axios'
-
-export interface OAuth2ClientVO {
-  id: number
-  clientId: string
-  secret: string
-  name: string
-  logo: string
-  description: string
-  status: number
-  accessTokenValiditySeconds: number
-  refreshTokenValiditySeconds: number
-  redirectUris: string[]
-  autoApprove: boolean
-  authorizedGrantTypes: string[]
-  scopes: string[]
-  authorities: string[]
-  resourceIds: string[]
-  additionalInformation: string
-  isAdditionalInformationJson: boolean
-  createTime: Date
-}
-
-// 查询 OAuth2 客户端的列表
-export const getOAuth2ClientPage = (params: PageParam) => {
-  return request.get({ url: '/system/oauth2-client/page', params })
-}
-
-// 查询 OAuth2 客户端的详情
-export const getOAuth2Client = (id: number) => {
-  return request.get({ url: '/system/oauth2-client/get?id=' + id })
-}
-
-// 新增 OAuth2 客户端
-export const createOAuth2Client = (data: OAuth2ClientVO) => {
-  return request.post({ url: '/system/oauth2-client/create', data })
-}
-
-// 修改 OAuth2 客户端
-export const updateOAuth2Client = (data: OAuth2ClientVO) => {
-  return request.put({ url: '/system/oauth2-client/update', data })
-}
-
-// 删除 OAuth2
-export const deleteOAuth2Client = (id: number) => {
-  return request.delete({ url: '/system/oauth2-client/delete?id=' + id })
-}

src/api/system/oauth2/token.ts

@@ -1,22 +0,0 @@
-import request from '@/config/axios'
-
-export interface OAuth2TokenVO {
-  id: number
-  accessToken: string
-  refreshToken: string
-  userId: number
-  userType: number
-  clientId: string
-  createTime: Date
-  expiresTime: Date
-}
-
-// 查询 token列表
-export const getAccessTokenPage = (params: PageParam) => {
-  return request.get({ url: '/system/oauth2-token/page', params })
-}
-
-// 删除 token
-export const deleteAccessToken = (accessToken: string) => {
-  return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
-}

src/api/system/operatelog/index.ts

@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-
-export type OperateLogVO = {
-  id: number
-  userNickname: string
-  traceId: string
-  userId: number
-  module: string
-  name: string
-  type: number
-  content: string
-  exts: Map<String, Object>
-  requestMethod: string
-  requestUrl: string
-  userIp: string
-  userAgent: string
-  javaMethod: string
-  javaMethodArgs: string
-  startTime: Date
-  duration: number
-  resultCode: number
-  resultMsg: string
-  resultData: string
-}
-
-// 查询操作日志列表
-export const getOperateLogPage = (params: PageParam) => {
-  return request.get({ url: '/system/operate-log/page', params })
-}
-// 导出操作日志
-export const exportOperateLog = (params) => {
-  return request.download({ url: '/system/operate-log/export', params })
-}

src/api/system/permission/index.ts

@@ -18,25 +18,25 @@ export interface PermissionAssignRoleDataScopeReqVO {
 
 // 查询角色拥有的菜单权限
 export const getRoleMenuList = async (roleId: number) => {
-  return await request.get({ url: '/system/permission/list-role-resources?roleId=' + roleId })
+  return await request.get({ url: '/admin-api/system/permission/list-role-menus?roleId=' + roleId })
 }
 
 // 赋予角色菜单权限
 export const assignRoleMenu = async (data: PermissionAssignRoleMenuReqVO) => {
-  return await request.post({ url: '/system/permission/assign-role-menu', data })
+  return await request.post({ url: '/admin-api/system/permission/assign-role-menu', data })
 }
 
 // 赋予角色数据权限
 export const assignRoleDataScope = async (data: PermissionAssignRoleDataScopeReqVO) => {
-  return await request.post({ url: '/system/permission/assign-role-data-scope', data })
+  return await request.post({ url: '/admin-api/system/permission/assign-role-data-scope', data })
 }
 
 // 查询用户拥有的角色数组
 export const getUserRoleList = async (userId: number) => {
-  return await request.get({ url: '/system/permission/list-user-roles?userId=' + userId })
+  return await request.get({ url: '/admin-api/system/permission/list-user-roles?userId=' + userId })
 }
 
 // 赋予用户角色
 export const assignUserRole = async (data: PermissionAssignUserRoleReqVO) => {
-  return await request.post({ url: '/system/permission/assign-user-role', data })
+  return await request.post({ url: '/admin-api/system/permission/assign-user-role', data })
 }

src/api/system/post/index.ts

@@ -1,46 +0,0 @@
-import request from '@/config/axios'
-
-export interface PostVO {
-  id?: number
-  name: string
-  code: string
-  sort: number
-  status: number
-  remark: string
-  createTime?: Date
-}
-
-// 查询岗位列表
-export const getPostPage = async (params: PageParam) => {
-  return await request.get({ url: '/system/post/page', params })
-}
-
-// 获取岗位精简信息列表
-export const getSimplePostList = async (): Promise<PostVO[]> => {
-  return await request.get({ url: '/system/post/list-all-simple' })
-}
-
-// 查询岗位详情
-export const getPost = async (id: number) => {
-  return await request.get({ url: '/system/post/get?id=' + id })
-}
-
-// 新增岗位
-export const createPost = async (data: PostVO) => {
-  return await request.post({ url: '/system/post/create', data })
-}
-
-// 修改岗位
-export const updatePost = async (data: PostVO) => {
-  return await request.put({ url: '/system/post/update', data })
-}
-
-// 删除岗位
-export const deletePost = async (id: number) => {
-  return await request.delete({ url: '/system/post/delete?id=' + id })
-}
-
-// 导出岗位
-export const exportPost = async (params) => {
-  return await request.download({ url: '/system/post/export', params })
-}

src/api/system/role/index.ts

@@ -19,43 +19,35 @@ export interface UpdateStatusReqVO {
 
 // 查询角色列表
 export const getRolePage = async (params: PageParam) => {
-  return await request.get({ url: '/system/role/page', params })
+  return await request.get({ url: '/admin-api/system/role/page', params })
 }
 
 // 查询角色（精简)列表
-export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
-  return await request.get({ url: '/system/role/list-all-simple' })
+export const getSimpleRoleList = async () => {
+  return await request.get({ url: '/admin-api/system/role/list-all-simple' })
 }
 
 // 查询角色详情
 export const getRole = async (id: number) => {
-  return await request.get({ url: '/system/role/get?id=' + id })
+  return await request.get({ url: '/admin-api/system/role/get?id=' + id })
 }
 
 // 新增角色
 export const createRole = async (data: RoleVO) => {
-  return await request.post({ url: '/system/role/create', data })
+  return await request.post({ url: '/admin-api/system/role/create', data })
 }
 
 // 修改角色
 export const updateRole = async (data: RoleVO) => {
-  return await request.put({ url: '/system/role/update', data })
-}
-
-// 修改角色状态
-export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
-  return await request.put({ url: '/system/role/update-status', data })
+  return await request.put({ url: '/admin-api/system/role/update', data })
 }
 
 // 删除角色
 export const deleteRole = async (id: number) => {
-  return await request.delete({ url: '/system/role/delete?id=' + id })
+  return await request.delete({ url: '/admin-api/system/role/delete?id=' + id })
 }
 
-// 导出角色
-export const exportRole = (params) => {
-  return request.download({
-    url: '/system/role/export-excel',
-    params
-  })
+// 角色用户
+export const getRoleUsers = async (params) => {
+  return await request.get({ url: '/admin-api/system/role/getUserByRole', params })
 }

src/api/system/sensitiveWord/index.ts

@@ -1,58 +0,0 @@
-import request from '@/config/axios'
-import qs from 'qs'
-
-export interface SensitiveWordVO {
-  id: number
-  name: string
-  status: number
-  description: string
-  tags: string[]
-  createTime: Date
-}
-
-export interface SensitiveWordTestReqVO {
-  text: string
-  tag: string[]
-}
-
-// 查询敏感词列表
-export const getSensitiveWordPage = (params: PageParam) => {
-  return request.get({ url: '/system/sensitive-word/page', params })
-}
-
-// 查询敏感词详情
-export const getSensitiveWord = (id: number) => {
-  return request.get({ url: '/system/sensitive-word/get?id=' + id })
-}
-
-// 新增敏感词
-export const createSensitiveWord = (data: SensitiveWordVO) => {
-  return request.post({ url: '/system/sensitive-word/create', data })
-}
-
-// 修改敏感词
-export const updateSensitiveWord = (data: SensitiveWordVO) => {
-  return request.put({ url: '/system/sensitive-word/update', data })
-}
-
-// 删除敏感词
-export const deleteSensitiveWord = (id: number) => {
-  return request.delete({ url: '/system/sensitive-word/delete?id=' + id })
-}
-
-// 导出敏感词
-export const exportSensitiveWord = (params) => {
-  return request.download({ url: '/system/sensitive-word/export-excel', params })
-}
-
-// 获取所有敏感词的标签数组
-export const getSensitiveWordTagList = () => {
-  return request.get({ url: '/system/sensitive-word/get-tags' })
-}
-
-// 获得文本所包含的不合法的敏感词数组
-export const validateText = (query: SensitiveWordTestReqVO) => {
-  return request.get({
-    url: '/system/sensitive-word/validate-text?' + qs.stringify(query, { arrayFormat: 'repeat' })
-  })
-}

src/api/system/sms/smsChannel/index.ts

@@ -1,43 +0,0 @@
-import request from '@/config/axios'
-
-export interface SmsChannelVO {
-  id: number
-  code: string
-  status: number
-  signature: string
-  remark: string
-  apiKey: string
-  apiSecret: string
-  callbackUrl: string
-  createTime: Date
-}
-
-// 查询短信渠道列表
-export const getSmsChannelPage = (params: PageParam) => {
-  return request.get({ url: '/system/sms-channel/page', params })
-}
-
-// 获得短信渠道精简列表
-export function getSimpleSmsChannelList() {
-  return request.get({ url: '/system/sms-channel/list-all-simple' })
-}
-
-// 查询短信渠道详情
-export const getSmsChannel = (id: number) => {
-  return request.get({ url: '/system/sms-channel/get?id=' + id })
-}
-
-// 新增短信渠道
-export const createSmsChannel = (data: SmsChannelVO) => {
-  return request.post({ url: '/system/sms-channel/create', data })
-}
-
-// 修改短信渠道
-export const updateSmsChannel = (data: SmsChannelVO) => {
-  return request.put({ url: '/system/sms-channel/update', data })
-}
-
-// 删除短信渠道
-export const deleteSmsChannel = (id: number) => {
-  return request.delete({ url: '/system/sms-channel/delete?id=' + id })
-}

src/api/system/sms/smsLog/index.ts

@@ -1,39 +0,0 @@
-import request from '@/config/axios'
-
-export interface SmsLogVO {
-  id: number | null
-  channelId: number | null
-  channelCode: string
-  templateId: number | null
-  templateCode: string
-  templateType: number | null
-  templateContent: string
-  templateParams: Map<string, object> | null
-  apiTemplateId: string
-  mobile: string
-  userId: number | null
-  userType: number | null
-  sendStatus: number | null
-  sendTime: Date | null
-  sendCode: number | null
-  sendMsg: string
-  apiSendCode: string
-  apiSendMsg: string
-  apiRequestId: string
-  apiSerialNo: string
-  receiveStatus: number | null
-  receiveTime: Date | null
-  apiReceiveCode: string
-  apiReceiveMsg: string
-  createTime: Date | null
-}
-
-// 查询短信日志列表
-export const getSmsLogPage = (params: PageParam) => {
-  return request.get({ url: '/system/sms-log/page', params })
-}
-
-// 导出短信日志
-export const exportSmsLog = (params) => {
-  return request.download({ url: '/system/sms-log/export-excel', params })
-}

src/api/system/sms/smsTemplate/index.ts

@@ -1,60 +0,0 @@
-import request from '@/config/axios'
-
-export interface SmsTemplateVO {
-  id: number | null
-  type: number | null
-  status: number
-  code: string
-  name: string
-  content: string
-  remark: string
-  apiTemplateId: string
-  channelId: number | null
-  channelCode?: string
-  params?: string[]
-  createTime?: Date
-}
-
-export interface SendSmsReqVO {
-  mobile: string
-  templateCode: string
-  templateParams: Map<String, Object>
-}
-
-// 查询短信模板列表
-export const getSmsTemplatePage = (params: PageParam) => {
-  return request.get({ url: '/system/sms-template/page', params })
-}
-
-// 查询短信模板详情
-export const getSmsTemplate = (id: number) => {
-  return request.get({ url: '/system/sms-template/get?id=' + id })
-}
-
-// 新增短信模板
-export const createSmsTemplate = (data: SmsTemplateVO) => {
-  return request.post({ url: '/system/sms-template/create', data })
-}
-
-// 修改短信模板
-export const updateSmsTemplate = (data: SmsTemplateVO) => {
-  return request.put({ url: '/system/sms-template/update', data })
-}
-
-// 删除短信模板
-export const deleteSmsTemplate = (id: number) => {
-  return request.delete({ url: '/system/sms-template/delete?id=' + id })
-}
-
-// 导出短信模板
-export const exportSmsTemplate = (params) => {
-  return request.download({
-    url: '/system/sms-template/export-excel',
-    params
-  })
-}
-
-// 发送短信
-export const sendSms = (data: SendSmsReqVO) => {
-  return request.post({ url: '/system/sms-template/send-sms', data })
-}

src/api/system/tenant/index.ts

@@ -1,62 +0,0 @@
-import request from '@/config/axios'
-
-export interface TenantVO {
-  id: number
-  name: string
-  contactName: string
-  contactMobile: string
-  status: number
-  domain: string
-  packageId: number
-  username: string
-  password: string
-  expireTime: Date
-  accountCount: number
-  createTime: Date
-}
-
-export interface TenantPageReqVO extends PageParam {
-  name?: string
-  contactName?: string
-  contactMobile?: string
-  status?: number
-  createTime?: Date[]
-}
-
-export interface TenantExportReqVO {
-  name?: string
-  contactName?: string
-  contactMobile?: string
-  status?: number
-  createTime?: Date[]
-}
-
-// 查询租户列表
-export const getTenantPage = (params: TenantPageReqVO) => {
-  return request.get({ url: '/system/tenant/page', params })
-}
-
-// 查询租户详情
-export const getTenant = (id: number) => {
-  return request.get({ url: '/system/tenant/get?id=' + id })
-}
-
-// 新增租户
-export const createTenant = (data: TenantVO) => {
-  return request.post({ url: '/system/tenant/create', data })
-}
-
-// 修改租户
-export const updateTenant = (data: TenantVO) => {
-  return request.put({ url: '/system/tenant/update', data })
-}
-
-// 删除租户
-export const deleteTenant = (id: number) => {
-  return request.delete({ url: '/system/tenant/delete?id=' + id })
-}
-
-// 导出租户
-export const exportTenant = (params: TenantExportReqVO) => {
-  return request.download({ url: '/system/tenant/export-excel', params })
-}

src/api/system/tenantPackage/index.ts

@@ -1,42 +0,0 @@
-import request from '@/config/axios'
-
-export interface TenantPackageVO {
-  id: number
-  name: string
-  status: number
-  remark: string
-  creator: string
-  updater: string
-  updateTime: string
-  menuIds: number[]
-  createTime: Date
-}
-
-// 查询租户套餐列表
-export const getTenantPackagePage = (params: PageParam) => {
-  return request.get({ url: '/system/tenant-package/page', params })
-}
-
-// 获得租户
-export const getTenantPackage = (id: number) => {
-  return request.get({ url: '/system/tenant-package/get?id=' + id })
-}
-
-// 新增租户套餐
-export const createTenantPackage = (data: TenantPackageVO) => {
-  return request.post({ url: '/system/tenant-package/create', data })
-}
-
-// 修改租户套餐
-export const updateTenantPackage = (data: TenantPackageVO) => {
-  return request.put({ url: '/system/tenant-package/update', data })
-}
-
-// 删除租户套餐
-export const deleteTenantPackage = (id: number) => {
-  return request.delete({ url: '/system/tenant-package/delete?id=' + id })
-}
-// 获取租户套餐精简信息列表
-export const getTenantPackageList = () => {
-  return request.get({ url: '/system/tenant-package/get-simple-list' })
-}

src/api/system/user/index.ts

@@ -19,37 +19,37 @@ export interface UserVO {
 
 // 查询用户管理列表
 export const getUserPage = (params: PageParam) => {
-  return request.get({ url: '/system/user/page', params })
+  return request.get({ url: '/admin-api/system/user/page', params })
 }
 
 // 查询用户详情
 export const getUser = (id: number) => {
-  return request.get({ url: '/system/user/get?id=' + id })
+  return request.get({ url: '/admin-api/system/user/get?id=' + id })
 }
 
 // 新增用户
 export const createUser = (data: UserVO) => {
-  return request.post({ url: '/system/user/create', data })
+  return request.post({ url: '/admin-api/system/user/create', data })
 }
 
 // 修改用户
 export const updateUser = (data: UserVO) => {
-  return request.put({ url: '/system/user/update', data })
+  return request.put({ url: '/admin-api/system/user/update', data })
 }
 
 // 删除用户
 export const deleteUser = (id: number) => {
-  return request.delete({ url: '/system/user/delete?id=' + id })
+  return request.delete({ url: '/admin-api/system/user/delete?id=' + id })
 }
 
 // 导出用户
 export const exportUser = (params) => {
-  return request.download({ url: '/system/user/export', params })
+  return request.download({ url: '/admin-api/system/user/export', params })
 }
 
 // 下载用户导入模板
 export const importUserTemplate = () => {
-  return request.download({ url: '/system/user/get-import-template' })
+  return request.download({ url: '/admin-api/system/user/get-import-template' })
 }
 
 // 用户密码重置
@@ -58,7 +58,7 @@ export const resetUserPwd = (id: number, password: string) => {
     id,
     password
   }
-  return request.put({ url: '/system/user/update-password', data: data })
+  return request.put({ url: '/admin-api/system/user/update-password', data: data })
 }
 
 // 用户状态修改
@@ -67,10 +67,10 @@ export const updateUserStatus = (id: number, status: number) => {
     id,
     status
   }
-  return request.put({ url: '/system/user/update-status', data: data })
+  return request.put({ url: '/admin-api/system/user/update-status', data: data })
 }
 
 // 获取用户精简信息列表
 export const getSimpleUserList = (): Promise<UserVO[]> => {
-  return request.get({ url: '/system/user/list-all-simple' })
+  return request.get({ url: '/admin-api/system/user/list-all-simple' })
 }

src/api/system/user/profile.ts

@@ -52,18 +52,18 @@ export interface UserProfileUpdateReqVO {
 
 // 查询用户个人信息
 export const getUserProfile = () => {
-  return request.get({ url: '/system/user/profile/get' })
+  return request.get({ url: '/admin-api/system/user/profile/get' })
 }
 
 // 修改用户个人信息
 export const updateUserProfile = (data: UserProfileUpdateReqVO) => {
-  return request.put({ url: '/system/user/profile/update', data })
+  return request.put({ url: '/admin-api/system/user/profile/update', data })
 }
 
 // 用户密码重置
 export const updateUserPassword = (oldPassword: string, newPassword: string) => {
   return request.put({
-    url: '/system/user/profile/update-password',
+    url: '/admin-api/system/user/profile/update-password',
     data: {
       oldPassword: oldPassword,
       newPassword: newPassword
@@ -73,5 +73,5 @@ export const updateUserPassword = (oldPassword: string, newPassword: string) =>
 
 // 用户头像上传
 export const uploadAvatar = (data) => {
-  return request.upload({ url: '/system/user/profile/update-avatar', data: data })
+  return request.upload({ url: '/admin-api/system/user/profile/update-avatar', data: data })
 }

src/api/system/user/socialUser.ts

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 社交绑定，使用 code 授权码
 export const socialBind = (type, code, state) => {
   return request.post({
-    url: '/system/social-user/bind',
+    url: '/admin-api/system/social-user/bind',
     data: {
       type,
       code,
@@ -15,7 +15,7 @@ export const socialBind = (type, code, state) => {
 // 取消社交绑定
 export const socialUnbind = (type, openid) => {
   return request.delete({
-    url: '/system/social-user/unbind',
+    url: '/admin-api/system/social-user/unbind',
     data: {
       type,
       openid
@@ -26,6 +26,6 @@ export const socialUnbind = (type, openid) => {
 // 社交授权的跳转
 export const socialAuthRedirect = (type, redirectUri) => {
   return request.get({
-    url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
+    url: '/admin-api/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
   })
 }

src/components/Dialog/src/Dialog.vue

@@ -59,7 +59,7 @@ const dialogStyle = computed(() => {
 
 <template>
   <ElDialog
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :fullscreen="isFullscreen"
     :width="width"
     destroy-on-close

src/components/Editor/src/Editor.vue

@@ -167,7 +167,8 @@ const toolbarConfig = ref({
     'group-indent', // 缩进
     'emotion', // 表情
     'undo', // 撤销
-    'redo' // 重做
+    'redo', // 重做
+    'fullScreen'
   ]
 })
 

src/components/Pagination/index.vue

@@ -4,12 +4,13 @@
     v-show="total > 0"
     v-model:current-page="currentPage"
     v-model:page-size="pageSize"
+    :small="small"
     :background="true"
     :page-sizes="[10, 20, 30, 50, 100]"
     :pager-count="pagerCount"
     :total="total"
     class="float-right mt-15px mb-15px"
-    layout="total, sizes, prev, pager, next, jumper"
+    :layout="layout"
     @size-change="handleSizeChange"
     @current-change="handleCurrentChange"
   />
@@ -38,6 +39,14 @@ const props = defineProps({
   pagerCount: {
     type: Number,
     default: document.body.clientWidth < 992 ? 5 : 7
+  },
+  layout: {
+    type: String,
+    default: 'total, sizes, prev, pager, next, jumper'
+  },
+  small: {
+    type: Boolean,
+    default: false
   }
 })
 

src/config/axios/config.ts

@@ -7,7 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL,
+  base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH,
   /**
    * 接口成功返回状态码
    */

src/config/axios/service.ts

@@ -9,13 +9,19 @@ import axios, {
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
 import qs from 'qs'
 import { config } from '@/config/axios/config'
-import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
+import {
+  getAccessToken,
+  getRefreshToken,
+  getTenantId,
+  getAppId,
+  removeToken,
+  setToken
+} from '@/utils/auth'
 import errorCode from './errorCode'
 
 import { resetRouter } from '@/router'
 import { useCache } from '@/hooks/web/useCache'
 
-const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
 const { result_code, base_url, request_timeout } = config
 
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
@@ -55,10 +61,17 @@ service.interceptors.request.use(
       ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token
     }
     // 设置租户
-    if (tenantEnable && tenantEnable === 'true') {
-      const tenantId = getTenantId()
-      if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId
+    const tenantId = getTenantId()
+    if (tenantId) {
+      ;(config as Recordable).headers['tenant-id'] = tenantId
     }
+
+    // 设置实例
+    const appId = getAppId()
+    if (appId) {
+      ;(config as Recordable).headers['instance-id'] = appId
+    }
+
     const params = config.params || {}
     const data = config.data || false
     if (
@@ -226,12 +239,15 @@ const handleAuthorized = () => {
       type: 'warning'
     }).then(() => {
       const { wsCache } = useCache()
+      const tenantId = wsCache.get('TENANT_ID')
+      const appId = wsCache.get('App_ID')
       resetRouter() // 重置静态路由表
       wsCache.clear()
       removeToken()
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
-      window.location.href = window.location.href
+      // window.location.href = window.location.href
+      window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))

src/layout/components/Logo/src/Logo.vue

@@ -11,7 +11,7 @@ const appStore = useAppStore()
 
 const show = ref(true)
 
-const title = computed(() => appStore.getTitle)
+const title = computed(() => appStore.getAppInfo.instanceName)
 
 const layout = computed(() => appStore.getLayout)
 

src/layout/components/Message/src/Message.vue

@@ -16,10 +16,9 @@ const getList = async () => {
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  unreadCount.value = 9
-  // NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
-  //   unreadCount.value = data
-  // })
+  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+    unreadCount.value = data
+  })
 }
 
 // 跳转我的站内信

src/layout/components/RoleSelect/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <el-select v-model="roleId" filterable @change="handleChangeRole" style="width: 150px">
+    <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
+  </el-select>
+</template>
+
+<script setup name="RoleSelect">
+import { useUserStore } from '@/store/modules/user'
+import { getInfo } from '@/api/login/index'
+
+const userStore = useUserStore()
+
+const options = computed(() => {
+  return userStore.getRoles
+})
+const roleId = ref(1)
+
+function handleChangeRole(val) {
+  getInfo({ params: { roleId: val } })
+}
+</script>
+
+<style lang="scss" scoped></style>

src/layout/components/Setting/src/Setting.vue

@@ -1,7 +1,7 @@
 <script lang="ts" name="Setting" setup>
-import { ElMessage } from 'element-plus'
-import { useClipboard, useCssVar } from '@vueuse/core'
-
+// import { ElMessage } from 'element-plus'
+// import { useClipboard, useCssVar } from '@vueuse/core'
+import { useCssVar } from '@vueuse/core'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
 
@@ -10,8 +10,8 @@ import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
 import { useAppStore } from '@/store/modules/app'
 import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
-import InterfaceDisplay from './components/InterfaceDisplay.vue'
-import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+// import InterfaceDisplay from './components/InterfaceDisplay.vue'
+// import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
 
 const { t } = useI18n()
 const appStore = useAppStore()
@@ -106,85 +106,85 @@ watch(
 )
 
 // 拷贝
-const copyConfig = async () => {
-  const { copy, copied, isSupported } = useClipboard({
-    source: `
-      // 面包屑
-      breadcrumb: ${appStore.getBreadcrumb},
-      // 面包屑图标
-      breadcrumbIcon: ${appStore.getBreadcrumbIcon},
-      // 折叠图标
-      hamburger: ${appStore.getHamburger},
-      // 全屏图标
-      screenfull: ${appStore.getScreenfull},
-      // 尺寸图标
-      size: ${appStore.getSize},
-      // 多语言图标
-      locale: ${appStore.getLocale},
-      // 消息图标
-      message: ${appStore.getMessage},
-      // 标签页
-      tagsView: ${appStore.getTagsView},
-      // 标签页图标
-      getTagsViewIcon: ${appStore.getTagsViewIcon},
-      // logo
-      logo: ${appStore.getLogo},
-      // 菜单手风琴
-      uniqueOpened: ${appStore.getUniqueOpened},
-      // 固定header
-      fixedHeader: ${appStore.getFixedHeader},
-      // 页脚
-      footer: ${appStore.getFooter},
-      // 灰色模式
-      greyMode: ${appStore.getGreyMode},
-      // layout布局
-      layout: '${appStore.getLayout}',
-      // 暗黑模式
-      isDark: ${appStore.getIsDark},
-      // 组件尺寸
-      currentSize: '${appStore.getCurrentSize}',
-      // 主题相关
-      theme: {
-        // 主题色
-        elColorPrimary: '${appStore.getTheme.elColorPrimary}',
-        // 左侧菜单边框颜色
-        leftMenuBorderColor: '${appStore.getTheme.leftMenuBorderColor}',
-        // 左侧菜单背景颜色
-        leftMenuBgColor: '${appStore.getTheme.leftMenuBgColor}',
-        // 左侧菜单浅色背景颜色
-        leftMenuBgLightColor: '${appStore.getTheme.leftMenuBgLightColor}',
-        // 左侧菜单选中背景颜色
-        leftMenuBgActiveColor: '${appStore.getTheme.leftMenuBgActiveColor}',
-        // 左侧菜单收起选中背景颜色
-        leftMenuCollapseBgActiveColor: '${appStore.getTheme.leftMenuCollapseBgActiveColor}',
-        // 左侧菜单字体颜色
-        leftMenuTextColor: '${appStore.getTheme.leftMenuTextColor}',
-        // 左侧菜单选中字体颜色
-        leftMenuTextActiveColor: '${appStore.getTheme.leftMenuTextActiveColor}',
-        // logo字体颜色
-        logoTitleTextColor: '${appStore.getTheme.logoTitleTextColor}',
-        // logo边框颜色
-        logoBorderColor: '${appStore.getTheme.logoBorderColor}',
-        // 头部背景颜色
-        topHeaderBgColor: '${appStore.getTheme.topHeaderBgColor}',
-        // 头部字体颜色
-        topHeaderTextColor: '${appStore.getTheme.topHeaderTextColor}',
-        // 头部悬停颜色
-        topHeaderHoverColor: '${appStore.getTheme.topHeaderHoverColor}',
-        // 头部边框颜色
-        topToolBorderColor: '${appStore.getTheme.topToolBorderColor}'
-      }
-    `
-  })
-  if (!isSupported) {
-    ElMessage.error(t('setting.copyFailed'))
-  } else {
-    await copy()
-    if (unref(copied)) {
-      ElMessage.success(t('setting.copySuccess'))
-    }
-  }
-}
+// const copyConfig = async () => {
+//   const { copy, copied, isSupported } = useClipboard({
+//     source: `
+//       // 面包屑
+//       breadcrumb: ${appStore.getBreadcrumb},
+//       // 面包屑图标
+//       breadcrumbIcon: ${appStore.getBreadcrumbIcon},
+//       // 折叠图标
+//       hamburger: ${appStore.getHamburger},
+//       // 全屏图标
+//       screenfull: ${appStore.getScreenfull},
+//       // 尺寸图标
+//       size: ${appStore.getSize},
+//       // 多语言图标
+//       locale: ${appStore.getLocale},
+//       // 消息图标
+//       message: ${appStore.getMessage},
+//       // 标签页
+//       tagsView: ${appStore.getTagsView},
+//       // 标签页图标
+//       getTagsViewIcon: ${appStore.getTagsViewIcon},
+//       // logo
+//       logo: ${appStore.getLogo},
+//       // 菜单手风琴
+//       uniqueOpened: ${appStore.getUniqueOpened},
+//       // 固定header
+//       fixedHeader: ${appStore.getFixedHeader},
+//       // 页脚
+//       footer: ${appStore.getFooter},
+//       // 灰色模式
+//       greyMode: ${appStore.getGreyMode},
+//       // layout布局
+//       layout: '${appStore.getLayout}',
+//       // 暗黑模式
+//       isDark: ${appStore.getIsDark},
+//       // 组件尺寸
+//       currentSize: '${appStore.getCurrentSize}',
+//       // 主题相关
+//       theme: {
+//         // 主题色
+//         elColorPrimary: '${appStore.getTheme.elColorPrimary}',
+//         // 左侧菜单边框颜色
+//         leftMenuBorderColor: '${appStore.getTheme.leftMenuBorderColor}',
+//         // 左侧菜单背景颜色
+//         leftMenuBgColor: '${appStore.getTheme.leftMenuBgColor}',
+//         // 左侧菜单浅色背景颜色
+//         leftMenuBgLightColor: '${appStore.getTheme.leftMenuBgLightColor}',
+//         // 左侧菜单选中背景颜色
+//         leftMenuBgActiveColor: '${appStore.getTheme.leftMenuBgActiveColor}',
+//         // 左侧菜单收起选中背景颜色
+//         leftMenuCollapseBgActiveColor: '${appStore.getTheme.leftMenuCollapseBgActiveColor}',
+//         // 左侧菜单字体颜色
+//         leftMenuTextColor: '${appStore.getTheme.leftMenuTextColor}',
+//         // 左侧菜单选中字体颜色
+//         leftMenuTextActiveColor: '${appStore.getTheme.leftMenuTextActiveColor}',
+//         // logo字体颜色
+//         logoTitleTextColor: '${appStore.getTheme.logoTitleTextColor}',
+//         // logo边框颜色
+//         logoBorderColor: '${appStore.getTheme.logoBorderColor}',
+//         // 头部背景颜色
+//         topHeaderBgColor: '${appStore.getTheme.topHeaderBgColor}',
+//         // 头部字体颜色
+//         topHeaderTextColor: '${appStore.getTheme.topHeaderTextColor}',
+//         // 头部悬停颜色
+//         topHeaderHoverColor: '${appStore.getTheme.topHeaderHoverColor}',
+//         // 头部边框颜色
+//         topToolBorderColor: '${appStore.getTheme.topToolBorderColor}'
+//       }
+//     `
+//   })
+//   if (!isSupported) {
+//     ElMessage.error(t('setting.copyFailed'))
+//   } else {
+//     await copy()
+//     if (unref(copied)) {
+//       ElMessage.success(t('setting.copySuccess'))
+//     }
+//   }
+// }
 
 // 清空缓存
 const clear = () => {
@@ -216,8 +216,8 @@ const clear = () => {
       <ThemeSwitch />
 
       <!-- 布局 -->
-      <ElDivider>{{ t('setting.layout') }}</ElDivider>
-      <LayoutRadioPicker />
+      <!-- <ElDivider>{{ t('setting.layout') }}</ElDivider> -->
+      <!-- <LayoutRadioPicker /> -->
 
       <!-- 系统主题 -->
       <ElDivider>{{ t('setting.systemTheme') }}</ElDivider>
@@ -274,13 +274,13 @@ const clear = () => {
     </div>
 
     <!-- 界面显示 -->
-    <ElDivider>{{ t('setting.interfaceDisplay') }}</ElDivider>
-    <InterfaceDisplay />
+    <!-- <ElDivider>{{ t('setting.interfaceDisplay') }}</ElDivider>
+    <InterfaceDisplay /> -->
 
     <ElDivider />
-    <div>
+    <!-- <div>
       <ElButton class="w-full" type="primary" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
-    </div>
+    </div> -->
     <div class="mt-5px">
       <ElButton class="w-full" type="danger" @click="clear">
         {{ t('setting.clearAndReset') }}

src/layout/components/Setting/src/components/InterfaceDisplay.vue

@@ -11,7 +11,7 @@ const { setWatermark } = useWatermark()
 const prefixCls = getPrefixCls('interface-display')
 const appStore = useAppStore()
 
-const water = ref()
+const water = ref('安徽莳松科技有限公司')
 
 // 面包屑
 const breadcrumb = ref(appStore.getBreadcrumb)
@@ -124,6 +124,7 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
   setWatermark(water.value)
 }
+setWater()
 
 const layout = computed(() => appStore.getLayout)
 

src/layout/components/ToolHeader.vue

@@ -7,6 +7,7 @@ import { Screenfull } from '@/layout/components/Screenfull'
 import { Breadcrumb } from '@/layout/components/Breadcrumb'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
+import RoleSelect from './RoleSelect/index.vue'
 
 const { getPrefixCls, variables } = useDesign()
 
@@ -50,6 +51,7 @@ export default defineComponent({
           </div>
         ) : undefined}
         <div class="h-full flex items-center">
+          <RoleSelect />
           {screenfull.value ? (
             <Screenfull class="hover-trigger" color="var(--top-header-text-color)"></Screenfull>
           ) : undefined}

src/layout/components/UserInfo/src/UserInfo.vue

@@ -6,6 +6,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import { getTenantId, getAppId } from '@/utils/auth'
 
 const { t } = useI18n()
 
@@ -34,18 +35,17 @@ const loginOut = () => {
     type: 'warning'
   })
     .then(async () => {
+      const tenantId = getTenantId()
+      const appId = getAppId()
       await userStore.loginOut()
       tagsViewStore.delAllViews()
-      replace('/login?redirect=/index')
+      replace(`/login?tenantId=${tenantId}&appId=${appId}`)
     })
     .catch(() => {})
 }
 const toProfile = async () => {
   push('/user/profile')
 }
-const toDocument = () => {
-  window.open('https://doc.iocoder.cn/')
-}
 </script>
 
 <template>
@@ -68,10 +68,6 @@ const toDocument = () => {
           <Icon icon="ep:tools" />
           <div @click="toProfile">{{ t('common.profile') }}</div>
         </ElDropdownItem>
-        <ElDropdownItem>
-          <Icon icon="ep:menu" />
-          <div @click="toDocument">{{ t('common.document') }}</div>
-        </ElDropdownItem>
         <ElDropdownItem divided @click="loginOut">
           <Icon icon="ep:switch-button" />
           <div>{{ t('common.loginOut') }}</div>

src/locales/zh-CN.ts

@@ -67,7 +67,7 @@ export default {
     hasRole: `请设置角色权限标签值`
   },
   setting: {
-    projectSetting: '项目配置',
+    projectSetting: '主题配置',
     theme: '主题',
     layout: '布局',
     systemTheme: '系统主题',
@@ -436,5 +436,6 @@ export default {
     btn_zoom_in: '放大',
     btn_zoom_out: '缩小',
     preview: '预览'
-  }
+  },
+  'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时，一直 warn 报错
 }

src/permission.js

@@ -7,19 +7,13 @@ import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
+import { getTenantId, getAppId } from '@/utils/auth'
 
 const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = [
-  '/login',
-  '/social-login',
-  '/auth-redirect',
-  '/bind',
-  '/register',
-  '/oauthLogin/gitee'
-]
+const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register']
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
@@ -57,7 +51,13 @@ router.beforeEach(async (to, from, next) => {
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      const tenantId = getTenantId()
+      const appId = getAppId()
+      if (tenantId && appId) {
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      } else {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      }
     }
   }
 })

src/plugins/cache/index.js

@@ -1,7 +1,7 @@
 import router from '@/router'
 import { name as appName } from '../../../package.json'
 
-let name = `${appName}-${import.meta.env.VITE_APP_ENV}`
+let name = `${appName}-${import.meta.env.VITE_NODE_ENV}`
 
 const sessionCache = {
   set(key, value) {

src/router/modules/remaining.ts

@@ -51,309 +51,14 @@ const remainingRouter: AppRouteRecordRaw[] = [
     }
   },
   {
-    path: '/',
+    path: '',
     component: Layout,
-    redirect: '/index',
-    name: 'Home',
-    meta: { title: '统计报表' },
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/Home/Index.vue'),
-        name: 'Index',
-        meta: {
-          title: t('router.home'),
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'channel',
-        component: () => import('@/views/Home/channel.vue'),
-        name: 'ChannelStatistics',
-        meta: {
-          title: '渠道统计',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'status',
-        component: () => import('@/views/Home/status.vue'),
-        name: 'StatusStatistics',
-        meta: {
-          title: '线索状态统计',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      }
-    ]
+    redirect: '/Home/index',
+    meta: {
+      title: '首页',
+      hidden: true
+    }
   },
-  {
-    path: '/clue',
-    component: Layout,
-    redirect: '/clue',
-    name: 'Clue',
-    meta: { title: '线索管理' },
-    children: [
-      {
-        path: 'pool',
-        component: () => import('@/views/Clue/Pool/index.vue'),
-        name: 'CluePool',
-        meta: {
-          title: '线索池',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'order',
-        component: () => import('@/views/Clue/Order/index.vue'),
-        name: 'ClueOrder',
-        meta: {
-          title: '成交管理',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'skill',
-        component: () => import('@/views/Clue/Skill/index.vue'),
-        name: 'Skill',
-        meta: {
-          title: '关键话术',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'setting',
-        component: () => import('@/views/Clue/Set/index.vue'),
-        name: 'ClueSetting',
-        meta: {
-          title: '通用配置',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/schoolManagement',
-    component: Layout,
-    redirect: '/schoolManagement',
-    name: 'SchoolManagement',
-    meta: { title: '驾校管理' },
-    children: [
-      {
-        path: 'school',
-        component: () => import('@/views/SchoolManagement/School/index.vue'),
-        name: 'School',
-        meta: {
-          title: '驾校',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'place',
-        component: () => import('@/views/SchoolManagement/Place/index.vue'),
-        name: 'Place',
-        meta: {
-          title: '场地',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'class',
-        component: () => import('@/views/SchoolManagement/Class/index.vue'),
-        name: 'Class',
-        meta: {
-          title: '班型',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/miniMall',
-    component: Layout,
-    redirect: '/miniMall/product',
-    name: 'MiniMall',
-    meta: { title: '进销存' },
-    children: [
-      {
-        path: 'product',
-        component: () => import('@/views/MiniMall/Product/index.vue'),
-        name: 'Product',
-        meta: {
-          title: '产品列表',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'purchase',
-        component: () => import('@/views/MiniMall/Purchase/index.vue'),
-        name: 'Purchase',
-        meta: {
-          title: '采购列表',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'inventory',
-        component: () => import('@/views/MiniMall/Inventory/index.vue'),
-        name: 'Inventory',
-        meta: {
-          title: '库存管理',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'mallSet',
-        component: () => import('@/views/MiniMall/MallSet/index.vue'),
-        name: 'MallSet',
-        meta: {
-          title: '通用配置',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'productAdd',
-        component: () => import('@/views/MiniMall/Product/add.vue'),
-        name: 'ProductAdd',
-        meta: {
-          title: '产品新增',
-          icon: 'ep:home-filled',
-          hidden: true,
-          canTo: true,
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'productEdit',
-        component: () => import('@/views/MiniMall/Product/add.vue'),
-        name: 'ProductEdit',
-        meta: {
-          title: '产品修改',
-          icon: 'ep:home-filled',
-          hidden: true,
-          canTo: true,
-          noCache: false,
-          affix: true
-        }
-      }
-    ]
-  },
-
-  {
-    path: '/basic',
-    component: Layout,
-    redirect: '/basic/',
-    name: 'Basic',
-    meta: { title: '基础设置' },
-    children: [
-      {
-        path: 'library',
-        component: () => import('@/views/Basic/Library/index.vue'),
-        name: 'Library',
-        meta: {
-          title: '知识库',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'wxRobot',
-        component: () => import('@/views/Basic/WxRobot/index.vue'),
-        name: 'WxRobot',
-        meta: {
-          title: '微信机器人',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'dept',
-        component: () => import('@/views/Basic/Dept/index.vue'),
-        name: 'Dept',
-        meta: {
-          title: '部门',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'role',
-        component: () => import('@/views/Basic/Role/index.vue'),
-        name: 'Role',
-        meta: {
-          title: '角色',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'employee',
-        component: () => import('@/views/Basic/User/index.vue'),
-        name: 'Employee',
-        meta: {
-          title: '员工',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'generalSet',
-        component: () => import('@/views/Basic/GeneralSet/index.vue'),
-        name: 'GeneralSet',
-        meta: {
-          title: '通用配置',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      },
-      {
-        path: 'menu',
-        component: () => import('@/views/Basic/Menu/index.vue'),
-        name: 'menu',
-        meta: {
-          title: '菜单管理',
-          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
-        }
-      }
-    ]
-  },
-
   {
     path: '/user',
     component: Layout,

src/store/modules/app.ts

@@ -6,6 +6,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
+import { getAppInfo } from '@/api/login'
 
 const { wsCache } = useCache()
 
@@ -35,6 +36,7 @@ interface AppState {
   footer: boolean
   theme: ThemeTypes
   fixedMenu: boolean
+  appInfo: any
 }
 
 export const useAppStore = defineStore('app', {
@@ -44,19 +46,20 @@ export const useAppStore = defineStore('app', {
       sizeMap: ['default', 'large', 'small'],
       mobile: false, // 是否是移动端
       title: import.meta.env.VITE_APP_TITLE, // 标题
+      appInfo: wsCache.get('appInfo'),
       pageLoading: false, // 路由跳转loading
 
       breadcrumb: true, // 面包屑
-      breadcrumbIcon: true, // 面包屑图标
+      breadcrumbIcon: false, // 面包屑图标
       collapse: false, // 折叠菜单
       uniqueOpened: true, // 是否只保持一个子菜单的展开
       hamburger: true, // 折叠图标
       screenfull: true, // 全屏图标
-      size: true, // 尺寸图标
-      locale: true, // 多语言图标
+      size: false, // 尺寸图标
+      locale: false, // 多语言图标
       message: true, // 消息图标
       tagsView: true, // 标签页
-      tagsViewIcon: true, // 是否显示标签图标
+      tagsViewIcon: false, // 是否显示标签图标
       logo: true, // logo
       fixedHeader: true, // 固定toolheader
       footer: false, // 显示页脚
@@ -173,6 +176,9 @@ export const useAppStore = defineStore('app', {
     },
     getFooter(): boolean {
       return this.footer
+    },
+    getAppInfo(): any {
+      return this.appInfo
     }
   },
   actions: {
@@ -265,6 +271,12 @@ export const useAppStore = defineStore('app', {
     },
     setFooter(footer: boolean) {
       this.footer = footer
+    },
+    async setAppInfo(appId: number) {
+      const appInfo = await getAppInfo(appId)
+      wsCache.set('appInfo', appInfo)
+      this.appInfo = appInfo
+      return appInfo
     }
   }
 })

src/store/modules/permission.ts

@@ -3,7 +3,6 @@ import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
-// import { getAsyncRoutes } from '@/api/login'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 const { wsCache } = useCache()
@@ -34,15 +33,11 @@ export const usePermissionStore = defineStore('permission', {
   actions: {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
-        let res: AppCustomRouteRecordRaw[]
+        let res: AppCustomRouteRecordRaw[] = []
         if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
           res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
-        } else {
-          res = []
-          // res = await getAsyncRoutes()
-          wsCache.set(CACHE_KEY.ROLE_ROUTERS, res)
         }
-        const routerMap: AppRouteRecordRaw[] = generateRoute(res as AppCustomRouteRecordRaw[])
+        const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面
         this.addRouters = routerMap.concat([
           {

src/store/modules/user.ts

@@ -58,6 +58,7 @@ export const useUserStore = defineStore('admin-user', {
       this.user = userInfo.user
       this.isSetUser = true
       wsCache.set(CACHE_KEY.USER, userInfo)
+      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
     },
     async loginOut() {
       await loginOut()

src/utils/auth.ts

@@ -39,7 +39,8 @@ export const formatToken = (token: string): string => {
 const LoginFormKey = 'LOGINFORM'
 
 export type LoginFormType = {
-  tenantName: string
+  tenantId: number
+  appId: number
   username: string
   password: string
   rememberMe: boolean
@@ -90,3 +91,30 @@ export const setTenantId = (username: string) => {
 export const removeTenantId = () => {
   wsCache.delete(TenantIdKey)
 }
+
+const AppIdKey = 'App_ID'
+const AppNameKey = 'App_NAME'
+
+export const getAPPName = () => {
+  return wsCache.get(AppNameKey)
+}
+
+export const setAppName = (name: string) => {
+  wsCache.set(AppNameKey, name, { exp: 30 * 24 * 60 * 60 })
+}
+
+export const removeAppName = () => {
+  wsCache.delete(AppNameKey)
+}
+
+export const getAppId = () => {
+  return wsCache.get(AppIdKey)
+}
+
+export const setAppId = (id: number) => {
+  wsCache.set(AppIdKey, id)
+}
+
+export const removeAppId = () => {
+  wsCache.delete(AppIdKey)
+}

src/utils/constants.ts

@@ -6,8 +6,8 @@
 
 // 全局通用状态枚举
 export const CommonStatusEnum = {
-  ENABLE: 1, // 开启
-  DISABLE: 0 // 禁用
+  ENABLE: 0, // 开启
+  DISABLE: 1 // 禁用
 }
 
 /**

src/views/Basic/Dept/DeptForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -43,8 +43,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="status">
             <el-radio-group v-model="formData.status">
-              <el-radio :label="1"> 启用 </el-radio>
-              <el-radio :label="0"> 禁用 </el-radio>
+              <el-radio :label="0"> 启用 </el-radio>
+              <el-radio :label="1"> 禁用 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -61,7 +61,7 @@
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 <script lang="ts" name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'

src/views/Basic/Dept/index.vue

@@ -22,8 +22,8 @@
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
     <el-table-column prop="status" label="状态" width="100" />
-    <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-    <el-table-column label="操作" align="center" class-name="fixed-width" width="160">
+    <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
+    <el-table-column label="操作" class-name="fixed-width" width="160">
       <template #default="scope">
         <el-button link type="primary" @click="openForm('update', scope.row.id)"> 修改 </el-button>
         <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
@@ -36,18 +36,16 @@
 </template>
 <script setup lang="ts" name="SystemDept">
 import { handleTree } from '@/utils/tree'
-// import * as DeptApi from '@/api/system/dept'
+import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
-// import * as UserApi from '@/api/system/user'
+import { dateFormatter } from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const list = ref() // 列表的数据
 const queryParams = reactive({
-  name: undefined,
-  pageNo: 1,
-  pageSize: 20
+  name: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -55,11 +53,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    // const data = await DeptApi.getDeptPage(queryParams)
-    const data = [
-      { name: '职能部', id: 10001, leader: '张三', status: 1 },
-      { name: '财务部', id: 10002, leader: '李四', parentId: 10001, status: 1 }
-    ]
+    const data = await DeptApi.getDeptPage(queryParams)
     list.value = handleTree(data)
   } finally {
     loading.value = false
@@ -68,13 +62,11 @@ const getList = async () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.pageNo = 1
   getList()
 }
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryParams.pageNo = 1
   queryFormRef.value.resetFields()
   handleQuery()
 }
@@ -88,11 +80,10 @@ const openForm = (type: string, id?: number) => {
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
-    console.log(id)
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    // await DeptApi.deleteDept(id)
+    await DeptApi.deleteDept(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()

src/views/Basic/Library/Comp/DialogLibrary.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" v-model="dialogVisible" width="800px">
+  <Dialog :title="title" v-model="dialogVisible" width="800px">
     <el-form :model="form" ref="addForm" :rules="rules" label-width="100px">
       <el-form-item label="知识库名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入" />
@@ -21,7 +21,7 @@
         <el-button type="primary" @click="handleSave">保 存</el-button>
       </span>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 
 <script setup>

src/views/Basic/Library/Comp/DialogResource.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" v-model="show" width="800px">
+  <Dialog :title="title" v-model="show" width="800px">
     <el-form :model="form" ref="resourceForm" :rules="rules" label-width="60px">
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
@@ -63,7 +63,7 @@
         <el-button type="primary" @click="handleSave">保 存</el-button>
       </span>
     </template>
-  </el-dialog>
+  </Dialog>
 </template>
 
 <script setup>

src/views/Basic/Menu/MenuForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="500px">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -59,8 +59,8 @@
       </el-form-item>
       <el-form-item label="菜单状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio :label="1"> 启用 </el-radio>
-          <el-radio :label="0"> 禁用 </el-radio>
+          <el-radio :label="0"> 启用 </el-radio>
+          <el-radio :label="1"> 禁用 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formData.type !== 3" label="显示状态" prop="visible">
@@ -105,7 +105,7 @@
 </template>
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-// import * as MenuApi from '@/api/system/menu'
+import * as MenuApi from '@/api/system/menu'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
@@ -155,7 +155,7 @@ const open = async (type: string, id?: number, parentId?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      // formData.value = await MenuApi.getMenu(id)
+      formData.value = await MenuApi.getMenu(id)
     } finally {
       formLoading.value = false
     }
@@ -189,12 +189,12 @@ const submitForm = async () => {
         }
       }
     }
-    // const data = formData.value as unknown as MenuApi.MenuVO
+    const data = formData.value as unknown as MenuApi.MenuVO
     if (formType.value === 'create') {
-      // await MenuApi.createMenu(data)
+      await MenuApi.createMenu(data)
       message.success(t('common.createSuccess'))
     } else {
-      // await MenuApi.updateMenu(data)
+      await MenuApi.updateMenu(data)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -211,8 +211,7 @@ const submitForm = async () => {
 const menuTree = ref<Tree[]>([]) // 树形结构
 const getTree = async () => {
   menuTree.value = []
-  // const res = await MenuApi.getSimpleMenusList()
-  const res = []
+  const res = await MenuApi.getSimpleMenusList()
   let menu: Tree = { id: 0, name: '主类目', children: [] }
   menu.children = handleTree(res)
   menuTree.value.push(menu)