更新董潘祥代码

This commit is contained in:
chy
2026-02-03 15:50:37 +08:00
parent 1c212fb3b3
commit e392221045
27 changed files with 79 additions and 87 deletions

View File

@@ -9,28 +9,28 @@ spring:
datasource:
master:
# MYSQL数据库 主库,业务库
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
lideeyunji: # 从库,框架库
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
slave: # 日志库单独
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
bidb: # 日志库单独
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 2 # 数据库索引
password: lidee@123 # 密码,建议生产环境开启
#password: lidee@123 # 密码,建议生产环境开启
--- #################### 地代码平台相关配置 ####################

View File

@@ -9,28 +9,28 @@ spring:
datasource:
master:
# MYSQL数据库 主库,业务库
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
lideeyunji: # 从库,框架库
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
slave: # 日志库单独
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/bpmformdome?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
bidb: # 日志库单独
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: 123456
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 2 # 数据库索引
password: lidee@123 # 密码,建议生产环境开启
#password: lidee@123 # 密码,建议生产环境开启
--- #################### 地代码平台相关配置 ####################

View File

@@ -69,10 +69,18 @@ public class ReportFieldEntity extends BaseTenantEntity {
*/
private String isShowSort;
/**
* 国际化配置
*/
private String labelI18n;
/**
* 是否合计 空不合计 非空SQL是要返回的合计字段
*/
private String isAmount;
}

View File

@@ -39,9 +39,16 @@ public class ReportFieldVo extends ReportFieldIdVo {
@Schema(description = "字段是否有修改;如果是N并且有id的情况下不修改")
private String isModify;
/**
* 国际化配置
*/
private String labelI18n;
@Schema(description = "是否合计")
private String isAmount ;
@Schema(description = "是否支持维度N=不支持 Y=支持")
private String isDimension ;
}

View File

@@ -371,13 +371,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
entity.setFieldName(vo.getFieldName());
entity.setFieldType(vo.getFieldType());
entity.setSortNum(++sortNum);
entity.setQueryIsDb(vo.getQueryIsDb());
entity.setQueryIsWeb(vo.getQueryIsWeb());
entity.setQueryMode(vo.getQueryMode());
entity.setDictCode(vo.getDictCode());
entity.setIsExport(vo.getIsExport());
entity.setIsShowSort(vo.getIsShowSort());
entity.setIsShowSort(vo.getIsDimension());
entity.setIsAmount(vo.getIsAmount());
entity.setLabelI18n(vo.getLabelI18n());
if (FuncBase.isEmpty(vo.getId())) {//新增
addList.add(entity);

View File

@@ -11,8 +11,7 @@
"name": "lideeyunji.codegen.base-package",
"type": "java.lang.String",
"description": "生成的 Java 代码的基础包",
"sourceType": "com.lideeyunji.service.infra.config.framework.codegen.config.CodegenProperties",
"defaultValue": "com.lideeyunji"
"sourceType": "com.lideeyunji.service.infra.config.framework.codegen.config.CodegenProperties"
},
{
"name": "lideeyunji.codegen.db-schemas",
@@ -24,8 +23,7 @@
"name": "lideeyunji.codegen.front-type",
"type": "java.lang.Integer",
"description": "代码生成的前端类型(默认) 枚举 {@link CodegenFrontTypeEnum#getType()}",
"sourceType": "com.lideeyunji.service.infra.config.framework.codegen.config.CodegenProperties",
"defaultValue": 10
"sourceType": "com.lideeyunji.service.infra.config.framework.codegen.config.CodegenProperties"
}
],
"hints": []

View File

@@ -12,8 +12,8 @@ import org.apache.ibatis.type.JdbcType;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:42+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:12+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class CodegenConvertImpl implements CodegenConvert {

View File

@@ -10,8 +10,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:42+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:12+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class ConfigConvertImpl implements ConfigConvert {

View File

@@ -6,8 +6,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:42+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:12+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class FileConfigConvertImpl implements FileConfigConvert {

View File

@@ -4,8 +4,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:42+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:12+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class RedisConvertImpl implements RedisConvert {
}

View File

@@ -14,8 +14,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class AuthConvertImpl implements AuthConvert {

View File

@@ -6,8 +6,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class OperateLogConvertImpl implements OperateLogConvert {

View File

@@ -4,8 +4,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class MailAccountConvertImpl implements MailAccountConvert {
}

View File

@@ -4,8 +4,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class OAuth2OpenConvertImpl implements OAuth2OpenConvert {
}

View File

@@ -6,8 +6,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class SocialUserConvertImpl implements SocialUserConvert {

View File

@@ -4,8 +4,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class TenantConvertImpl implements TenantConvert {
}

View File

@@ -4,8 +4,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-01-21T09:09:30+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)"
date = "2026-02-02T00:49:16+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)"
)
public class UserConvertImpl implements UserConvert {
}

View File

@@ -15,50 +15,42 @@
{
"name": "lideeyunji.ai.deepseek.api-host",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties",
"defaultValue": "https:\/\/api.deepseek.com\/"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties"
},
{
"name": "lideeyunji.ai.deepseek.api-key",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties",
"defaultValue": ""
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties"
},
{
"name": "lideeyunji.ai.deepseek.chat-completion-url",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties",
"defaultValue": "chat\/completions"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties"
},
{
"name": "lideeyunji.ai.deepseek.model",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties",
"defaultValue": "deepseek-chat"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.DeepSeekConfigProperties"
},
{
"name": "lideeyunji.ai.kimi.api-host",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties",
"defaultValue": "https:\/\/api.moonshot.cn\/"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties"
},
{
"name": "lideeyunji.ai.kimi.api-key",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties",
"defaultValue": ""
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties"
},
{
"name": "lideeyunji.ai.kimi.chat-completion-url",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties",
"defaultValue": "v1\/chat\/completions"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties"
},
{
"name": "lideeyunji.ai.kimi.model",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties",
"defaultValue": "moonshot-v1-8k"
"sourceType": "com.lideeyunji.tool.framework.ai.properties.KimiConfigProperties"
}
],
"hints": []

View File

@@ -10,8 +10,7 @@
{
"name": "lideeyunji.yunji.save-op-log",
"type": "java.lang.Boolean",
"sourceType": "com.lideeyunji.tool.framework.operatelog.config.OperateLogProperties",
"defaultValue": true
"sourceType": "com.lideeyunji.tool.framework.operatelog.config.OperateLogProperties"
}
],
"hints": []

View File

@@ -11,8 +11,7 @@
"name": "lideeyunji.cache.redis-scan-batch-size",
"type": "java.lang.Integer",
"description": "redis scan 一次返回数量",
"sourceType": "com.lideeyunji.tool.framework.redis.config.CacheProperties",
"defaultValue": 30
"sourceType": "com.lideeyunji.tool.framework.redis.config.CacheProperties"
}
],
"hints": []

