Compare commits
No commits in common. "08fc9623bc8c5f7e327d14b8ba112cece327e5f4" and "5c4e0cde3ed6d25333f83d7e24947624d28ccd8e" have entirely different histories.
08fc9623bc
...
5c4e0cde3e
|
@ -7,7 +7,7 @@ nacos:
|
|||
addr: 123.57.152.124:8848
|
||||
user-name: nacos
|
||||
password: nacos
|
||||
namespace: xyr
|
||||
namespace: wx
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
|
@ -7,7 +7,7 @@ nacos:
|
|||
addr: 123.57.152.124:8848
|
||||
user-name: nacos
|
||||
password: nacos
|
||||
namespace: xyr
|
||||
namespace: wx
|
||||
# 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-saas
|
||||
name: cloud-enterprise
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
|
@ -49,6 +49,8 @@ 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}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ public class FileUploadUtils {
|
|||
/**
|
||||
* 默认大小 50M
|
||||
*/
|
||||
public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L;
|
||||
public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
|
||||
|
||||
/**
|
||||
* 默认的文件名最大长度 100
|
||||
|
|
|
@ -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((long) list.size());
|
||||
dataInfo.setTotal(list.size());
|
||||
return success(dataInfo);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue