Compare commits

...

14 Commits

Author SHA1 Message Date
ruyaxie 08fc9623bc feat():修复车辆网关报错 2024-10-09 17:02:51 +08:00
ruyaxie ee6da76129 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
#	cloud-modules/cloud-modules-parse/pom.xml
#	cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
#	pom.xml
2024-10-09 16:55:09 +08:00
ruyaxie 89c2fc33fa Merge branch 'dev.parse' into dev
# Conflicts:
#	pom.xml
2024-10-09 16:54:48 +08:00
ruyaxie 1e86779560 feat():修复车辆网关报错 2024-10-09 16:53:09 +08:00
ruyaxie 4f0fa2e95c Merge branch 'dev.parse' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
#	pom.xml
2024-10-08 19:51:47 +08:00
ruyaxie b13931317c feat():parse多余的依赖,车辆管理的启动报错,以及XXLJob依赖问题 2024-10-08 19:48:57 +08:00
DongZeLiang dcd9ce68df fix(): 修复包名等格式规范问题 2024-10-08 19:12:42 +08:00
王鑫 65d7fb3de1 fix():重新构建结构 2024-10-08 19:12:42 +08:00
王鑫 a993b30e6e fix():重新构建结构 2024-10-08 19:12:39 +08:00
YangPeng 92c2d7b11b feat():添加剩余注释 2024-10-08 19:12:19 +08:00
YangPeng 75b6097fed feat():添加缓存注释 2024-10-08 19:12:19 +08:00
YangPeng c86f2732b0 fix():bootstrap.yml其他名字改成yp启动,防止端口占用 2024-10-08 19:12:13 +08:00
王鑫 553d5933ed fix():重新构建结构 2024-10-08 19:10:32 +08:00
YangPeng ff98f1cc1b fix():添加车辆全部缓存 2024-10-08 19:10:32 +08:00
4 changed files with 5 additions and 7 deletions

View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: xyr
# Spring
spring:

View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: xyr
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
@ -19,7 +19,7 @@ spring:
allow-bean-definition-overriding: true
application:
# 应用名称
name: cloud-enterprise
name: cloud-saas
profiles:
# 环境配置
active: dev
@ -49,8 +49,6 @@ spring:
shared-configs:
# 系统共享配置
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# 系统环境Config共享配置
- application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# xxl-job 配置文件
- application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

View File

@ -26,7 +26,7 @@ public class FileUploadUtils {
/**
* 50M
*/
public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L;
/**
* 100

View File

@ -93,7 +93,7 @@ public class GenController extends BaseController<BaseEntity> {
TableDataInfo dataInfo = new TableDataInfo();
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
dataInfo.setRows(list);
dataInfo.setTotal(list.size());
dataInfo.setTotal((long) list.size());
return success(dataInfo);
}