diff --git a/src/main/java/vin/vio/collaboraonline/config/tenant/TenantConfigManager.java b/src/main/java/vin/vio/collaboraonline/config/tenant/TenantConfigManager.java index 3a14ba2..0ca8e10 100644 --- a/src/main/java/vin/vio/collaboraonline/config/tenant/TenantConfigManager.java +++ b/src/main/java/vin/vio/collaboraonline/config/tenant/TenantConfigManager.java @@ -42,11 +42,19 @@ public class TenantConfigManager { @Value("${spring.cloud.nacos.config.namespace}") private String namespace; + @Value("${spring.cloud.nacos.username}") + private String username; + + @Value("${spring.cloud.nacos.password}") + private String password; + @PostConstruct public void init() throws Exception { Properties properties = new Properties(); properties.put("serverAddr", nacosServerAddr); properties.put("namespace", namespace); + properties.put("username", username); + properties.put("password", password); ConfigService configService = NacosFactory.createConfigService(properties); for (String tenant : tenantProperties.getList()) { diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 43f4a2f..8f377b8 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,14 +1,15 @@ spring: application: name: CollaboraOnline - profiles: - active: local cloud: nacos: config: namespace: office group: ATTACHMENT_VIA_GROUP +# server-addr: 127.0.0.1:8848 server-addr: 192.168.3.100:8848 + username: nacos + password: nacos config: import: nacos:application-tenant.yml