wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java
dev
王鑫 2024-10-10 10:00:57 +08:00
parent ead12857c5 08fc9623bc
commit 5d1500f4f6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-gateway/src/main/resources/bootstrap.yml
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: wx namespace: xyr
# Spring # Spring
spring: spring:

6
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
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: wx namespace: xyr
# 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-enterprise name: cloud-saas
profiles: profiles:
# 环境配置 # 环境配置
active: dev active: dev
@ -49,8 +49,6 @@ 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}

2
cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java
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(list.size()); dataInfo.setTotal((long) list.size());
return success(dataInfo); return success(dataInfo);
} }