1024-lab/smart-admin
1
0
Fork 0
mirror of https://github.com/1024-lab/smart-admin.git synced 2026-01-22 01:00:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v3.15.0【新增】升级SaToken到最新版本;【新增】重磅优化 数据字典;【新增】升级wangEditor-next;【新增】优化缓存实现redis与caffeine

Browse Source
This commit is contained in:
zhuoda
2025-03-31 23:27:37 +08:00
parent fecb3a9d81
commit a2785fbee7
347 changed files with 4203 additions and 3792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
View File

@@ -18,7 +18,6 @@ import org.springframework.stereotype.Component;
*/
@Mapper
@Component
public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Entity> {
/**

2
smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
View File

@@ -17,7 +17,7 @@ public class ${name.upperCamel}VO {
#foreach ($field in $fields)
${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
${field.apiModelProperty}$!{field.notEmpty}$!{field.file}
private $field.javaType $field.fieldName;
#end

11
smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
View File

@@ -29,15 +29,11 @@ public class ${name.upperCamel}Service {
/**
* 分页查询
*
* @param queryForm
* @return
*/
public PageResult<${name.upperCamel}VO> queryPage(${name.upperCamel}QueryForm queryForm) {
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
List<${name.upperCamel}VO> list = ${name.lowerCamel}Dao.queryPage(page, queryForm);
PageResult<${name.upperCamel}VO> pageResult = SmartPageUtil.convert2PageResult(page, list);
return pageResult;
return SmartPageUtil.convert2PageResult(page, list);
}
#if($insertAndUpdate.isSupportInsertAndUpdate)
@@ -53,8 +49,6 @@ public class ${name.upperCamel}Service {
/**
* 更新
*
* @param updateForm
* @return
*/
public ResponseDTO<String> update(${name.upperCamel}UpdateForm updateForm) {
${name.upperCamel}Entity ${name.lowerCamel}Entity = SmartBeanUtil.copy(updateForm, ${name.upperCamel}Entity.class);
@@ -67,9 +61,6 @@ public class ${name.upperCamel}Service {
#if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
/**
* 批量删除
*
* @param idList
* @return
*/
public ResponseDTO<String> batchDelete(List<${primaryKeyJavaType}> idList) {
if (CollectionUtils.isEmpty(idList)){

4
smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
View File

@@ -48,7 +48,7 @@
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
<DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")
@@ -106,7 +106,7 @@
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
<DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")

2
smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
View File

@@ -22,7 +22,7 @@
#end
#if($field.queryTypeEnum == "Dict")
<a-form-item label="${field.label}" class="smart-query-form-item">
<DictSelect keyCode="$!{field.dict}" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
<DictSelect dictCode="$!{field.dict}" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "Enum")

45
smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictDataMapper.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictDataDao">
<select id="queryByDictId" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
select *
from t_dict_data
where dict_id = #{dictId}
order by sort_order desc
</select>
<select id="getAll" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
select t_dict_data.*,
t_dict.dict_code
from t_dict_data
left join t_dict on t_dict_data.dict_id = t_dict.dict_id
order by t_dict_data.sort_order desc
</select>
<select id="selectByDictIdAndValue"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictDataEntity">
select *
from t_dict_data
where dict_id = #{dictId}
and data_value = #{dataValue}
</select>
<select id="selectByDictDataIds" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
select
t_dict_data.*,
t_dict.dict_code
from t_dict_data
left join t_dict on t_dict_data.dict_id = t_dict.dict_id
<where>
<if test="dictDataIdList != null and dictDataIdList.size > 0">
and t_dict_data.dict_data_id in
<foreach collection="dictDataIdList" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

37
smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml
View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictKeyDao">
<update id="updateDeletedFlagByIdList">
update t_dict_key set deleted_flag = #{deletedFlag} where dict_key_id in
<foreach collection="dictKeyIdList" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</update>
<select id="query" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictKeyVO">
SELECT * FROM t_dict_key
<where>
<if test="query.searchWord != null and query.searchWord !=''">
AND (INSTR(key_code,#{query.searchWord}) or INSTR(key_name,#{query.searchWord}))
</if>
<if test="query.deletedFlag != null">
AND deleted_flag = #{query.deletedFlag}
</if>
</where>
<if test="query.sortItemList == null or query.sortItemList.size == 0">
ORDER BY dict_key_id DESC
</if>
</select>
<select id="selectByCode"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictKeyEntity">
select * from t_dict_key where key_code = #{keyCode} and deleted_flag = #{deletedFlag}
</select>
<select id="selectByDeletedFlag"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictKeyEntity">
select * from t_dict_key where deleted_flag = #{deletedFlag}
</select>
</mapper>

45
smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictMapper.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictDao">
<!-- 查询结果列 -->
<sql id="base_columns">
t_dict.dict_id,
t_dict.dict_name,
t_dict.dict_code,
t_dict.remark,
t_dict.disabled_flag,
t_dict.create_time,
t_dict.update_time
</sql>
<!-- 分页查询 -->
<select id="queryPage" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictVO">
SELECT
<include refid="base_columns"/>
FROM t_dict
<where>
<!--关键字-->
<if test="queryForm.keywords != null and queryForm.keywords != ''">
AND (
INSTR(t_dict.dict_name,#{queryForm.keywords})
OR INSTR(t_dict.dict_code,#{queryForm.keywords})
OR INSTR(t_dict.remark,#{queryForm.keywords})
)
</if>
<!--禁用状态-->
<if test="queryForm.disabledFlag != null">
AND t_dict.disabled_flag = #{queryForm.disabledFlag}
</if>
</where>
<if test="queryForm.sortItemList == null or queryForm.sortItemList.size == 0">
order by create_time desc
</if>
</select>
<select id="selectByCode" resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictEntity">
select * from t_dict where dict_code = #{code}
</select>
</mapper>

44
smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictValueMapper.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictValueDao">
<update id="updateDeletedFlagByIdList">
update t_dict_value set deleted_flag = #{deletedFlag} where dict_value_id in
<foreach collection="dictValueIdList" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</update>
<select id="query" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictValueVO">
SELECT * FROM t_dict_value
<where>
<if test="query.dictKeyId != null">
AND dict_key_id = #{query.dictKeyId}
</if>
<if test="query.searchWord != null and query.searchWord !=''">
AND (INSTR(value_code,#{query.searchWord}) or INSTR(value_name,#{query.searchWord}))
</if>
<if test="query.deletedFlag != null">
AND deleted_flag = #{query.deletedFlag}
</if>
</where>
<if test="query.sortItemList == null or query.sortItemList.size == 0">
ORDER BY sort,dict_value_id DESC
</if>
</select>
<select id="selectByCode"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
select * from t_dict_value where dict_Key_id = #{dictKeyId} and value_code = #{valueCode} and deleted_flag = #{deletedFlag}
</select>
<select id="selectByDeletedFlag"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
select * from t_dict_value where deleted_flag = #{deletedFlag} order by sort;
</select>
<select id="selectByDeletedFlagAndKeyId"
resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
select * from t_dict_value where dict_key_id = #{dictKeyId} and deleted_flag = #{deletedFlag}
</select>
</mapper>

2
smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml
View File

@@ -9,7 +9,7 @@
<if test="query.searchWord != null and query.searchWord != '' ">
AND (
INSTR(feedback_content,#{query.searchWord})
OR INSTR(create_name,#{query.searchWord})
OR INSTR(user_name,#{query.searchWord})
)
</if>
<if test="query.startDate != null">

5
smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml
View File

@@ -38,7 +38,7 @@ spring:
host: smtp.163.com
port: 465
username: lab1024@163.com
password: 1024lab
password: LAB1024LAB
properties:
mail:
smtp:
@@ -99,12 +99,13 @@ springdoc:
enabled: true # 开关
doc-expansion: none #关闭展开
tags-sorter: alpha
server-base-url: https://preview.smartadmin.vip/smart-admin-api
api-docs:
enabled: true # 开关
knife4j:
enable: true
basic:
enable: true
enable: false
username: api # Basic认证用户名
password: 1024 # Basic认证密码