Compare commits

..

No commits in common. "08fc9623bc8c5f7e327d14b8ba112cece327e5f4" and "5c4e0cde3ed6d25333f83d7e24947624d28ccd8e" have entirely different histories.

4 changed files with 7 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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