多模块重构 10：去除 Freemarker 依赖，修改字典的前缀，从 sys=》system、inf=》infra 见名知意

yudao-admin-server/pom.xml

@@ -32,6 +32,11 @@
             <artifactId>yudao-module-system-impl</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-tool-impl</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-infra-impl</artifactId>

yudao-admin-server/src/main/resources/application.yaml

@@ -74,9 +74,12 @@ yudao:
     db-schemas: ${spring.datasource.dynamic.datasource.master.name}
   error-code: # 错误码相关配置项
     constants-class-list:
-      - cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants
+      - cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants
+      - cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants
+      - cn.iocoder.yudao.module.member.enums.ErrorCodeConstants
+      - cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants
       - cn.iocoder.yudao.module.system.enums.ErrorCodeConstants
-      - cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants
+      - cn.iocoder.yudao.module.tool.enums.ErrorCodeConstants
   tenant: # 多租户相关配置项
     tables: # 配置需要开启多租户的表；如果实体已经继承 TenantBaseDO 类，则无需重复配置
   sms-code: # 短信验证码相关的配置项

yudao-admin-ui/src/api/infra/dbDoc.js → yudao-admin-ui/src/api/tool/dbDoc.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 
 export function exportHtml() {
   return request({
-    url: '/infra/db-doc/export-html',
+    url: '/tool/db-doc/export-html',
     method: 'get',
     responseType: 'blob'
   })
@@ -11,7 +11,7 @@ export function exportHtml() {
 
 export function exportWord() {
   return request({
-    url: '/infra/db-doc/export-word',
+    url: '/tool/db-doc/export-word',
     method: 'get',
     responseType: 'blob'
   })
@@ -19,7 +19,7 @@ export function exportWord() {
 
 export function exportMarkdown() {
   return request({
-    url: '/infra/db-doc/export-markdown',
+    url: '/tool/db-doc/export-markdown',
     method: 'get',
     responseType: 'blob'
   })

yudao-admin-ui/src/store/modules/dict.js

@@ -19,7 +19,7 @@ const actions = {
   loadDictDatas({ commit }) {
     listSimpleDictDatas().then(response => {
       // 如果未加载到数据，则直接返回
-      if (!response.data) {
+      if (!response || !response.data) {
         return;
       }
       // 设置数据

yudao-admin-ui/src/utils/constants.js

@@ -7,7 +7,7 @@
 /**
  * 全局通用状态枚举
  */
-export const SysCommonStatusEnum = {
+export const CommonStatusEnum = {
   ENABLE: 0, // 开启
   DISABLE: 1 // 禁用
 }
@@ -15,7 +15,7 @@ export const SysCommonStatusEnum = {
 /**
  * 菜单的类型枚举
  */
-export const SysMenuTypeEnum = {
+export const SystemMenuTypeEnum = {
   DIR: 1, // 目录
   MENU: 2, // 菜单
   BUTTON: 3 // 按钮
@@ -24,7 +24,7 @@ export const SysMenuTypeEnum = {
 /**
  * 角色的类型枚举
  */
-export const SysRoleTypeEnum = {
+export const SystemRoleTypeEnum = {
   SYSTEM: 1, // 内置角色
   CUSTOM: 2 // 自定义角色
 }
@@ -32,7 +32,7 @@ export const SysRoleTypeEnum = {
 /**
  * 数据权限的范围枚举
  */
-export const SysDataScopeEnum = {
+export const SystemDataScopeEnum = {
   ALL: 1, // 全部数据权限
   DEPT_CUSTOM: 2, // 指定部门数据权限
   DEPT_ONLY: 3, // 部门数据权限
@@ -52,7 +52,7 @@ export const ToolCodegenTemplateTypeEnum = {
 /**
  * 任务状态的枚举
  */
-export const InfJobStatusEnum = {
+export const InfraJobStatusEnum = {
   INIT: 0, // 初始化中
   NORMAL: 1, // 运行中
   STOP: 2, // 暂停运行
@@ -61,7 +61,7 @@ export const InfJobStatusEnum = {
 /**
  * API 异常数据的处理状态
  */
-export const InfApiErrorLogProcessStatusEnum = {
+export const InfraApiErrorLogProcessStatusEnum = {
   INIT: 0, // 未处理
   DONE: 1, // 已处理
   IGNORE: 2, // 已忽略
@@ -70,7 +70,7 @@ export const InfApiErrorLogProcessStatusEnum = {
 /**
  * 用户的社交平台的类型枚举
  */
-export const SysUserSocialTypeEnum = {
+export const SystemUserSocialTypeEnum = {
   // GITEE: {
   //   title: "码云",
   //   type: 10,
@@ -136,7 +136,7 @@ export const PayType = {
 /**
  * 支付订单状态枚举
  */
-export const payOrderStatusEnum = {
+export const PayOrderStatusEnum = {
   WAITING: {
     status: 0,
     name: '未支付'
@@ -154,7 +154,7 @@ export const payOrderStatusEnum = {
 /**
  * 支付订单回调状态枚举
  */
-export const payOrderNotifyStatusEnum = {
+export const PayOrderNotifyStatusEnum = {
   NO: {
     status: 0,
     name: '未通知'
@@ -172,7 +172,7 @@ export const payOrderNotifyStatusEnum = {
 /**
  * 支付订单退款状态枚举
  */
-export const payOrderRefundStatusEnum = {
+export const PayOrderRefundStatusEnum = {
   NO: {
     status: 0,
     name: '未退款'
@@ -190,7 +190,7 @@ export const payOrderRefundStatusEnum = {
 /**
  * 支付退款订单状态枚举
  */
-export const payRefundStatusEnum = {
+export const PayRefundStatusEnum = {
   CREATE:{
     status:0,
     name: '退款订单生成'

yudao-admin-ui/src/utils/dict.js

@@ -7,34 +7,34 @@ import store from '@/store'
 
 export const DICT_TYPE = {
   USER_TYPE: 'user_type',
+  COMMON_STATUS: 'common_status',
 
-  // system
-  SYS_COMMON_STATUS: 'sys_common_status',
-  SYS_MENU_TYPE: 'sys_menu_type',
-  SYS_ROLE_TYPE: 'sys_role_type',
-  SYS_DATA_SCOPE: 'sys_data_scope',
-  SYS_USER_SEX: 'sys_user_sex',
-  SYS_NOTICE_TYPE: 'sys_notice_type',
-  SYS_OPERATE_TYPE: 'sys_operate_type',
-  SYS_LOGIN_TYPE: 'sys_login_type',
-  SYS_LOGIN_RESULT: 'sys_login_result',
-  SYS_CONFIG_TYPE: 'sys_config_type',
-  SYS_SMS_CHANNEL_CODE: 'sys_sms_channel_code',
-  SYS_SMS_TEMPLATE_TYPE: 'sys_sms_template_type',
-  SYS_SMS_SEND_STATUS: 'sys_sms_send_status',
-  SYS_SMS_RECEIVE_STATUS: 'sys_sms_receive_status',
-  SYS_ERROR_CODE_TYPE: 'sys_error_code_type',
+  // ========== SYSTEM 模块 ==========
+  SYSTEM_USER_SEX: 'system_user_sex',
+  SYSTEM_MENU_TYPE: 'system_menu_type',
+  SYSTEM_ROLE_TYPE: 'system_role_type',
+  SYSTEM_DATA_SCOPE: 'system_data_scope',
+  SYSTEM_NOTICE_TYPE: 'system_notice_type',
+  SYSTEM_OPERATE_TYPE: 'system_operate_type',
+  SYSTEM_LOGIN_TYPE: 'system_login_type',
+  SYSTEM_LOGIN_RESULT: 'system_login_result',
+  SYSTEM_SMS_CHANNEL_CODE: 'system_sms_channel_code',
+  SYSTEM_SMS_TEMPLATE_TYPE: 'system_sms_template_type',
+  SYSTEM_SMS_SEND_STATUS: 'system_sms_send_status',
+  SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
+  SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
 
-  // infra
-  INF_REDIS_TIMEOUT_TYPE: 'inf_redis_timeout_type',
-  INF_JOB_STATUS: 'inf_job_status',
-  INF_JOB_LOG_STATUS: 'inf_job_log_status',
-  INF_API_ERROR_LOG_PROCESS_STATUS: 'inf_api_error_log_process_status',
+  // ========== INFRA 模块 ==========
+  INFRA_REDIS_TIMEOUT_TYPE: 'infra_redis_timeout_type',
+  INFRA_JOB_STATUS: 'infra_job_status',
+  INFRA_JOB_LOG_STATUS: 'infra_job_log_status',
+  INFRA_API_ERROR_LOG_PROCESS_STATUS: 'infra_api_error_log_process_status',
+  INFRA_CONFIG_TYPE: 'infra_config_type',
 
-  // tool
+  // ========== TOOL 模块 ==========
   TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type',
 
-  // bpm
+  // ========== BPM 模块 ==========
   BPM_MODEL_CATEGORY: 'bpm_model_category',
   BPM_MODEL_FORM_TYPE: 'bpm_model_form_type',
   BPM_TASK_ASSIGN_RULE_TYPE: 'bpm_task_assign_rule_type',
@@ -43,27 +43,17 @@ export const DICT_TYPE = {
   BPM_TASK_ASSIGN_SCRIPT: 'bpm_task_assign_script',
   BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type',
 
-  // pay
-  // 微信渠道版本
-  PAY_CHANNEL_WECHAT_VERSION:'pay_channel_wechat_version',
-  // 支付渠道支付宝算法类型
-  PAY_CHANNEL_ALIPAY_SIGN_TYPE:'pay_channel_alipay_sign_type',
-  // 支付宝公钥类型
-  PAY_CHANNEL_ALIPAY_MODE:'pay_channel_alipay_mode',
-  // 支付宝网关地址
-  PAY_CHANNEL_ALIPAY_SERVER_TYPE:'pay_channel_alipay_server_type',
-  // 支付渠道编码类型
-  PAY_CHANNEL_CODE_TYPE: 'pay_channel_code_type',
-  // 商户支付订单回调状态
-  PAY_ORDER_NOTIFY_STATUS: 'pay_order_notify_status',
-  // 商户支付订单状态
-  PAY_ORDER_STATUS: 'pay_order_status',
-  // 商户支付订单退款状态
-  PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status',
-  // 退款订单状态
-  PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status',
-  // 退款订单类别
-  PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type',
+  // ========== PAY 模块 ==========
+  PAY_CHANNEL_WECHAT_VERSION: 'pay_channel_wechat_version', // 微信渠道版本
+  PAY_CHANNEL_ALIPAY_SIGN_TYPE: 'pay_channel_alipay_sign_type', // 支付渠道支付宝算法类型
+  PAY_CHANNEL_ALIPAY_MODE: 'pay_channel_alipay_mode', // 支付宝公钥类型
+  PAY_CHANNEL_ALIPAY_SERVER_TYPE: 'pay_channel_alipay_server_type', // 支付宝网关地址
+  PAY_CHANNEL_CODE_TYPE: 'pay_channel_code_type', // 支付渠道编码类型
+  PAY_ORDER_NOTIFY_STATUS: 'pay_order_notify_status', // 商户支付订单回调状态
+  PAY_ORDER_STATUS: 'pay_order_status', // 商户支付订单状态
+  PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status', // 商户支付订单退款状态
+  PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status', // 退款订单状态
+  PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
 }
 
 /**

yudao-admin-ui/src/views/bpm/form/formEditor.vue

@@ -42,7 +42,7 @@
             </el-form-item>
             <el-form-item label="开启状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                           :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -167,7 +167,7 @@ import {
   getDrawingList, saveDrawingList, getIdGlobal, saveIdGlobal, getFormConf
 } from '@/utils/db'
 import loadBeautifier from '@/utils/loadBeautifier'
-import {SysCommonStatusEnum} from "@/utils/constants";
+import {CommonStatusEnum} from "@/utils/constants";
 import {createForm, getForm, updateForm} from "@/api/bpm/form";
 import {decodeFields} from "@/utils/formGenerator";
 
@@ -232,7 +232,7 @@ export default {
 
       // 表单参数
       form: {
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
       },
       // 表单校验
       rules: {

yudao-admin-ui/src/views/bpm/form/index.vue

@@ -27,7 +27,7 @@
       <el-table-column label="表单名" align="center" prop="name" />
       <el-table-column label="开启状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />

yudao-admin-ui/src/views/bpm/group/index.vue

@@ -8,7 +8,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -45,7 +45,7 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -82,7 +82,7 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -97,7 +97,7 @@
 
 <script>
 import { createUserGroup, updateUserGroup, deleteUserGroup, getUserGroup, getUserGroupPage } from "@/api/bpm/userGroup";
-import {SysCommonStatusEnum} from "@/utils/constants";
+import {CommonStatusEnum} from "@/utils/constants";
 import {listSimpleUsers} from "@/api/system/user";
 
 export default {
@@ -173,7 +173,7 @@ export default {
         name: undefined,
         description: undefined,
         memberUserIds: [],
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
     },

yudao-admin-ui/src/views/infra/apiErrorLog/index.vue

@@ -24,7 +24,7 @@
       </el-form-item>
       <el-form-item label="处理状态" prop="processStatus">
         <el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INF_API_ERROR_LOG_PROCESS_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -63,7 +63,7 @@
       <el-table-column label="异常名" align="center" prop="exceptionName" width="250" />
       <el-table-column label="处理状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.INF_API_ERROR_LOG_PROCESS_STATUS, scope.row.processStatus) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS, scope.row.processStatus) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -103,7 +103,7 @@
               <el-input type="textarea" :readonly="true" :autosize="{ maxRows: 20}" v-model="form.exceptionStackTrace"></el-input>
             </el-form-item>
             <el-form-item label="处理状态">
-              {{ getDictDataLabel(DICT_TYPE.INF_API_ERROR_LOG_PROCESS_STATUS, form.processStatus) }}
+              {{ getDictDataLabel(DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS, form.processStatus) }}
             </el-form-item>
             <el-form-item label="处理人">{{ form.processUserId }}</el-form-item>
             <el-form-item label="处理时间">{{ parseTime(form.processTime) }}</el-form-item>
@@ -120,7 +120,7 @@
 
 <script>
 import { updateApiErrorLogProcess, getApiErrorLogPage, exportApiErrorLogExcel } from "@/api/infra/apiErrorLog";
-import { InfApiErrorLogProcessStatusEnum } from '@/utils/constants'
+import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
 
 export default {
   name: "ApiErrorLog",
@@ -154,7 +154,7 @@ export default {
       // 表单参数
       form: {},
       // 枚举
-      InfApiErrorLogProcessStatusEnum: InfApiErrorLogProcessStatusEnum,
+      InfApiErrorLogProcessStatusEnum: InfraApiErrorLogProcessStatusEnum,
     };
   },
   created() {
@@ -202,7 +202,7 @@ export default {
     },
     /** 处理已处理 / 已忽略的操作 **/
     handleProcessClick(row, processStatus) {
-      const processStatusText = this.getDictDataLabel(this.DICT_TYPE.INF_API_ERROR_LOG_PROCESS_STATUS, processStatus)
+      const processStatusText = this.getDictDataLabel(this.DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS, processStatus)
       this.$confirm('确认标记为' + processStatusText, '提示', {
         type: 'warning',
         confirmButtonText: '确定',

yudao-admin-ui/src/views/infra/config/index.vue

@@ -12,7 +12,7 @@
       <el-form-item label="系统内置" prop="type">
         <el-select v-model="queryParams.type" placeholder="系统内置" clearable size="small">
           <el-option
-              v-for="dict in this.getDictDatas(DICT_TYPE.SYS_CONFIG_TYPE)"
+              v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CONFIG_TYPE)"
               :key="parseInt(dict.value)"
               :label="dict.label"
               :value="parseInt(dict.value)"
@@ -67,7 +67,7 @@
       <el-table-column label="参数键值" align="center" prop="value" />
       <el-table-column label="系统内置" align="center" prop="type">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_CONFIG_TYPE, scope.row.type) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.INFRA_CONFIG_TYPE, scope.row.type) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="是否敏感" align="center" prop="sensitive">

yudao-admin-ui/src/views/infra/job/index.vue

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INF_JOB_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_JOB_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -40,7 +40,7 @@
       <el-table-column label="任务名称" align="center" prop="name" />
       <el-table-column label="任务状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.INF_JOB_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.INFRA_JOB_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="处理器的名字" align="center" prop="handlerName" />
@@ -107,7 +107,7 @@
           <el-col :span="24">
             <el-form-item label="任务编号：">{{ form.id }}</el-form-item>
             <el-form-item label="任务名称：">{{ form.name }}</el-form-item>
-            <el-form-item label="任务名称：">{{ getDictDataLabel(DICT_TYPE.INF_JOB_STATUS, form.status) }}</el-form-item>
+            <el-form-item label="任务名称：">{{ getDictDataLabel(DICT_TYPE.INFRA_JOB_STATUS, form.status) }}</el-form-item>
             <el-form-item label="处理器的名字：">{{ form.handlerName }}</el-form-item>
             <el-form-item label="处理器的参数：">{{ form.handlerParam }}</el-form-item>
             <el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
@@ -128,7 +128,7 @@
 
 <script>
 import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, updateJobStatus, getJobNextTimes } from "@/api/infra/job";
-import { InfJobStatusEnum } from "@/utils/constants";
+import { InfraJobStatusEnum } from "@/utils/constants";
 
 export default {
   name: "Job",
@@ -171,7 +171,7 @@ export default {
       nextTimes: [], // 后续执行时间
 
       // 枚举
-      InfJobStatusEnum: InfJobStatusEnum
+      InfJobStatusEnum: InfraJobStatusEnum
     };
   },
   created() {
@@ -306,7 +306,7 @@ export default {
     /** 更新状态操作 */
     handleChangeStatus(row, open) {
       const id = row.id;
-      let status = open ? InfJobStatusEnum.NORMAL : InfJobStatusEnum.STOP;
+      let status = open ? InfraJobStatusEnum.NORMAL : InfraJobStatusEnum.STOP;
       let statusStr = open ? '开启' : '关闭';
       this.$confirm('是否确认' + statusStr + '定时任务编号为"' + id + '"的数据项?', "警告", {
         confirmButtonText: "确定",

yudao-admin-ui/src/views/infra/job/log.vue

@@ -13,7 +13,7 @@
       </el-form-item>
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INF_JOB_LOG_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_JOB_LOG_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column label="任务状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.INF_JOB_LOG_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.INFRA_JOB_LOG_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -75,7 +75,7 @@
             <el-form-item label="第几次执行：">{{ form.executeIndex }}</el-form-item>
             <el-form-item label="执行时间：">{{ parseTime(form.beginTime) + ' ~ ' + parseTime(form.endTime) }}</el-form-item>
             <el-form-item label="执行时长：">{{ parseTime(form.duration) + ' 毫秒' }}</el-form-item>
-            <el-form-item label="任务状态：">{{ getDictDataLabel(DICT_TYPE.INF_JOB_LOG_STATUS, form.status) }}</el-form-item>
+            <el-form-item label="任务状态：">{{ getDictDataLabel(DICT_TYPE.INFRA_JOB_LOG_STATUS, form.status) }}</el-form-item>
             <el-form-item label="执行结果：">{{ form.result }}</el-form-item>
           </el-col>
         </el-row>

yudao-admin-ui/src/views/infra/redis/index.vue

@@ -74,7 +74,7 @@
       <el-table-column prop="valueType" label="Value 类型" />
       <el-table-column prop="timeoutType" label="超时时间" width="150">
         <template slot-scope="scope">
-          {{ getDictDataLabel(DICT_TYPE.INF_REDIS_TIMEOUT_TYPE, scope.row.timeoutType) }}
+          {{ getDictDataLabel(DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE, scope.row.timeoutType) }}
           <span v-if="scope.row.timeout > 0">({{ scope.row.timeout / 1000 }} 秒)</span>
         </template>
       </el-table-column>

yudao-admin-ui/src/views/login.vue

@@ -54,7 +54,7 @@ import { getCodeImg,socialAuthRedirect } from "@/api/login";
 import { getTenantIdByName } from "@/api/system/tenant";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import {InfApiErrorLogProcessStatusEnum, SysUserSocialTypeEnum} from "@/utils/constants";
+import {InfraApiErrorLogProcessStatusEnum, SystemUserSocialTypeEnum} from "@/utils/constants";
 
 export default {
   name: "Login",
@@ -100,7 +100,7 @@ export default {
       loading: false,
       redirect: undefined,
       // 枚举
-      SysUserSocialTypeEnum: SysUserSocialTypeEnum,
+      SysUserSocialTypeEnum: SystemUserSocialTypeEnum,
     };
   },
   // watch: {

yudao-admin-ui/src/views/pay/app/components/aliPayChannelForm.vue

@@ -233,7 +233,7 @@ export default {
       },
       fileAccept: ".crt",
       // 渠道状态 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
       // 支付宝加密方式
       aliPaySignTypeDatas: getDictDatas(DICT_TYPE.PAY_CHANNEL_ALIPAY_SIGN_TYPE),
       // 版本状态 数据字典

yudao-admin-ui/src/views/pay/app/components/wechatChannelForm.vue

@@ -189,7 +189,7 @@ export default {
       },
       fileAccept: ".pem",
       // 渠道状态 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
       versionDictDatas: getDictDatas(DICT_TYPE.PAY_CHANNEL_WECHAT_VERSION),
     }
   },

yudao-admin-ui/src/views/pay/app/index.vue

@@ -212,7 +212,7 @@
 <script>
 import {createApp, updateApp, changeAppStatus, deleteApp, getApp, getAppPage, exportAppExcel} from "@/api/pay/app";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {PayType, PayChannelEnum, SysCommonStatusEnum} from "@/utils/constants";
+import {PayType, PayChannelEnum, CommonStatusEnum} from "@/utils/constants";
 import {getMerchantListByName} from "@/api/pay/merchant";
 import wechatChannelForm from "@/views/pay/app/components/wechatChannelForm";
 import aliPayChannelForm from "@/views/pay/app/components/aliPayChannelForm";
@@ -260,8 +260,8 @@ export default {
         merchantId: [{required: true, message: "商户编号不能为空", trigger: "blur"}],
       },
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS),
-      sysCommonStatusEnum: SysCommonStatusEnum,
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      sysCommonStatusEnum: CommonStatusEnum,
       // 支付渠道枚举
       payChannelEnum: PayChannelEnum,
       // 支付类型
@@ -358,7 +358,7 @@ export default {
     },
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === SysCommonStatusEnum.ENABLE ? "启用" : "停用";
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$confirm('确认要"' + text + '""' + row.name + '"应用吗?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -368,8 +368,8 @@ export default {
       }).then(() => {
         this.msgSuccess(text + "成功");
       }).catch(function () {
-        row.status = row.status === SysCommonStatusEnum.ENABLE ? SysCommonStatusEnum.DISABLE
-          : SysCommonStatusEnum.ENABLE;
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
       });
     },
     /** 提交按钮 */

yudao-admin-ui/src/views/pay/merchant/index.vue

@@ -114,7 +114,7 @@ import {
   exportMerchantExcel
 } from "@/api/pay/merchant";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {SysCommonStatusEnum} from "@/utils/constants";
+import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
   name: "Merchant",
@@ -155,7 +155,7 @@ export default {
         status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
       },
       // 商户状态数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -222,7 +222,7 @@ export default {
     },
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === SysCommonStatusEnum.ENABLE ? "启用" : "停用";
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$confirm('确认要"' + text + '""' + row.name + '"商户吗?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -232,8 +232,8 @@ export default {
       }).then(() => {
         this.msgSuccess(text + "成功");
       }).catch(function() {
-        row.status = row.status === SysCommonStatusEnum.ENABLE ? SysCommonStatusEnum.DISABLE
-          : SysCommonStatusEnum.ENABLE;
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
       });
     },
     /** 提交按钮 */

yudao-admin-ui/src/views/pay/order/index.vue

@@ -249,7 +249,7 @@ import {getOrder, getOrderPage, exportOrderExcel} from "@/api/pay/order";
 import {getMerchantListByName} from "@/api/pay/merchant";
 import {getAppListByMerchantId} from "@/api/pay/app";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {payOrderNotifyStatusEnum, payOrderRefundStatusEnum, payOrderStatusEnum} from "@/utils/constants";
+import {PayOrderNotifyStatusEnum, PayOrderRefundStatusEnum, PayOrderStatusEnum} from "@/utils/constants";
 import { getNowDateTime} from "@/utils/ruoyi";
 
 const defaultOrderDetail = {
@@ -417,36 +417,36 @@ export default {
           this.orderDetail.payOrderExtension = Object.assign(defaultOrderDetail.payOrderExtension, {});
         }
         switch (this.orderDetail.status) {
-          case payOrderStatusEnum.WAITING.status:
+          case PayOrderStatusEnum.WAITING.status:
             this.statusType = "info";
             break;
-          case payOrderStatusEnum.SUCCESS.status:
+          case PayOrderStatusEnum.SUCCESS.status:
             this.statusType = "success";
             break;
-          case payOrderStatusEnum.CLOSED.status:
+          case PayOrderStatusEnum.CLOSED.status:
             this.statusType = "danger";
             break;
         }
         switch (this.orderDetail.notifyStatus) {
-          case payOrderNotifyStatusEnum.NO.status:
+          case PayOrderNotifyStatusEnum.NO.status:
             this.notifyStatusType = "info";
             break;
-          case payOrderNotifyStatusEnum.SUCCESS.status:
+          case PayOrderNotifyStatusEnum.SUCCESS.status:
             this.notifyStatusType = "success";
             break;
-          case payOrderNotifyStatusEnum.FAILURE.status:
+          case PayOrderNotifyStatusEnum.FAILURE.status:
             this.notifyStatusType = "danger";
             break;
         }
 
         switch (this.orderDetail.refundStatus) {
-          case payOrderRefundStatusEnum.NO.status:
+          case PayOrderRefundStatusEnum.NO.status:
             this.refundStatusType = "success";
             break;
-          case payOrderRefundStatusEnum.SOME.status:
+          case PayOrderRefundStatusEnum.SOME.status:
             this.refundStatusType = "warning";
             break;
-          case payOrderRefundStatusEnum.ALL.status:
+          case PayOrderRefundStatusEnum.ALL.status:
             this.refundStatusType = "danger";
             break;
         }

yudao-admin-ui/src/views/pay/refund/index.vue

@@ -263,8 +263,8 @@ import {getMerchantListByName} from "@/api/pay/merchant";
 import {getAppListByMerchantId} from "@/api/pay/app";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {
-  payOrderRefundStatusEnum,
-  payRefundStatusEnum
+  PayOrderRefundStatusEnum,
+  PayRefundStatusEnum
 } from "@/utils/constants";
 import {getNowDateTime} from "@/utils/ruoyi";
 
@@ -469,11 +469,11 @@ export default {
      */
     findByRefundTypeGetStyle(refundType) {
       switch (refundType) {
-        case payOrderRefundStatusEnum.NO.status:
+        case PayOrderRefundStatusEnum.NO.status:
           return "success";
-        case payOrderRefundStatusEnum.SOME.status:
+        case PayOrderRefundStatusEnum.SOME.status:
           return "warning";
-        case payOrderRefundStatusEnum.ALL.status:
+        case PayOrderRefundStatusEnum.ALL.status:
           return "danger";
       }
     },
@@ -483,17 +483,17 @@ export default {
      */
     findByRefundStatusGetStyle(refundStatus) {
       switch (refundStatus) {
-        case payRefundStatusEnum.CREATE.status:
+        case PayRefundStatusEnum.CREATE.status:
           return "info";
-        case payRefundStatusEnum.SUCCESS.status:
+        case PayRefundStatusEnum.SUCCESS.status:
           return "success";
-        case payRefundStatusEnum.FAILURE.status:
-        case payRefundStatusEnum.CLOSE.status:
+        case PayRefundStatusEnum.FAILURE.status:
+        case PayRefundStatusEnum.CLOSE.status:
           return "danger";
-        case payRefundStatusEnum.PROCESSING_NOTIFY.status:
-        case payRefundStatusEnum.PROCESSING_QUERY.status:
-        case payRefundStatusEnum.UNKNOWN_RETRY.status:
-        case payRefundStatusEnum.UNKNOWN_QUERY.status:
+        case PayRefundStatusEnum.PROCESSING_NOTIFY.status:
+        case PayRefundStatusEnum.PROCESSING_QUERY.status:
+        case PayRefundStatusEnum.UNKNOWN_RETRY.status:
+        case PayRefundStatusEnum.UNKNOWN_QUERY.status:
           return "warning";
       }
     },

yudao-admin-ui/src/views/system/dept/index.vue

@@ -104,7 +104,7 @@ import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/de
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import {SysCommonStatusEnum} from '@/utils/constants'
+import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {listSimpleUsers} from "@/api/system/user";
 
@@ -167,9 +167,9 @@ export default {
       },
 
       // 枚举
-      CommonStatusEnum: SysCommonStatusEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -201,7 +201,7 @@ export default {
     },
     // 字典状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 用户昵称展示
     userNicknameFormat(row, column) {
@@ -230,7 +230,7 @@ export default {
         leaderUserId: undefined,
         phone: undefined,
         email: undefined,
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
     },

yudao-admin-ui/src/views/system/dict/data.vue

@@ -93,7 +93,7 @@
 import { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data";
 import { listAllSimple, getType } from "@/api/system/dict/type";
 
-import { SysCommonStatusEnum } from '@/utils/constants'
+import { CommonStatusEnum } from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
@@ -142,9 +142,9 @@ export default {
       },
 
       // 枚举
-      CommonStatusEnum: SysCommonStatusEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -178,7 +178,7 @@ export default {
     },
     // 数据状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 取消按钮
     cancel() {
@@ -192,7 +192,7 @@ export default {
         label: undefined,
         value: undefined,
         sort: 0,
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
         remark: undefined
       };
       this.resetForm("form");

yudao-admin-ui/src/views/system/dict/index.vue

@@ -93,7 +93,7 @@
 <script>
 import { listType, getType, delType, addType, updateType, exportType } from "@/api/system/dict/type";
 
-import { SysCommonStatusEnum } from '@/utils/constants'
+import { CommonStatusEnum } from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
@@ -137,9 +137,9 @@ export default {
       },
 
       // 枚举
-      CommonStatusEnum: SysCommonStatusEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -161,7 +161,7 @@ export default {
     },
     // 字典状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 取消按钮
     cancel() {
@@ -174,7 +174,7 @@ export default {
         id: undefined,
         name: undefined,
         type: undefined,
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
         remark: undefined
       };
       this.resetForm("form");

yudao-admin-ui/src/views/system/errorCode/index.vue

@@ -5,7 +5,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="错误码类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择错误码类型" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_ERROR_CODE_TYPE)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -46,7 +46,7 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="类型" align="center" prop="type" width="80">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_ERROR_CODE_TYPE, scope.row.type) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE, scope.row.type) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="应用名" align="center" prop="applicationName" width="200" />

yudao-admin-ui/src/views/system/loginlog/index.vue

@@ -37,7 +37,7 @@
       <el-table-column label="访问编号" align="center" prop="id" />
       <el-table-column label="日志类型" align="center" prop="logType">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_LOGIN_TYPE, scope.row.logType) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_LOGIN_TYPE, scope.row.logType) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="用户名称" align="center" prop="username" />
@@ -46,7 +46,7 @@
       <el-table-column label="结果" align="center" prop="status">
         <template slot-scope="scope">
           <span v-if="scope.row.result === 0">成功</span>
-          <span v-if="scope.row.result > 0">失败：{{ getDictDataLabel(DICT_TYPE.SYS_LOGIN_RESULT, scope.row.result) }} </span>
+          <span v-if="scope.row.result > 0">失败：{{ getDictDataLabel(DICT_TYPE.SYSTEM_LOGIN_RESULT, scope.row.result) }} </span>
         </template>
       </el-table-column>
       <el-table-column label="登录日期" align="center" prop="loginTime" width="180">

yudao-admin-ui/src/views/system/menu/index.vue

@@ -110,7 +110,7 @@
           <el-col :span="12">
             <el-form-item label="菜单状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                           :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -131,7 +131,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 
-import { SysMenuTypeEnum, SysCommonStatusEnum } from '@/utils/constants'
+import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
@@ -175,11 +175,11 @@ export default {
       },
 
       // 枚举
-      MenuTypeEnum: SysMenuTypeEnum,
-      CommonStatusEnum: SysCommonStatusEnum,
+      MenuTypeEnum: SystemMenuTypeEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      menuTypeDictDatas: getDictDatas(DICT_TYPE.SYS_MENU_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -220,7 +220,7 @@ export default {
     },
     // 菜单状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 取消按钮
     cancel() {
@@ -234,9 +234,9 @@ export default {
         parentId: 0,
         name: undefined,
         icon: undefined,
-        type: SysMenuTypeEnum.DIR,
+        type: SystemMenuTypeEnum.DIR,
         sort: undefined,
-        status: SysCommonStatusEnum.ENABLE
+        status: CommonStatusEnum.ENABLE
       };
       this.resetForm("form");
     },
@@ -276,8 +276,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           // 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
-          if (this.form.type === SysMenuTypeEnum.DIR
-            || this.form.type === SysMenuTypeEnum.MENU) {
+          if (this.form.type === SystemMenuTypeEnum.DIR
+            || this.form.type === SystemMenuTypeEnum.MENU) {
             // 如果是外链，则不进行校验
             const path = this.form.path
             if (path.indexOf('http://') === -1 || path.indexOf('https://') === -1) {

yudao-admin-ui/src/views/system/notice/index.vue

@@ -100,7 +100,7 @@
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
 import Editor from '@/components/Editor';
 
-import {SysCommonStatusEnum} from '@/utils/constants'
+import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
@@ -143,10 +143,10 @@ export default {
       },
 
       // 枚举
-      CommonStatusEnum: SysCommonStatusEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      noticeTypeDictDatas: getDictDatas(DICT_TYPE.SYS_NOTICE_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      noticeTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_NOTICE_TYPE),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -164,11 +164,11 @@ export default {
     },
     // 公告状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 公告状态字典翻译
     typeFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_NOTICE_TYPE, row.type)
+      return getDictDataLabel(DICT_TYPE.SYSTEM_NOTICE_TYPE, row.type)
     },
     // 取消按钮
     cancel() {
@@ -182,7 +182,7 @@ export default {
         title: undefined,
         type: undefined,
         content: undefined,
-        status: SysCommonStatusEnum.ENABLE
+        status: CommonStatusEnum.ENABLE
       };
       this.resetForm("form");
     },

yudao-admin-ui/src/views/system/operatelog/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="操作类型" clearable size="small" style="width: 240px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_OPERATE_TYPE)" :key="parseInt(dict.value)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)" :key="parseInt(dict.value)"
                      :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
@@ -45,7 +45,7 @@
       <el-table-column label="操作名" align="center" prop="name" width="180" />
       <el-table-column label="操作类型" align="center" prop="type">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_OPERATE_TYPE, scope.row.type) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="userNickname" />
@@ -95,7 +95,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="操作信息：">
-              {{ form.module }} | {{ form.name }} | {{ getDictDataLabel(DICT_TYPE.SYS_OPERATE_TYPE, form.type) }}
+              {{ form.module }} | {{ form.name }} | {{ getDictDataLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, form.type) }}
               <br /> {{ form.content }}
               <br /> {{ form.exts }}
             </el-form-item>

yudao-admin-ui/src/views/system/post/index.vue

@@ -87,7 +87,7 @@
 <script>
 import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
 
-import {SysCommonStatusEnum} from '@/utils/constants'
+import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
@@ -132,9 +132,9 @@ export default {
       },
 
       // 枚举
-      CommonStatusEnum: SysCommonStatusEnum,
+      CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -152,7 +152,7 @@ export default {
     },
     // 岗位状态字典翻译
     statusFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, row.status)
+      return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status)
     },
     // 取消按钮
     cancel() {
@@ -166,7 +166,7 @@ export default {
         code: undefined,
         name: undefined,
         sort: 0,
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
         remark: undefined
       };
       this.resetForm("form");

yudao-admin-ui/src/views/system/role/index.vue

@@ -179,7 +179,7 @@ import {
 import {listSimpleMenus} from "@/api/system/menu";
 import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/permission";
 import {listSimpleDepts} from "@/api/system/dept";
-import {SysCommonStatusEnum, SysDataScopeEnum} from "@/utils/constants";
+import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
 import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict";
 
 export default {
@@ -241,12 +241,12 @@ export default {
       },
 
       // 枚举
-      SysCommonStatusEnum: SysCommonStatusEnum,
-      SysDataScopeEnum: SysDataScopeEnum,
+      SysCommonStatusEnum: CommonStatusEnum,
+      SysDataScopeEnum: SystemDataScopeEnum,
       // 数据字典
-      roleTypeDictDatas: getDictDatas(DICT_TYPE.SYS_ROLE_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS),
-      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYS_DATA_SCOPE)
+      roleTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_ROLE_TYPE),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE)
     };
   },
   created() {
@@ -270,7 +270,7 @@ export default {
     // 角色状态修改
     handleStatusChange(row) {
       // 此时，row 已经变成目标状态了，所以可以直接提交请求和提示
-      let text = row.status === SysCommonStatusEnum.ENABLE ? "启用" : "停用";
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$confirm('确认要"' + text + '""' + row.name + '"角色吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -281,13 +281,13 @@ export default {
           this.msgSuccess(text + "成功");
         }).catch(function() {
           // 异常时，需要将 row.status 状态重置回之前的
-          row.status = row.status === SysCommonStatusEnum.ENABLE ? SysCommonStatusEnum.DISABLE
-              : SysCommonStatusEnum.ENABLE;
+          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+              : CommonStatusEnum.ENABLE;
         });
     },
     // 角色类型字典翻译
     typeFormat(row, column) {
-      return getDictDataLabel(DICT_TYPE.SYS_ROLE_TYPE, row.type)
+      return getDictDataLabel(DICT_TYPE.SYSTEM_ROLE_TYPE, row.type)
     },
     // 取消按钮
     cancel() {
@@ -460,7 +460,7 @@ export default {
         assignRoleDataScope({
           roleId: this.form.id,
           dataScope: this.form.dataScope,
-          dataScopeDeptIds: this.form.dataScope !== SysDataScopeEnum.DEPT_CUSTOM ? [] :
+          dataScopeDeptIds: this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] :
               this.$refs.dept.getCheckedKeys()
         }).then(response => {
           this.msgSuccess("修改成功");

yudao-admin-ui/src/views/system/sms/smsChannel.vue

@@ -8,7 +8,7 @@
       </el-form-item>
       <el-form-item label="启用状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -41,12 +41,12 @@
       <el-table-column label="短信签名" align="center" prop="signature" />
       <el-table-column label="渠道编码" align="center" prop="code">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.code) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.code) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="启用状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -82,7 +82,7 @@
         </el-form-item>
         <el-form-item label="启用状态">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -278,7 +278,7 @@ export default {
       </el-form-item>
       <el-form-item label="启用状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -311,12 +311,12 @@ export default {
       <el-table-column label="短信签名" align="center" prop="signature" />
       <el-table-column label="渠道编码" align="center" prop="code">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.code) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.code) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="启用状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -346,13 +346,13 @@ export default {
         </el-form-item>
         <el-form-item label="渠道编码" prop="code">
           <el-select v-model="form.code" placeholder="请选择渠道编码" :disabled="form.id > 0">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_CHANNEL_CODE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE)"
                        :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="启用状态">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>

yudao-admin-ui/src/views/system/sms/smsLog.vue

@@ -10,7 +10,7 @@
         <el-select v-model="queryParams.channelId" placeholder="请选择短信渠道" clearable size="small">
           <el-option v-for="channel in channelOptions"
                      :key="channel.id" :value="channel.id"
-                     :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, channel.code) + '】'" />
+                     :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
         </el-select>
       </el-form-item>
       <el-form-item label="模板编号" prop="templateId">
@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item label="发送状态" prop="sendStatus">
         <el-select v-model="queryParams.sendStatus" placeholder="请选择发送状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_SEND_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_SEND_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item label="接收状态" prop="receiveStatus">
         <el-select v-model="queryParams.receiveStatus" placeholder="请选择接收状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_RECEIVE_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -74,26 +74,26 @@
       <el-table-column label="短信内容" align="center" prop="templateContent" width="300" />
       <el-table-column label="发送状态" align="center" width="180">
         <template slot-scope="scope">
-          <div>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_SEND_STATUS, scope.row.sendStatus) }}</div>
+          <div>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_SEND_STATUS, scope.row.sendStatus) }}</div>
           <div>{{ parseTime(scope.row.sendTime) }}</div>
         </template>
       </el-table-column>
       <el-table-column label="接收状态" align="center" width="180">
         <template slot-scope="scope">
-          <div>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_RECEIVE_STATUS, scope.row.receiveStatus) }}</div>
+          <div>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, scope.row.receiveStatus) }}</div>
           <div>{{ parseTime(scope.row.receiveTime) }}</div>
         </template>
       </el-table-column>
       <el-table-column label="短信渠道" align="center" width="120">
         <template slot-scope="scope">
           <div>{{ formatChannelSignature(scope.row.channelId) }}</div>
-          <div>【{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.channelCode) }}】</div>
+          <div>【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.channelCode) }}】</div>
         </template>
       </el-table-column>
       <el-table-column label="模板编号" align="center" prop="templateId" />
       <el-table-column label="短信类型" align="center" prop="templateType">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE, scope.row.templateType) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, scope.row.templateType) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,12 +116,15 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="短信渠道：">
-              {{ formatChannelSignature(form.channelId) }}【{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, form.channelCode) }}】
+              {{
+                formatChannelSignature(form.channelId)
+              }}【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, form.channelCode) }}】
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="短信模板：">
-              {{ form.templateId }} | {{ form.templateCode}} | {{ getDictDataLabel(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE, form.templateType) }}
+              {{ form.templateId }} | {{ form.templateCode }} |
+              {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, form.templateType) }}
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -142,7 +145,7 @@
             <el-form-item label="创建时间：">{{ parseTime(form.createTime) }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="发送状态：">{{ getDictDataLabel(DICT_TYPE.SYS_SMS_SEND_STATUS, form.sendStatus) }}</el-form-item>
+            <el-form-item label="发送状态：">{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_SEND_STATUS, form.sendStatus) }}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="发送时间：">{{ parseTime(form.sendTime) }}</el-form-item>
@@ -161,7 +164,7 @@
             <el-form-item label="API 请求编号：">{{ form.apiRequestId }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="接收状态：">{{ getDictDataLabel(DICT_TYPE.SYS_SMS_RECEIVE_STATUS, form.receiveStatus) }}</el-form-item>
+            <el-form-item label="接收状态：">{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, form.receiveStatus) }}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="接收时间：">{{ parseTime(form.receiveTime) }}</el-form-item>

yudao-admin-ui/src/views/system/sms/smsTemplate.vue

@@ -5,13 +5,13 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="150px">
       <el-form-item label="短信类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择短信类型" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -25,7 +25,7 @@
         <el-select v-model="queryParams.channelId" placeholder="请选择短信渠道" clearable size="small">
           <el-option v-for="channel in channelOptions"
                      :key="channel.id" :value="channel.id"
-                     :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, channel.code) + '】'" />
+                     :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
@@ -58,12 +58,12 @@
       <el-table-column label="模板内容" align="center" prop="content" width="300" />
       <el-table-column label="短信类型" align="center" prop="type">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE, scope.row.type) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, scope.row.type) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开启状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -71,7 +71,7 @@
       <el-table-column label="短信渠道" align="center" width="120">
         <template slot-scope="scope">
           <div>{{ formatChannelSignature(scope.row.channelId) }}</div>
-          <div>【{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.channelCode) }}】</div>
+          <div>【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.channelCode) }}】</div>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -101,12 +101,12 @@
           <el-select v-model="form.channelId" placeholder="请选择短信渠道编号">
             <el-option v-for="channel in channelOptions"
                        :key="channel.id" :value="channel.id"
-                       :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, channel.code) + '】'" />
+                       :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
           </el-select>
         </el-form-item>
         <el-form-item label="短信类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择短信类型">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)"
                        :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -121,7 +121,7 @@
         </el-form-item>
         <el-form-item label="开启状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>

