优化doc

# Conflicts:
#	mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java   resolved by origin/master(远端) version

mms-admin/src/main/java/com/sxpcwlkj/system/entity/bo/SysUserBo.java

@@ -53,7 +53,7 @@ public class SysUserBo extends BaseEntity {
      * 用户账号
      */
     @NotBlank(message = "账号不能为空", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class})
-    @Size(min = 3, max = 20, message = "账号长度在3到20之间", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class})
+    @Size(min = 4, max = 20, message = "账号长度在5到20之间", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class})
     private String userName;
 
     /**

mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java

@@ -99,20 +99,20 @@ public class SysLoginServiceImpl implements SysLoginService {
 
         if(sysConfigService.getIsOpenCaptcha()){
             if(StringUtil.isEmpty(code)){
-                throw new MmsException("验证码不能为空");
+                throw new MmsException("The verification code cannot be empty");
             }
             Map<String, Object> data = RedisUtil.getCacheObject(uuid);
             if (ObjectUtils.isEmpty(data)) {
                 log.info("登录：验证码失效！");
-                throw new LoginException("验证码失效");
+                throw new LoginException("Verification code failure");
             }
             if (!codeKey.equals(data.get(CaptchaEntity.CODE.CAPTCHA_KEY.getValue()))) {
                 log.info("登录：验证码与验证对象不匹配！");
-                throw new LoginException("验证码与验证对象不匹配");
+                throw new LoginException("Verification code does not match the verification object");
             }
             if (!code.equalsIgnoreCase((String) data.get(CaptchaEntity.CODE.CAPTCHA_VALUE.getValue()))) {
                 log.info("登录：验证码不匹配！");
-                throw new LoginException("验证码不匹配");
+                throw new LoginException("Verification code does not match");
             }
         }
         return;
@@ -130,11 +130,11 @@ public class SysLoginServiceImpl implements SysLoginService {
             SysTenant sysTenant = sysTenantService.selectById(sysUser.getTenantId());
             if (ObjectUtils.isEmpty(sysTenant)) {
                 log.info("登录用户ID：{} 租户不存在.", sysUser.getUserId());
-                throw new TenantException("租户不存在");
+                throw new TenantException("tenant.not.exists");
             }
             if (!sysTenant.getStatus().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())) {
                 log.info("登录用户ID：{} 租户状态为禁用.", sysUser.getUserId());
-                throw new TenantException("租户状态为禁用");
+                throw new TenantException("tenant off state");
             }
 
         }

mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysNoticeServiceImpl.java

@@ -3,6 +3,7 @@ package com.sxpcwlkj.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sxpcwlkj.common.enums.SystemCommonEnum;
 import com.sxpcwlkj.common.utils.DataUtil;
 import com.sxpcwlkj.common.utils.MapstructUtil;
 import com.sxpcwlkj.common.utils.StringUtil;
@@ -98,6 +99,6 @@ public class SysNoticeServiceImpl extends BaseServiceImpl<SysNotice, SysNoticeVo
 
     @Override
     public Long selectTool() {
-        return baseMapper.selectCount(new LambdaQueryWrapper<SysNotice>().eq(SysNotice::getStatus,0));
+        return baseMapper.selectCount(new LambdaQueryWrapper<SysNotice>().eq(SysNotice::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()));
     }
 }

mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysOssConfigServiceImpl.java

@@ -123,6 +123,7 @@ public class SysOssConfigServiceImpl extends BaseServiceImpl<SysOssConfig, SysOs
                 baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>().set(SysOssConfig::getStatus, SystemCommonEnum.SYS_COMMON_STATE_CLOSE.getValue()).eq(SysOssConfig::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()));
             }
             bo.setId(configVo.getId());
+            bo.setRevision(configVo.getRevision());
             row = baseMapper.updateById(MapstructUtil.convert(bo, SysOssConfig.class));
         } else {
             if (bo.getStatus().toString().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue().toString()) ) {
@@ -141,7 +142,7 @@ public class SysOssConfigServiceImpl extends BaseServiceImpl<SysOssConfig, SysOs
     @Override
     public List<FileStorageConfig> getOss() {
         //
-        List<SysOssConfigVo> vos = baseMapper.selectVoList(new LambdaQueryWrapper<SysOssConfig>().orderByAsc(SysOssConfig::getStatus));
+        List<SysOssConfigVo> vos = baseMapper.selectVoList(new LambdaQueryWrapper<SysOssConfig>().orderByDesc(SysOssConfig::getStatus));
         List<FileStorageConfig> list = new ArrayList<>();
         for (SysOssConfigVo configVo : vos) {
             if (configVo != null) {

mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java

@@ -450,7 +450,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public Long selectTool() {
-        return baseMapper.selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 0));
+        return baseMapper.selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()));
     }
 
     @Override

mms-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 --- # 项目基础信息
 sxpcwlkj:
   #名称
-  name: MMS
+  name: mmsAdmin
   #描述
   describe: 一款多模块化管理系统（Modular management system），简称：MMS，是一款基于多应用模块用户、商品、支付、订单、分销、日志、定时、通信、直播、广告、文章等多模块应用开源系统，可快速的应用与各类项目研发中，定期更新功能修复、上新、技术栈分享 (十年磨一剑，我们的目标是做最优价值的开源项目)！
   #版本
@@ -16,7 +16,7 @@ sxpcwlkj:
 # 演示模式配置
 demo:
   mode:
-    enabled: false # 默认开启演示模式
+    enabled: true # 默认开启演示模式
     message-template: "演示模式下禁止{operation}操作 [实体: {entity}, 方法: {method}]"
     allowed-users:   # 白名单用户
       - admin

mms-admin/src/main/resources/template/gen/sql/menu.sql.ftl

@@ -5,36 +5,36 @@
 
 #菜单
 INSERT INTO `sys_function`(`parent_id`,`path`,`name`,`component`,`language_code`,`type`,`sort`,`icon`,`status`,`visible`,`is_iframe`,`is_open_link`,`is_link`,`keep_alive`,`always_show`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values (${menuId},'/${moduleName}/${functionName}','${tableComment}','${moduleName}/${functionName}/index','${tableComment}',1,1,'',0,-1,-1,-1,'',1,-1,'000000',${dbTime},${dbTime},1);
+values (${menuId},'/${moduleName}/${functionName}','${tableComment}','${moduleName}/${functionName}/index','${tableComment}',1,1,'',1,-1,-1,-1,'',1,-1,'000000',${dbTime},${dbTime},1);
 
 #列表
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-列表','${moduleName}:${functionName}:list',2,2,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-列表','${moduleName}:${functionName}:list',2,2,1,'000000',${dbTime},${dbTime},1);
 
 #新增
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-新增','${moduleName}:${functionName}:insert',2,3,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-新增','${moduleName}:${functionName}:insert',2,3,1,'000000',${dbTime},${dbTime},1);
 
 #删除
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-删除','${moduleName}:${functionName}:delete',2,4,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-删除','${moduleName}:${functionName}:delete',2,4,1,'000000',${dbTime},${dbTime},1);
 
 #编辑
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-编辑','${moduleName}:${functionName}:edit',2,5,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-编辑','${moduleName}:${functionName}:edit',2,5,1,'000000',${dbTime},${dbTime},1);
 
 #查询
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-查询','${moduleName}:${functionName}:query',2,6,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-查询','${moduleName}:${functionName}:query',2,6,1,'000000',${dbTime},${dbTime},1);
 
 #导入
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-导入','${moduleName}:${functionName}:import',2,6,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-导入','${moduleName}:${functionName}:import',2,7,1,'000000',${dbTime},${dbTime},1);
 
 #导出
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-导出','${moduleName}:${functionName}:export',2,6,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-导出','${moduleName}:${functionName}:export',2,8,1,'000000',${dbTime},${dbTime},1);
 
 #打印
 INSERT INTO `sys_function`(`parent_id`,`name`,`permission`,`type`,`sort`,`status`,`tenant_id`,`created_time`,`updated_time`,`revision`)
-values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-打印','${moduleName}:${functionName}:print',2,6,0,'000000',${dbTime},${dbTime},1);
+values ((SELECT `min_id` FROM  (SELECT MAX(id) AS min_id FROM `sys_function` WHERE `name` = '${tableComment}') AS a),'${tableComment}-打印','${moduleName}:${functionName}:print',2,9,1,'000000',${dbTime},${dbTime},1);

mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl

@@ -135,7 +135,12 @@
 <script setup lang="ts" name="${moduleName}${FunctionName}Dialog">
     import {nextTick, reactive, ref} from "vue";
     import {CURDEnum} from '/@/enums/CURDEnum';
+    import {ElMessage} from "element-plus";
     import {${FunctionName}Bo, ${FunctionName}Vo} from '/@/views/${moduleName}/${functionName}/type';
+    <#if formLayout==2 >
+    import {${functionName}Api} from '/@/views/${moduleName}/${functionName}';
+    const baseApi = ${functionName}Api();
+    </#if>
 
     const dialogWidth = ref('50vw');
     <#list fastList as field>
@@ -154,6 +159,9 @@
     import FastSwitch from "/@/components/fast-switch/src/fast-switch.vue";
     </#if>
     </#list>
+
+
+
     // 定义子组件向父组件传值/事件
     const emit = defineEmits(['refresh']);
     const dialogFormRef = ref();
@@ -176,7 +184,9 @@
         <#list fieldList as field>
             <#if !field.baseField||field.attrName =='status'||field.attrName =='sort'||field.attrName =='remark'>
             <#if field.fieldType == 'int'>
-                <#if field.attrName =='sort'>
+                <#if field.attrName =='status'>
+            ${field.attrName}: 1<#sep>,
+                <#elseif field.attrName =='sort'>
             ${field.attrName}: 1<#sep>,
                 <#else>
             ${field.attrName}: 0<#sep>,
@@ -237,7 +247,7 @@
     }
     <#if formLayout==2 >
     // 选择监听
-    const change = (arr: number[]) => {
+    const change = (arr: string[]) => {
         state.ruleForm.${tableParentId} = arr[arr.length - 1];
     };
     </#if>

mms-admin/src/main/resources/template/gen/vue/index.vue.ftl

@@ -227,7 +227,7 @@
             </#if>
             </#list>
             <#if formLayout==2 >
-            ,isAll:true,
+                isAll:true,
             </#if>
             }
         }

mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/code/entity/ThreeQueryBo.java

@@ -8,8 +8,12 @@ import lombok.Data;
  */
 @Data
 public class ThreeQueryBo {
-    //true：全部数据 false：有效数据(status=0)
+    /**
+     * true：全部数据 false：有效数据(status=0)
+     */
     private Boolean isAll=false;
-    //显示级别，0：全部 1：一级 2：二级 3：三级
+    /**
+     * 显示级别，0：全部 1：一级 2：二级 3：三级
+     */
     private Integer showLevel=0;
 }