View File

@@ -11,22 +11,19 @@
"name": "lideeyunji.security.mock-enable",
"type": "java.lang.Boolean",
"description": "mock 模式的开关",
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties",
"defaultValue": false
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties"
},
{
"name": "lideeyunji.security.mock-secret",
"type": "java.lang.String",
"description": "mock 模式的密钥 一定要配置密钥,保证安全性",
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties",
"defaultValue": "test"
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties"
},
{
"name": "lideeyunji.security.password-encoder-length",
"type": "java.lang.Integer",
"description": "PasswordEncoder 加密复杂度,越高开销越大",
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties",
"defaultValue": 4
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties"
},
{
"name": "lideeyunji.security.permit-all-urls",
@@ -38,15 +35,13 @@
"name": "lideeyunji.security.token-header",
"type": "java.lang.String",
"description": "HTTP 请求时,访问令牌的请求 Header",
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties",
"defaultValue": "Authorization"
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties"
},
{
"name": "lideeyunji.security.token-parameter",
"type": "java.lang.String",
"description": "HTTP 请求时,访问令牌的请求参数 初始目的:解决 WebSocket 无法通过 header 传参,只能通过 token 参数拼接",
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties",
"defaultValue": "token"
"sourceType": "com.lideeyunji.tool.framework.security.config.SecurityProperties"
}
],
"hints": []

View File

@@ -11,8 +11,7 @@
"name": "lideeyunji.tenant.enable",
"type": "java.lang.Boolean",
"description": "是否开启",
"sourceType": "com.lideeyunji.tool.framework.tenant.config.TenantProperties",
"defaultValue": true
"sourceType": "com.lideeyunji.tool.framework.tenant.config.TenantProperties"
},
{
"name": "lideeyunji.tenant.ignore-tables",

View File

@@ -52,8 +52,7 @@
"name": "lideeyunji.error-code.enable",
"type": "java.lang.Boolean",
"description": "是否开启",
"sourceType": "com.lideeyunji.tool.framework.errorcode.config.ErrorCodeProperties",
"defaultValue": false
"sourceType": "com.lideeyunji.tool.framework.errorcode.config.ErrorCodeProperties"
},
{
"name": "lideeyunji.swagger.author",
@@ -136,15 +135,13 @@
{
"name": "lideeyunji.web.web-u-r-i",
"type": "java.lang.String",
"sourceType": "com.lideeyunji.tool.framework.web.config.WebProperties",
"defaultValue": "http:\/\/lidee.vip"
"sourceType": "com.lideeyunji.tool.framework.web.config.WebProperties"
},
{
"name": "lideeyunji.xss.enable",
"type": "java.lang.Boolean",
"description": "是否开启,默认为 true",
"sourceType": "com.lideeyunji.tool.framework.xss.config.XssProperties",
"defaultValue": true
"sourceType": "com.lideeyunji.tool.framework.xss.config.XssProperties"
},
{
"name": "lideeyunji.xss.exclude-urls",
@@ -155,8 +152,7 @@
{
"name": "lideeyunji.yunji.save-req-log",
"type": "java.lang.Boolean",
"sourceType": "com.lideeyunji.tool.framework.apilog.config.ApiLogProperties",
"defaultValue": true
"sourceType": "com.lideeyunji.tool.framework.apilog.config.ApiLogProperties"
}
],
"hints": []

View File

@@ -11,15 +11,13 @@
"name": "lideeyunji.websocket.path",
"type": "java.lang.String",
"description": "WebSocket 的连接路径",
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties",
"defaultValue": "\/ws"
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties"
},
{
"name": "lideeyunji.websocket.sender-type",
"type": "java.lang.String",
"description": "消息发送器的类型 可选值local、redis、rocketmq、kafka、rabbitmq",
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties",
"defaultValue": "local"
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties"
}
],
"hints": []