yudao-admin-ui/src/views/system/tenant/index.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="租户状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -49,7 +49,7 @@
       <el-table-column label="联系手机" align="center" prop="contactMobile" />
       <el-table-column label="租户状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -84,7 +84,7 @@
         </el-form-item>
         <el-form-item label="租户状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -99,7 +99,7 @@
 
 <script>
 import { createTenant, updateTenant, deleteTenant, getTenant, getTenantPage, exportTenantExcel } from "@/api/system/tenant";
-import { SysCommonStatusEnum } from '@/utils/constants'
+import { CommonStatusEnum } from '@/utils/constants'
 
 export default {
   name: "Tenant",
@@ -168,7 +168,7 @@ export default {
         name: undefined,
         contactName: undefined,
         contactMobile: undefined,
-        status: SysCommonStatusEnum.ENABLE,
+        status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
     },

yudao-admin-ui/src/views/system/user/index.vue

@@ -249,7 +249,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listSimpleDepts} from "@/api/system/dept";
 import {listSimplePosts} from "@/api/system/post";
 
-import {SysCommonStatusEnum} from "@/utils/constants";
+import {CommonStatusEnum} from "@/utils/constants";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {assignUserRole, listUserRoles} from "@/api/system/permission";
 import {listSimpleRoles} from "@/api/system/role";