mms-modules/mms-datasource/src/main/java/com/sxpcwlkj/datasource/entity/BaseEntity.java

@@ -40,7 +40,7 @@ public class BaseEntity extends PageQuery {
     /* --------------- 业务状态控制字段 --------------- */
 
     /**
-     * 数据状态（1=禁用，0=启用）
+     * 数据状态（0=禁用，1=启用）
      */
     @TableField(fill = FieldFill.INSERT)
     private Integer status = 0;

mms-modules/mms-gen/src/main/java/com/sxpcwlkj/gen/utils/GenUtils.java

@@ -11,9 +11,7 @@ import com.sxpcwlkj.gen.entity.TableEntity;
 import com.sxpcwlkj.gen.entity.TableFieldEntity;
 import lombok.extern.slf4j.Slf4j;
 
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -185,4 +183,130 @@ public class GenUtils {
             return NamingCase.toCamelCase(className);
         }
     }
+
+
+    /**
+     * 执行更新SQL（INSERT/UPDATE/DELETE）
+     * @param datasource 数据源
+     * @param sql SQL语句
+     * @param params SQL参数
+     * @return 受影响的行数
+     */
+
+    // 示例：增加 编辑 删除
+    //    int affectedRows = executeUpdate(datasource,
+    //        "UPDATE users SET name = ? WHERE id = ?",
+    //        new Object[]{"张三", 1});
+    public static int executeUpdate(GenDataSource datasource, String sql, Object[] params) {
+        try (Connection conn = datasource.getConnection();
+             PreparedStatement pstmt = conn.prepareStatement(sql)) {
+
+            // 设置参数
+            if (params != null) {
+                for (int i = 0; i < params.length; i++) {
+                    pstmt.setObject(i + 1, params[i]);
+                }
+            }
+
+            return pstmt.executeUpdate();
+        } catch (Exception e) {
+            log.error("执行更新失败: {}", sql, e);
+            throw new MmsException("执行更新操作失败", e);
+        }
+    }
+
+    /**
+     * 批量执行SQL
+     * @param datasource 数据源
+     * @param sql SQL语句
+     * @param batchParams 批量参数列表
+     * @return 每个操作的受影响行数数组
+     */
+
+    // 示例：批量插入
+    //    List<Object[]> batchParams = new ArrayList<>();
+    //    batchParams.add(new Object[]{"user1", "user1@example.com"});
+    //    batchParams.add(new Object[]{"user2", "user2@example.com"});
+    //        int[] batchResult = executeBatch(datasource,
+    //            "INSERT INTO users (name, email) VALUES (?, ?)",
+    //            batchParams);
+    public static int[] executeBatch(GenDataSource datasource, String sql, List<Object[]> batchParams) {
+        try (Connection conn = datasource.getConnection();
+             PreparedStatement pstmt = conn.prepareStatement(sql)) {
+
+            // 禁用自动提交，开启事务
+            conn.setAutoCommit(false);
+
+            for (Object[] params : batchParams) {
+                if (params != null) {
+                    for (int i = 0; i < params.length; i++) {
+                        pstmt.setObject(i + 1, params[i]);
+                    }
+                }
+                pstmt.addBatch();
+            }
+
+            int[] result = pstmt.executeBatch();
+            // 提交事务
+            conn.commit();
+            // 恢复自动提交
+            conn.setAutoCommit(true);
+
+            return result;
+        } catch (Exception e) {
+            log.error("批量执行失败: {}", sql, e);
+            throw new MmsException("批量执行操作失败", e);
+        }
+    }
+
+    /**
+     * 执行查询SQL并返回对象列表
+     * @param datasource 数据源
+     * @param sql SQL语句
+     * @param params SQL参数
+     * @param mapper 结果映射器
+     * @param <T> 返回类型
+     * @return 查询结果列表
+     */
+
+    //示例：查询
+    //    List<User> users = queryForList(datasource,
+    //        "SELECT * FROM users WHERE status = ?",
+    //        new Object[]{"active"},
+    //        rs -> {
+    //            User u = new User();
+    //            u.setId(rs.getInt("id"));
+    //            u.setName(rs.getString("name"));
+    //            return u;
+    //        });
+    public static <T> List<T> queryForList(GenDataSource datasource, String sql, Object[] params,
+                                           ResultSetMapper<T> mapper) {
+        List<T> resultList = new ArrayList<>();
+
+        try (Connection conn = datasource.getConnection();
+             PreparedStatement pstmt = conn.prepareStatement(sql)) {
+
+            // 设置参数
+            if (params != null) {
+                for (int i = 0; i < params.length; i++) {
+                    pstmt.setObject(i + 1, params[i]);
+                }
+            }
+
+            try (ResultSet rs = pstmt.executeQuery()) {
+                while (rs.next()) {
+                    resultList.add(mapper.mapRow(rs));
+                }
+            }
+            return resultList;
+        } catch (Exception e) {
+            log.error("执行查询失败: {}", sql, e);
+            throw new MmsException("查询数据失败", e);
+        }
+    }
+
+    // 结果映射器接口
+    public interface ResultSetMapper<T> {
+        T mapRow(ResultSet rs) throws SQLException;
+    }
 }

mms-zoom/mms-powerjob/src/main/resources/application-prod.properties

@@ -2,9 +2,9 @@ oms.env=prod
 
 ####### Database properties(Configure according to the the environment) #######
 spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/sxpcwlkj_mms?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.core.username=sxpcwlkj_mms
-spring.datasource.core.password=dkfa7WNTbdDJB8ny
+spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/mms?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.core.username=mms
+spring.datasource.core.password=123456
 spring.datasource.core.maximum-pool-size=20
 spring.datasource.core.minimum-idle=5
 

pom.xml

@@ -556,7 +556,18 @@
                 <artifactId>weixin-java-cp</artifactId>
                 <version>${weixin.version}</version>
             </dependency>
-
+            <!-- 文档管理模块-->
+            <dependency>
+                <groupId>com.sxpcwlkj</groupId>
+                <artifactId>mms-doc-admin</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- 文档API模块-->
+            <dependency>
+                <groupId>com.sxpcwlkj</groupId>
+                <artifactId>mms-doc-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>