@@ -347,10 +347,10 @@ export default {
       openRole: false,
 
       // 枚举
-      SysCommonStatusEnum: SysCommonStatusEnum,
+      SysCommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.SYS_COMMON_STATUS),
-      sexDictDatas: getDictDatas(DICT_TYPE.SYS_USER_SEX),
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
     };
   },
   watch: {
@@ -424,7 +424,7 @@ export default {
     },
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === SysCommonStatusEnum.ENABLE ? "启用" : "停用";
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$confirm('确认要"' + text + '""' + row.username + '"用户吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -434,8 +434,8 @@ export default {
         }).then(() => {
           this.msgSuccess(text + "成功");
         }).catch(function() {
-          row.status = row.status === SysCommonStatusEnum.ENABLE ? SysCommonStatusEnum.DISABLE
-              : SysCommonStatusEnum.ENABLE;
+          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+              : CommonStatusEnum.ENABLE;
         });
     },
     // 取消按钮

yudao-admin-ui/src/views/system/user/profile/userSocial.vue

@@ -22,7 +22,7 @@
 
 <script>
 
-import {SysUserSocialTypeEnum} from "@/utils/constants";
+import {SystemUserSocialTypeEnum} from "@/utils/constants";
 import {socialAuthRedirect, socialBind, socialUnbind} from "@/api/login";
 
 export default {
@@ -44,8 +44,8 @@ export default {
   computed: {
     socialUsers (){
       const socialUsers = [];
-      for (const i in SysUserSocialTypeEnum) {
-        const socialUser = {...SysUserSocialTypeEnum[i]};
+      for (const i in SystemUserSocialTypeEnum) {
+        const socialUser = {...SystemUserSocialTypeEnum[i]};
         socialUsers.push(socialUser);
         if (this.user.socialUsers) {
           for (const j in this.user.socialUsers) {

yudao-admin-ui/src/views/tool/dbDoc/index.vue

@@ -15,7 +15,7 @@
   </div>
 </template>
 <script>
-import { exportHtml, exportWord, exportMarkdown} from "@/api/infra/dbDoc";
+import { exportHtml, exportWord, exportMarkdown} from "@/api/tool/dbDoc";
 
 export default {
   name: "DBDoc",

yudao-admin-ui/src/views/tool/testDemo/index.vue

@@ -8,19 +8,19 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_OPERATE_TYPE)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="分类" prop="category">
         <el-select v-model="queryParams.category" placeholder="请选择分类" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INF_REDIS_TIMEOUT_TYPE)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -61,17 +61,17 @@
       <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="类型" align="center" prop="type">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_OPERATE_TYPE, scope.row.type) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="分类" align="center" prop="category">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.INF_REDIS_TIMEOUT_TYPE, scope.row.category) }}</span>
+          <span>{{ getDictDataLabel(DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE, scope.row.category) }}</span>
         </template>
       </el-table-column>>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -101,19 +101,19 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择类型">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_OPERATE_TYPE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)"
                        :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
         <el-form-item label="分类">
           <el-radio-group v-model="form.category">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INF_REDIS_TIMEOUT_TYPE)"
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>

yudao-dependencies/pom.xml

@@ -467,6 +467,12 @@
                 <groupId>cn.smallbun.screw</groupId>
                 <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
                 <version>${screw.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.freemarker</groupId>
+                        <artifactId>freemarker</artifactId> <!-- 移除 Freemarker 依赖，采用 Velocity 作为模板引擎 -->
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java

@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.bpm.enums;
+
+/**
+ * BPM 字典类型的枚举类
+ *
+ * @author 芋道源码
+ */
+public interface DictTypeConstants {
+
+    String TASK_ASSIGN_RULE_TYPE = "bpm_task_assign_rule_type"; // 任务分配规则类型
+    String TASK_ASSIGN_SCRIPT = "bpm_task_assign_script"; // 任务分配自定义脚本
+
+}

yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAs
 import cn.iocoder.yudao.module.bpm.convert.definition.BpmTaskAssignRuleConvert;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmTaskAssignRuleMapper;
+import cn.iocoder.yudao.module.bpm.enums.DictTypeConstants;
 import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum;
 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -18,7 +19,6 @@ import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
 import cn.iocoder.yudao.module.system.api.permission.RoleApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.UserTask;
@@ -186,7 +186,7 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
         } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER_GROUP.getType())) {
             userGroupService.validUserGroups(options);
         } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.SCRIPT.getType())) {
-            dictDataApi.validDictDatas(DictTypeConstants.BPM_TASK_ASSIGN_SCRIPT,
+            dictDataApi.validDictDatas(DictTypeConstants.TASK_ASSIGN_SCRIPT,
                     CollectionUtils.convertSet(options, String::valueOf));
         } else {
             throw new IllegalArgumentException(StrUtil.format("未知的规则类型({})", type));

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/DictTypeConstants.java

@@ -7,16 +7,14 @@ package cn.iocoder.yudao.module.infra.enums;
  */
 public interface DictTypeConstants {
 
-    String REDIS_TIMEOUT_TYPE = "inf_redis_timeout_type"; // Redis 超时类型
+    String REDIS_TIMEOUT_TYPE = "infra_redis_timeout_type"; // Redis 超时类型
 
-    String JOB_STATUS = "inf_job_status"; // 定时任务状态的枚举
-    String JOB_LOG_STATUS = "inf_job_log_status"; // 定时任务日志状态的枚举
+    String JOB_STATUS = "infra_job_status"; // 定时任务状态的枚举
+    String JOB_LOG_STATUS = "infra_job_log_status"; // 定时任务日志状态的枚举
 
-    String API_ERROR_LOG_PROCESS_STATUS = "inf_api_error_log_process_status"; // API 错误日志的处理状态的枚举
+    String API_ERROR_LOG_PROCESS_STATUS = "infra_api_error_log_process_status"; // API 错误日志的处理状态的枚举
 
-    String ERROR_CODE_TYPE = "inf_error_code_type"; // 错误码的类型枚举
-
-    String CONFIG_TYPE = "sys_config_type"; // 参数配置类型
-    String BOOLEAN_STRING = "sys_boolean_string"; // Boolean 是否类型
+    String CONFIG_TYPE = "infra_config_type"; // 参数配置类型
+    String BOOLEAN_STRING = "infra_boolean_string"; // Boolean 是否类型
 
 }

yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/DictTypeConstants.java

@@ -7,29 +7,11 @@ package cn.iocoder.yudao.module.pay.enums;
  */
 public interface DictTypeConstants {
 
-    /**
-     * 支付-订单-订单状态
-     */
-    String PAY_ORDER_STATUS = "pay_order_status";
+    String ORDER_STATUS = "pay_order_status"; // 支付-订单-订单状态
+    String ORDER_NOTIFY_STATUS = "pay_order_notify_status"; // 支付-订单-订单回调商户状态
 
-    /**
-     * 支付-订单-订单回调商户状态
-     */
-    String PAY_ORDER_NOTIFY_STATUS = "pay_order_notify_status";
-
-    /**
-     * 支付-订单-订单退款状态
-     */
-    String PAY_ORDER_REFUND_STATUS = "pay_order_refund_status";
-
-    /**
-     * 支付-退款订单-退款状态
-     */
-    String PAY_REFUND_ORDER_STATUS = "pay_refund_order_status";
-
-    /**
-     * 支付-退款订单-退款类别
-     */
-    String PAY_REFUND_ORDER_TYPE = "pay_refund_order_type";
+    String ORDER_REFUND_STATUS = "pay_order_refund_status"; // 支付-订单-订单退款状态
+    String REFUND_ORDER_STATUS = "pay_refund_order_status"; // 支付-退款订单-退款状态
+    String REFUND_ORDER_TYPE = "pay_refund_order_type"; // 支付-退款订单-退款类别
 
 }

yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderExcelVO.java

@@ -46,11 +46,11 @@ public class PayOrderExcelVO {
     @ExcelProperty("渠道手续费，单位：百分比")
     private String channelFeeRate;
 
-    @DictFormat(DictTypeConstants.PAY_ORDER_STATUS)
+    @DictFormat(DictTypeConstants.ORDER_STATUS)
     @ExcelProperty(value = "支付状态", converter = DictConvert.class)
     private Integer status;
 
-    @DictFormat(DictTypeConstants.PAY_ORDER_NOTIFY_STATUS)
+    @DictFormat(DictTypeConstants.ORDER_NOTIFY_STATUS)
     @ExcelProperty(value = "通知商户支付结果的回调状态", converter = DictConvert.class)
     private Integer notifyStatus;
 
@@ -75,7 +75,7 @@ public class PayOrderExcelVO {
     @ExcelProperty("用户 IP")
     private String userIp;
 
-    @DictFormat(DictTypeConstants.PAY_ORDER_REFUND_STATUS)
+    @DictFormat(DictTypeConstants.ORDER_REFUND_STATUS)
     @ExcelProperty(value = "退款状态", converter = DictConvert.class)
     private Integer refundStatus;
 

yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundExcelVO.java

@@ -43,15 +43,15 @@ public class PayRefundExcelVO {
     @ExcelProperty("异步通知商户地址")
     private String notifyUrl;
 
-    @DictFormat(DictTypeConstants.PAY_ORDER_NOTIFY_STATUS)
+    @DictFormat(DictTypeConstants.ORDER_NOTIFY_STATUS)
     @ExcelProperty(value = "商户退款结果回调状态", converter = DictConvert.class)
     private Integer notifyStatus;
 
-    @DictFormat(DictTypeConstants.PAY_REFUND_ORDER_STATUS)
+    @DictFormat(DictTypeConstants.REFUND_ORDER_STATUS)
     @ExcelProperty(value = "退款状态", converter = DictConvert.class)
     private Integer status;
 
-    @DictFormat(DictTypeConstants.PAY_REFUND_ORDER_TYPE)
+    @DictFormat(DictTypeConstants.REFUND_ORDER_TYPE)
     @ExcelProperty(value = "退款类型", converter = DictConvert.class)
     private Integer type;
 

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java

@@ -8,19 +8,22 @@ package cn.iocoder.yudao.module.system.enums;
 public interface DictTypeConstants {
 
     String USER_TYPE = "user_type"; // 用户类型
-    String COMMON_STATUS = "sys_common_status"; // 系统状态
+    String COMMON_STATUS = "common_status"; // 系统状态
+
+    // ========== SYSTEM 模块 ==========
+
+    String USER_SEX = "system_user_sex"; // 用户性别
 
-    String USER_SEX = "sys_user_sex"; // 用户性别
     String OPERATE_TYPE = "sys_operate_type"; // 操作类型
+
     String LOGIN_TYPE = "sys_login_type"; // 登录日志的类型
     String LOGIN_RESULT = "sys_login_result"; // 登录结果
 
+    String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举
+
     String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码
     String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型
     String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态
     String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态
 
-    String BPM_TASK_ASSIGN_RULE_TYPE = "bpm_task_assign_rule_type"; // 任务分配规则类型
-    String BPM_TASK_ASSIGN_SCRIPT = "bpm_task_assign_script"; // 任务分配自定义脚本
-
 }

yudao-module-tool/yudao-module-tool-impl/pom.xml

@@ -58,6 +58,16 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-excel</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId> <!-- 实现代码生成 -->
+        </dependency>
+
+        <dependency>
+            <groupId>cn.smallbun.screw</groupId>
+            <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
+        </dependency>
     </dependencies>
 
     <build>

yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/doc/DbDocController.java → yudao-module-tool/yudao-module-tool-impl/src/main/java/cn/iocoder/yudao/module/tool/controller/admin/doc/DbDocController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.infra.controller.admin.doc;
+package cn.iocoder.yudao.module.tool.controller.admin.doc;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
@@ -25,11 +25,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 
 @Api(tags = "管理后台 - 数据库文档")
 @RestController
-@RequestMapping("/infra/db-doc")
+@RequestMapping("/tool/db-doc")
 public class DbDocController {
 
     @Resource
@@ -43,7 +44,8 @@ public class DbDocController {
 
     @GetMapping("/export-html")
     @ApiOperation("导出 html 格式的数据文档")
-    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true", dataTypeClass = Boolean.class)
+    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true",
+            dataTypeClass = Boolean.class)
     public void exportHtml(@RequestParam(defaultValue = "true") Boolean deleteFile,
                            HttpServletResponse response) throws IOException {
         doExportFile(EngineFileType.HTML, deleteFile, response);
@@ -51,7 +53,8 @@ public class DbDocController {
 
     @GetMapping("/export-word")
     @ApiOperation("导出 word 格式的数据文档")
-    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true", dataTypeClass = Boolean.class)
+    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true",
+            dataTypeClass = Boolean.class)
     public void exportWord(@RequestParam(defaultValue = "true") Boolean deleteFile,
                            HttpServletResponse response) throws IOException {
         doExportFile(EngineFileType.WORD, deleteFile, response);
@@ -59,7 +62,8 @@ public class DbDocController {
 
     @GetMapping("/export-markdown")
     @ApiOperation("导出 markdown 格式的数据文档")
-    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true", dataTypeClass = Boolean.class)
+    @ApiImplicitParam(name = "deleteFile", value = "是否删除在服务器本地生成的数据库文档", example = "true",
+            dataTypeClass = Boolean.class)
     public void exportMarkdown(@RequestParam(defaultValue = "true") Boolean deleteFile,
                                HttpServletResponse response) throws IOException {
         doExportFile(EngineFileType.MD, deleteFile, response);
@@ -136,7 +140,7 @@ public class DbDocController {
                 .fileOutputDir(FILE_OUTPUT_DIR) // 生成文件路径
                 .openOutputDir(false) // 打开目录
                 .fileType(fileOutputType) // 文件类型
-                .produceType(EngineTemplateType.freemarker) // 文件类型
+                .produceType(EngineTemplateType.velocity) // 文件类型
                 .fileName(docFileName) // 自定义文件名称
                 .build();
     }
@@ -147,7 +151,7 @@ public class DbDocController {
      */
     private static ProcessConfig buildProcessConfig() {
         return ProcessConfig.builder()
-                .ignoreTablePrefix(Collections.singletonList("QRTZ_")) // 忽略表前缀
+                .ignoreTablePrefix(Arrays.asList("QRTZ_", "ACT_")) // 忽略表前缀
                 .build();
     }
 

更新日志.md

@@ -21,6 +21,7 @@
 *【优化】操作日志新增用户类型，实现 APP 端的 API 的操作日志的记录
 *【重构】大模块按照多 Maven Module 的方式拆分，提升可维护性，为后续重构 onemall 提供基础
 *【重构】Spring Security 支持读取多种用户类型，从不同的数据库表，从而实现单项目提供管理后台、用户 APP 的不同 RESTful API 接口
+*【重构】将数据库文档调整到 tool 模块，更加明确
 
 ### 🐞 Bug Fixes
 
@@ -31,6 +32,7 @@
 
 ### 🔨 Dependency Upgrades
 
+*【移除】Apache FreeMarker 依赖，修改 Screw 使用 Velocity 作为模板引擎
 
 ## [v1.3.0] 2022.01.24