repo_name
stringclasses 5
values | pr_number
int64 1.52k
15.5k
| pr_title
stringlengths 8
143
| pr_description
stringlengths 0
10.2k
| author
stringlengths 3
18
| date_created
timestamp[ns, tz=UTC] | date_merged
timestamp[ns, tz=UTC] | previous_commit
stringlengths 40
40
| pr_commit
stringlengths 40
40
| query
stringlengths 11
10.2k
| filepath
stringlengths 6
220
| before_content
stringlengths 0
597M
| after_content
stringlengths 0
597M
| label
int64 -1
1
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapExtendProperties.java | /*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap")
public class LdapExtendProperties {
private LdapMappingProperties mapping;
private LdapGroupProperties group;
public LdapMappingProperties getMapping() {
return mapping;
}
public void setMapping(LdapMappingProperties mapping) {
this.mapping = mapping;
}
public LdapGroupProperties getGroup() {
return group;
}
public void setGroup(LdapGroupProperties group) {
this.group = group;
}
}
| /*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap")
public class LdapExtendProperties {
private LdapMappingProperties mapping;
private LdapGroupProperties group;
public LdapMappingProperties getMapping() {
return mapping;
}
public void setMapping(LdapMappingProperties mapping) {
this.mapping = mapping;
}
public LdapGroupProperties getGroup() {
return group;
}
public void setGroup(LdapGroupProperties group) {
this.group = group;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.RestTemplate;
import java.util.List;
public class ItemSetControllerTest extends AbstractControllerTest {
@Autowired
ItemRepository itemRepository;
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetCreated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets itemSet = new ItemChangeSets();
itemSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
itemSet.addCreateItem(item);
}
ResponseEntity<Void> response =
createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/itemset",
itemSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, items.size());
Item item0 = items.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("created_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetUpdated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdRestTemplate = (new TestRestTemplate()).getRestTemplate();
createdRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
createdRestTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets updateChangeSet = new ItemChangeSets();
updateChangeSet.setDataChangeLastModifiedBy("updated");
RestTemplate updatedRestTemplate = (new TestRestTemplate()).getRestTemplate();
updatedRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int updatedSize = 2;
for (int i = 0; i < updatedSize; i++) {
items[i].setValue("updated_value_" + i);
updateChangeSet.addUpdateItem(items[i]);
}
response = updatedRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
updateChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("updated_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertEquals("updated", item0.getDataChangeLastModifiedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
Assert.assertNotNull(item0.getDataChangeLastModifiedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetDeleted() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets deleteChangeSet = new ItemChangeSets();
deleteChangeSet.setDataChangeLastModifiedBy("deleted");
RestTemplate deletedTemplate = (new TestRestTemplate()).getRestTemplate();
deletedTemplate.setMessageConverters(restTemplate.getMessageConverters());
int deletedSize = 1;
for (int i = 0; i < deletedSize; i++) {
items[i].setValue("deleted_value_" + i);
deleteChangeSet.addDeleteItem(items[i]);
}
response = deletedTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
deleteChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize - deletedSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_1", item0.getKey());
Assert.assertEquals("created_value_1", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
}
| package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.RestTemplate;
import java.util.List;
public class ItemSetControllerTest extends AbstractControllerTest {
@Autowired
ItemRepository itemRepository;
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetCreated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets itemSet = new ItemChangeSets();
itemSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
itemSet.addCreateItem(item);
}
ResponseEntity<Void> response =
createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/itemset",
itemSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, items.size());
Item item0 = items.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("created_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetUpdated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdRestTemplate = (new TestRestTemplate()).getRestTemplate();
createdRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
createdRestTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets updateChangeSet = new ItemChangeSets();
updateChangeSet.setDataChangeLastModifiedBy("updated");
RestTemplate updatedRestTemplate = (new TestRestTemplate()).getRestTemplate();
updatedRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int updatedSize = 2;
for (int i = 0; i < updatedSize; i++) {
items[i].setValue("updated_value_" + i);
updateChangeSet.addUpdateItem(items[i]);
}
response = updatedRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
updateChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("updated_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertEquals("updated", item0.getDataChangeLastModifiedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
Assert.assertNotNull(item0.getDataChangeLastModifiedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetDeleted() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets deleteChangeSet = new ItemChangeSets();
deleteChangeSet.setDataChangeLastModifiedBy("deleted");
RestTemplate deletedTemplate = (new TestRestTemplate()).getRestTemplate();
deletedTemplate.setMessageConverters(restTemplate.getMessageConverters());
int deletedSize = 1;
for (int i = 0; i < deletedSize; i++) {
items[i].setValue("deleted_value_" + i);
deleteChangeSet.addDeleteItem(items[i]);
}
response = deletedTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
deleteChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize - deletedSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_1", item0.getKey());
Assert.assertEquals("created_value_1", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AccessKeyServiceTest.java | package com.ctrip.framework.apollo.biz.service;
import static org.junit.Assert.assertNotNull;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author nisiyong
*/
public class AccessKeyServiceTest extends AbstractIntegrationTest {
@Autowired
private AccessKeyService accessKeyService;
@Test
public void testCreate() {
String appId = "someAppId";
String secret = "someSecret";
AccessKey entity = assembleAccessKey(appId, secret);
AccessKey accessKey = accessKeyService.create(appId, entity);
assertNotNull(accessKey);
}
@Test(expected = BadRequestException.class)
public void testCreateWithException() {
String appId = "someAppId";
String secret = "someSecret";
int maxCount = 5;
for (int i = 0; i <= maxCount; i++) {
AccessKey entity = assembleAccessKey(appId, secret);
accessKeyService.create(appId, entity);
}
}
private AccessKey assembleAccessKey(String appId, String secret) {
AccessKey accessKey = new AccessKey();
accessKey.setAppId(appId);
accessKey.setSecret(secret);
return accessKey;
}
} | package com.ctrip.framework.apollo.biz.service;
import static org.junit.Assert.assertNotNull;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author nisiyong
*/
public class AccessKeyServiceTest extends AbstractIntegrationTest {
@Autowired
private AccessKeyService accessKeyService;
@Test
public void testCreate() {
String appId = "someAppId";
String secret = "someSecret";
AccessKey entity = assembleAccessKey(appId, secret);
AccessKey accessKey = accessKeyService.create(appId, entity);
assertNotNull(accessKey);
}
@Test(expected = BadRequestException.class)
public void testCreateWithException() {
String appId = "someAppId";
String secret = "someSecret";
int maxCount = 5;
for (int i = 0; i <= maxCount; i++) {
AccessKey entity = assembleAccessKey(appId, secret);
accessKeyService.create(appId, entity);
}
}
private AccessKey assembleAccessKey(String appId, String secret) {
AccessKey accessKey = new AccessKey();
accessKey.setAppId(appId);
accessKey.setSecret(secret);
return accessKey;
}
} | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/EnvironmentInfo.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
public class EnvironmentInfo {
private String env;
private boolean active;
private String metaServerAddress;
private ServiceDTO[] configServices;
private ServiceDTO[] adminServices;
private String errorMessage;
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(Env env) {
this.env = env.toString();
}
public boolean isActive() {
return active;
}
public void setActive(boolean active) {
this.active = active;
}
public String getMetaServerAddress() {
return metaServerAddress;
}
public void setMetaServerAddress(String metaServerAddress) {
this.metaServerAddress = metaServerAddress;
}
public ServiceDTO[] getConfigServices() {
return configServices;
}
public void setConfigServices(ServiceDTO[] configServices) {
this.configServices = configServices;
}
public ServiceDTO[] getAdminServices() {
return adminServices;
}
public void setAdminServices(ServiceDTO[] adminServices) {
this.adminServices = adminServices;
}
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
}
| package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
public class EnvironmentInfo {
private String env;
private boolean active;
private String metaServerAddress;
private ServiceDTO[] configServices;
private ServiceDTO[] adminServices;
private String errorMessage;
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(Env env) {
this.env = env.toString();
}
public boolean isActive() {
return active;
}
public void setActive(boolean active) {
this.active = active;
}
public String getMetaServerAddress() {
return metaServerAddress;
}
public void setMetaServerAddress(String metaServerAddress) {
this.metaServerAddress = metaServerAddress;
}
public ServiceDTO[] getConfigServices() {
return configServices;
}
public void setConfigServices(ServiceDTO[] configServices) {
this.configServices = configServices;
}
public ServiceDTO[] getAdminServices() {
return adminServices;
}
public void setAdminServices(ServiceDTO[] adminServices) {
this.adminServices = adminServices;
}
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/SystemInfo.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.google.common.collect.Lists;
import java.util.List;
public class SystemInfo {
private String version;
private List<EnvironmentInfo> environments = Lists.newLinkedList();
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public List<EnvironmentInfo> getEnvironments() {
return environments;
}
public void addEnvironment(EnvironmentInfo environment) {
this.environments.add(environment);
}
}
| package com.ctrip.framework.apollo.portal.entity.vo;
import com.google.common.collect.Lists;
import java.util.List;
public class SystemInfo {
private String version;
private List<EnvironmentInfo> environments = Lists.newLinkedList();
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public List<EnvironmentInfo> getEnvironments() {
return environments;
}
public void addEnvironment(EnvironmentInfo environment) {
this.environments.add(environment);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/ItemsComparator.java | package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Component
public class ItemsComparator {
public ItemChangeSets compareIgnoreBlankAndCommentItem(long baseNamespaceId, List<ItemDTO> baseItems, List<ItemDTO> targetItems){
List<ItemDTO> filteredSourceItems = filterBlankAndCommentItem(baseItems);
List<ItemDTO> filteredTargetItems = filterBlankAndCommentItem(targetItems);
Map<String, ItemDTO> sourceItemMap = BeanUtils.mapByKey("key", filteredSourceItems);
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", filteredTargetItems);
ItemChangeSets changeSets = new ItemChangeSets();
for (ItemDTO item: targetItems){
String key = item.getKey();
ItemDTO sourceItem = sourceItemMap.get(key);
if (sourceItem == null){//add
ItemDTO copiedItem = copyItem(item);
copiedItem.setNamespaceId(baseNamespaceId);
changeSets.addCreateItem(copiedItem);
}else if (!Objects.equals(sourceItem.getValue(), item.getValue())){//update
//only value & comment can be update
sourceItem.setValue(item.getValue());
sourceItem.setComment(item.getComment());
changeSets.addUpdateItem(sourceItem);
}
}
for (ItemDTO item: baseItems){
String key = item.getKey();
ItemDTO targetItem = targetItemMap.get(key);
if(targetItem == null){//delete
changeSets.addDeleteItem(item);
}
}
return changeSets;
}
private List<ItemDTO> filterBlankAndCommentItem(List<ItemDTO> items){
List<ItemDTO> result = new LinkedList<>();
if (CollectionUtils.isEmpty(items)){
return result;
}
for (ItemDTO item: items){
if (!StringUtils.isEmpty(item.getKey())){
result.add(item);
}
}
return result;
}
private ItemDTO copyItem(ItemDTO sourceItem){
ItemDTO copiedItem = new ItemDTO();
copiedItem.setKey(sourceItem.getKey());
copiedItem.setValue(sourceItem.getValue());
copiedItem.setComment(sourceItem.getComment());
return copiedItem;
}
}
| package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Component
public class ItemsComparator {
public ItemChangeSets compareIgnoreBlankAndCommentItem(long baseNamespaceId, List<ItemDTO> baseItems, List<ItemDTO> targetItems){
List<ItemDTO> filteredSourceItems = filterBlankAndCommentItem(baseItems);
List<ItemDTO> filteredTargetItems = filterBlankAndCommentItem(targetItems);
Map<String, ItemDTO> sourceItemMap = BeanUtils.mapByKey("key", filteredSourceItems);
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", filteredTargetItems);
ItemChangeSets changeSets = new ItemChangeSets();
for (ItemDTO item: targetItems){
String key = item.getKey();
ItemDTO sourceItem = sourceItemMap.get(key);
if (sourceItem == null){//add
ItemDTO copiedItem = copyItem(item);
copiedItem.setNamespaceId(baseNamespaceId);
changeSets.addCreateItem(copiedItem);
}else if (!Objects.equals(sourceItem.getValue(), item.getValue())){//update
//only value & comment can be update
sourceItem.setValue(item.getValue());
sourceItem.setComment(item.getComment());
changeSets.addUpdateItem(sourceItem);
}
}
for (ItemDTO item: baseItems){
String key = item.getKey();
ItemDTO targetItem = targetItemMap.get(key);
if(targetItem == null){//delete
changeSets.addDeleteItem(item);
}
}
return changeSets;
}
private List<ItemDTO> filterBlankAndCommentItem(List<ItemDTO> items){
List<ItemDTO> result = new LinkedList<>();
if (CollectionUtils.isEmpty(items)){
return result;
}
for (ItemDTO item: items){
if (!StringUtils.isEmpty(item.getKey())){
result.add(item);
}
}
return result;
}
private ItemDTO copyItem(ItemDTO sourceItem){
ItemDTO copiedItem = new ItemDTO();
copiedItem.setKey(sourceItem.getKey());
copiedItem.setValue(sourceItem.getValue());
copiedItem.setComment(sourceItem.getComment());
return copiedItem;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializerTest.java | package com.ctrip.framework.apollo.spring.boot;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.env.ConfigurableEnvironment;
public class ApolloApplicationContextInitializerTest {
private ApolloApplicationContextInitializer apolloApplicationContextInitializer;
@Before
public void setUp() throws Exception {
apolloApplicationContextInitializer = new ApolloApplicationContextInitializer();
}
@After
public void tearDown() throws Exception {
System.clearProperty("app.id");
System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY);
System.clearProperty("apollo.cacheDir");
System.clearProperty(ConfigConsts.APOLLO_META_KEY);
}
@Test
public void testFillFromEnvironment() throws Exception {
String someAppId = "someAppId";
String someCluster = "someCluster";
String someCacheDir = "someCacheDir";
String someApolloMeta = "someApolloMeta";
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
when(environment.getProperty("app.id")).thenReturn(someAppId);
when(environment.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY)).thenReturn(someCluster);
when(environment.getProperty("apollo.cacheDir")).thenReturn(someCacheDir);
when(environment.getProperty(ConfigConsts.APOLLO_META_KEY)).thenReturn(someApolloMeta);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertEquals(someAppId, System.getProperty("app.id"));
assertEquals(someCluster, System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertEquals(someCacheDir, System.getProperty("apollo.cacheDir"));
assertEquals(someApolloMeta, System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
@Test
public void testFillFromEnvironmentWithSystemPropertyAlreadyFilled() throws Exception {
String someAppId = "someAppId";
String someCluster = "someCluster";
String someCacheDir = "someCacheDir";
String someApolloMeta = "someApolloMeta";
System.setProperty("app.id", someAppId);
System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, someCluster);
System.setProperty("apollo.cacheDir", someCacheDir);
System.setProperty(ConfigConsts.APOLLO_META_KEY, someApolloMeta);
String anotherAppId = "anotherAppId";
String anotherCluster = "anotherCluster";
String anotherCacheDir = "anotherCacheDir";
String anotherApolloMeta = "anotherApolloMeta";
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
when(environment.getProperty("app.id")).thenReturn(anotherAppId);
when(environment.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY)).thenReturn(anotherCluster);
when(environment.getProperty("apollo.cacheDir")).thenReturn(anotherCacheDir);
when(environment.getProperty(ConfigConsts.APOLLO_META_KEY)).thenReturn(anotherApolloMeta);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertEquals(someAppId, System.getProperty("app.id"));
assertEquals(someCluster, System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertEquals(someCacheDir, System.getProperty("apollo.cacheDir"));
assertEquals(someApolloMeta, System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
@Test
public void testFillFromEnvironmentWithNoPropertyFromEnvironment() throws Exception {
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertNull(System.getProperty("app.id"));
assertNull(System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertNull(System.getProperty("apollo.cacheDir"));
assertNull(System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
}
| package com.ctrip.framework.apollo.spring.boot;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.env.ConfigurableEnvironment;
public class ApolloApplicationContextInitializerTest {
private ApolloApplicationContextInitializer apolloApplicationContextInitializer;
@Before
public void setUp() throws Exception {
apolloApplicationContextInitializer = new ApolloApplicationContextInitializer();
}
@After
public void tearDown() throws Exception {
System.clearProperty("app.id");
System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY);
System.clearProperty("apollo.cacheDir");
System.clearProperty(ConfigConsts.APOLLO_META_KEY);
}
@Test
public void testFillFromEnvironment() throws Exception {
String someAppId = "someAppId";
String someCluster = "someCluster";
String someCacheDir = "someCacheDir";
String someApolloMeta = "someApolloMeta";
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
when(environment.getProperty("app.id")).thenReturn(someAppId);
when(environment.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY)).thenReturn(someCluster);
when(environment.getProperty("apollo.cacheDir")).thenReturn(someCacheDir);
when(environment.getProperty(ConfigConsts.APOLLO_META_KEY)).thenReturn(someApolloMeta);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertEquals(someAppId, System.getProperty("app.id"));
assertEquals(someCluster, System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertEquals(someCacheDir, System.getProperty("apollo.cacheDir"));
assertEquals(someApolloMeta, System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
@Test
public void testFillFromEnvironmentWithSystemPropertyAlreadyFilled() throws Exception {
String someAppId = "someAppId";
String someCluster = "someCluster";
String someCacheDir = "someCacheDir";
String someApolloMeta = "someApolloMeta";
System.setProperty("app.id", someAppId);
System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, someCluster);
System.setProperty("apollo.cacheDir", someCacheDir);
System.setProperty(ConfigConsts.APOLLO_META_KEY, someApolloMeta);
String anotherAppId = "anotherAppId";
String anotherCluster = "anotherCluster";
String anotherCacheDir = "anotherCacheDir";
String anotherApolloMeta = "anotherApolloMeta";
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
when(environment.getProperty("app.id")).thenReturn(anotherAppId);
when(environment.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY)).thenReturn(anotherCluster);
when(environment.getProperty("apollo.cacheDir")).thenReturn(anotherCacheDir);
when(environment.getProperty(ConfigConsts.APOLLO_META_KEY)).thenReturn(anotherApolloMeta);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertEquals(someAppId, System.getProperty("app.id"));
assertEquals(someCluster, System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertEquals(someCacheDir, System.getProperty("apollo.cacheDir"));
assertEquals(someApolloMeta, System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
@Test
public void testFillFromEnvironmentWithNoPropertyFromEnvironment() throws Exception {
ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class);
apolloApplicationContextInitializer.initializeSystemProperty(environment);
assertNull(System.getProperty("app.id"));
assertNull(System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY));
assertNull(System.getProperty("apollo.cacheDir"));
assertNull(System.getProperty(ConfigConsts.APOLLO_META_KEY));
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/parser/Parsers.java | package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RelativeDateFormat.java | package com.ctrip.framework.apollo.portal.util;
import org.apache.commons.lang.time.FastDateFormat;
import java.util.Calendar;
import java.util.Date;
public class RelativeDateFormat {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
private static final long ONE_MINUTE = 60000L;
private static final long ONE_HOUR = 3600000L;
private static final long ONE_DAY = 86400000L;
private static final String ONE_SECOND_AGO = " seconds ago";
private static final String ONE_MINUTE_AGO = " minutes ago";
private static final String ONE_HOUR_AGO = " hours ago";
private static final String ONE_DAY_AGO = " days ago";
private static final String ONE_MONTH_AGO = " months ago";
public static String format(Date date) {
if (date.after(new Date())) {
return "now";
}
long delta = new Date().getTime() - date.getTime();
if (delta < ONE_MINUTE) {
long seconds = toSeconds(delta);
return (seconds <= 0 ? 1 : seconds) + ONE_SECOND_AGO;
}
if (delta < 45L * ONE_MINUTE) {
long minutes = toMinutes(delta);
return (minutes <= 0 ? 1 : minutes) + ONE_MINUTE_AGO;
}
if (delta < 24L * ONE_HOUR) {
long hours = toHours(delta);
return (hours <= 0 ? 1 : hours) + ONE_HOUR_AGO;
}
Date lastDayBeginTime = getDateOffset(-1);
if (date.after(lastDayBeginTime)) {
return "yesterday";
}
Date lastTwoDaysBeginTime = getDateOffset(-2);
if (date.after(lastTwoDaysBeginTime)) {
return "the day before yesterday";
}
if (delta < 30L * ONE_DAY) {
long days = toDays(delta);
return (days <= 0 ? 1 : days) + ONE_DAY_AGO;
}
long months = toMonths(delta);
if (months <= 3) {
return (months <= 0 ? 1 : months) + ONE_MONTH_AGO;
}
return TIMESTAMP_FORMAT.format(date);
}
private static long toSeconds(long date) {
return date / 1000L;
}
private static long toMinutes(long date) {
return toSeconds(date) / 60L;
}
private static long toHours(long date) {
return toMinutes(date) / 60L;
}
private static long toDays(long date) {
return toHours(date) / 24L;
}
private static long toMonths(long date) {
return toDays(date) / 30L;
}
public static Date getDateOffset(int offset) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.DATE, offset);
return getDayBeginTime(calendar.getTime());
}
private static Date getDayBeginTime(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
return new Date(calendar.getTime().getTime());
}
}
| package com.ctrip.framework.apollo.portal.util;
import org.apache.commons.lang.time.FastDateFormat;
import java.util.Calendar;
import java.util.Date;
public class RelativeDateFormat {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
private static final long ONE_MINUTE = 60000L;
private static final long ONE_HOUR = 3600000L;
private static final long ONE_DAY = 86400000L;
private static final String ONE_SECOND_AGO = " seconds ago";
private static final String ONE_MINUTE_AGO = " minutes ago";
private static final String ONE_HOUR_AGO = " hours ago";
private static final String ONE_DAY_AGO = " days ago";
private static final String ONE_MONTH_AGO = " months ago";
public static String format(Date date) {
if (date.after(new Date())) {
return "now";
}
long delta = new Date().getTime() - date.getTime();
if (delta < ONE_MINUTE) {
long seconds = toSeconds(delta);
return (seconds <= 0 ? 1 : seconds) + ONE_SECOND_AGO;
}
if (delta < 45L * ONE_MINUTE) {
long minutes = toMinutes(delta);
return (minutes <= 0 ? 1 : minutes) + ONE_MINUTE_AGO;
}
if (delta < 24L * ONE_HOUR) {
long hours = toHours(delta);
return (hours <= 0 ? 1 : hours) + ONE_HOUR_AGO;
}
Date lastDayBeginTime = getDateOffset(-1);
if (date.after(lastDayBeginTime)) {
return "yesterday";
}
Date lastTwoDaysBeginTime = getDateOffset(-2);
if (date.after(lastTwoDaysBeginTime)) {
return "the day before yesterday";
}
if (delta < 30L * ONE_DAY) {
long days = toDays(delta);
return (days <= 0 ? 1 : days) + ONE_DAY_AGO;
}
long months = toMonths(delta);
if (months <= 3) {
return (months <= 0 ? 1 : months) + ONE_MONTH_AGO;
}
return TIMESTAMP_FORMAT.format(date);
}
private static long toSeconds(long date) {
return date / 1000L;
}
private static long toMinutes(long date) {
return toSeconds(date) / 60L;
}
private static long toHours(long date) {
return toMinutes(date) / 60L;
}
private static long toDays(long date) {
return toHours(date) / 24L;
}
private static long toMonths(long date) {
return toDays(date) / 30L;
}
public static Date getDateOffset(int offset) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.DATE, offset);
return getDayBeginTime(calendar.getTime());
}
private static Date getDayBeginTime(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
return new Date(calendar.getTime().getTime());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/BaseDTO.java | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Date;
public class BaseDTO {
protected String dataChangeCreatedBy;
protected String dataChangeLastModifiedBy;
protected Date dataChangeCreatedTime;
protected Date dataChangeLastModifiedTime;
public String getDataChangeCreatedBy() {
return dataChangeCreatedBy;
}
public void setDataChangeCreatedBy(String dataChangeCreatedBy) {
this.dataChangeCreatedBy = dataChangeCreatedBy;
}
public String getDataChangeLastModifiedBy() {
return dataChangeLastModifiedBy;
}
public void setDataChangeLastModifiedBy(String dataChangeLastModifiedBy) {
this.dataChangeLastModifiedBy = dataChangeLastModifiedBy;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
}
| package com.ctrip.framework.apollo.openapi.dto;
import java.util.Date;
public class BaseDTO {
protected String dataChangeCreatedBy;
protected String dataChangeLastModifiedBy;
protected Date dataChangeCreatedTime;
protected Date dataChangeLastModifiedTime;
public String getDataChangeCreatedBy() {
return dataChangeCreatedBy;
}
public void setDataChangeCreatedBy(String dataChangeCreatedBy) {
this.dataChangeCreatedBy = dataChangeCreatedBy;
}
public String getDataChangeLastModifiedBy() {
return dataChangeLastModifiedBy;
}
public void setDataChangeLastModifiedBy(String dataChangeLastModifiedBy) {
this.dataChangeLastModifiedBy = dataChangeLastModifiedBy;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/FavoriteService.java | package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.repository.FavoriteRepository;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import java.util.Collections;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@Service
public class FavoriteService {
public static final long POSITION_DEFAULT = 10000;
private final UserInfoHolder userInfoHolder;
private final FavoriteRepository favoriteRepository;
private final UserService userService;
public FavoriteService(
final UserInfoHolder userInfoHolder,
final FavoriteRepository favoriteRepository,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.favoriteRepository = favoriteRepository;
this.userService = userService;
}
public Favorite addFavorite(Favorite favorite) {
UserInfo user = userService.findByUserId(favorite.getUserId());
if (user == null) {
throw new BadRequestException("user not exist");
}
UserInfo loginUser = userInfoHolder.getUser();
//user can only add himself favorite app
if (!loginUser.equals(user)) {
throw new BadRequestException("add favorite fail. "
+ "because favorite's user is not current login user.");
}
Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId());
if (checkedFavorite != null) {
return checkedFavorite;
}
favorite.setPosition(POSITION_DEFAULT);
favorite.setDataChangeCreatedBy(user.getUserId());
favorite.setDataChangeLastModifiedBy(user.getUserId());
return favoriteRepository.save(favorite);
}
public List<Favorite> search(String userId, String appId, Pageable page) {
boolean isUserIdEmpty = StringUtils.isEmpty(userId);
boolean isAppIdEmpty = StringUtils.isEmpty(appId);
if (isAppIdEmpty && isUserIdEmpty) {
throw new BadRequestException("user id and app id can't be empty at the same time");
}
if (!isUserIdEmpty) {
UserInfo loginUser = userInfoHolder.getUser();
//user can only search his own favorite app
if (!Objects.equals(loginUser.getUserId(), userId)) {
userId = loginUser.getUserId();
}
}
//search by userId
if (isAppIdEmpty && !isUserIdEmpty) {
return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page);
}
//search by appId
if (!isAppIdEmpty && isUserIdEmpty) {
return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page);
}
//search by userId and appId
return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId));
}
public void deleteFavorite(long favoriteId) {
Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null);
checkUserOperatePermission(favorite);
favoriteRepository.delete(favorite);
}
public void adjustFavoriteToFirst(long favoriteId) {
Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null);
checkUserOperatePermission(favorite);
String userId = favorite.getUserId();
Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId);
long minPosition = firstFavorite.getPosition();
favorite.setPosition(minPosition - 1);
favoriteRepository.save(favorite);
}
private void checkUserOperatePermission(Favorite favorite) {
if (favorite == null) {
throw new BadRequestException("favorite not exist");
}
if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) {
throw new BadRequestException("can not operate other person's favorite");
}
}
public void batchDeleteByAppId(String appId, String operator) {
favoriteRepository.batchDeleteByAppId(appId, operator);
}
}
| package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.repository.FavoriteRepository;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import java.util.Collections;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@Service
public class FavoriteService {
public static final long POSITION_DEFAULT = 10000;
private final UserInfoHolder userInfoHolder;
private final FavoriteRepository favoriteRepository;
private final UserService userService;
public FavoriteService(
final UserInfoHolder userInfoHolder,
final FavoriteRepository favoriteRepository,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.favoriteRepository = favoriteRepository;
this.userService = userService;
}
public Favorite addFavorite(Favorite favorite) {
UserInfo user = userService.findByUserId(favorite.getUserId());
if (user == null) {
throw new BadRequestException("user not exist");
}
UserInfo loginUser = userInfoHolder.getUser();
//user can only add himself favorite app
if (!loginUser.equals(user)) {
throw new BadRequestException("add favorite fail. "
+ "because favorite's user is not current login user.");
}
Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId());
if (checkedFavorite != null) {
return checkedFavorite;
}
favorite.setPosition(POSITION_DEFAULT);
favorite.setDataChangeCreatedBy(user.getUserId());
favorite.setDataChangeLastModifiedBy(user.getUserId());
return favoriteRepository.save(favorite);
}
public List<Favorite> search(String userId, String appId, Pageable page) {
boolean isUserIdEmpty = StringUtils.isEmpty(userId);
boolean isAppIdEmpty = StringUtils.isEmpty(appId);
if (isAppIdEmpty && isUserIdEmpty) {
throw new BadRequestException("user id and app id can't be empty at the same time");
}
if (!isUserIdEmpty) {
UserInfo loginUser = userInfoHolder.getUser();
//user can only search his own favorite app
if (!Objects.equals(loginUser.getUserId(), userId)) {
userId = loginUser.getUserId();
}
}
//search by userId
if (isAppIdEmpty && !isUserIdEmpty) {
return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page);
}
//search by appId
if (!isAppIdEmpty && isUserIdEmpty) {
return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page);
}
//search by userId and appId
return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId));
}
public void deleteFavorite(long favoriteId) {
Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null);
checkUserOperatePermission(favorite);
favoriteRepository.delete(favorite);
}
public void adjustFavoriteToFirst(long favoriteId) {
Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null);
checkUserOperatePermission(favorite);
String userId = favorite.getUserId();
Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId);
long minPosition = firstFavorite.getPosition();
favorite.setPosition(minPosition - 1);
favoriteRepository.save(favorite);
}
private void checkUserOperatePermission(Favorite favorite) {
if (favorite == null) {
throw new BadRequestException("favorite not exist");
}
if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) {
throw new BadRequestException("can not operate other person's favorite");
}
}
public void batchDeleteByAppId(String appId, String operator) {
favoriteRepository.batchDeleteByAppId(appId, operator);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/NamespaceLockDTO.java | package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/tracer/internals/NullTransaction.java | package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
/**
* @author Jason Song([email protected])
*/
public class NullTransaction implements Transaction {
@Override
public void setStatus(String status) {
}
@Override
public void setStatus(Throwable e) {
}
@Override
public void addData(String key, Object value) {
}
@Override
public void complete() {
}
}
| package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
/**
* @author Jason Song([email protected])
*/
public class NullTransaction implements Transaction {
@Override
public void setStatus(String status) {
}
@Override
public void setStatus(Throwable e) {
}
@Override
public void addData(String key, Object value) {
}
@Override
public void complete() {
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigFileFormat getConfigFileFormat() {
return ConfigFileFormat.TXT;
}
}
| package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigFileFormat getConfigFileFormat() {
return ConfigFileFormat.TXT;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/KubernetesDiscoveryService.java | package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
/**
* This is a simple implementation that skips any service discovery and just return what is configured
*
* <ul>
* <li>getServiceInstances("apollo-configservice") returns ${apollo.config-service.url}</li>
* <li>getServiceInstances("apollo-adminservice") returns ${apollo.admin-service.url}</li>
* </ul>
*/
@Service
@Profile({"kubernetes"})
public class KubernetesDiscoveryService implements DiscoveryService {
private static final Splitter COMMA_SPLITTER = Splitter.on(",").omitEmptyStrings().trimResults();
private static final Map<String, String> SERVICE_ID_TO_CONFIG_NAME = ImmutableMap
.of(ServiceNameConsts.APOLLO_CONFIGSERVICE, "apollo.config-service.url",
ServiceNameConsts.APOLLO_ADMINSERVICE, "apollo.admin-service.url");
private final BizConfig bizConfig;
public KubernetesDiscoveryService(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
String configName = SERVICE_ID_TO_CONFIG_NAME.get(serviceId);
if (configName == null) {
return Collections.emptyList();
}
return assembleServiceDTO(serviceId, bizConfig.getValue(configName));
}
private List<ServiceDTO> assembleServiceDTO(String serviceId, String directUrl) {
if (Strings.isNullOrEmpty(directUrl)) {
return Collections.emptyList();
}
List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
COMMA_SPLITTER.split(directUrl).forEach(url -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(serviceId);
service.setInstanceId(String.format("%s:%s", serviceId, url));
service.setHomepageUrl(url);
serviceDTOList.add(service);
});
return serviceDTOList;
}
}
| package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
/**
* This is a simple implementation that skips any service discovery and just return what is configured
*
* <ul>
* <li>getServiceInstances("apollo-configservice") returns ${apollo.config-service.url}</li>
* <li>getServiceInstances("apollo-adminservice") returns ${apollo.admin-service.url}</li>
* </ul>
*/
@Service
@Profile({"kubernetes"})
public class KubernetesDiscoveryService implements DiscoveryService {
private static final Splitter COMMA_SPLITTER = Splitter.on(",").omitEmptyStrings().trimResults();
private static final Map<String, String> SERVICE_ID_TO_CONFIG_NAME = ImmutableMap
.of(ServiceNameConsts.APOLLO_CONFIGSERVICE, "apollo.config-service.url",
ServiceNameConsts.APOLLO_ADMINSERVICE, "apollo.admin-service.url");
private final BizConfig bizConfig;
public KubernetesDiscoveryService(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
String configName = SERVICE_ID_TO_CONFIG_NAME.get(serviceId);
if (configName == null) {
return Collections.emptyList();
}
return assembleServiceDTO(serviceId, bizConfig.getValue(configName));
}
private List<ServiceDTO> assembleServiceDTO(String serviceId, String directUrl) {
if (Strings.isNullOrEmpty(directUrl)) {
return Collections.emptyList();
}
List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
COMMA_SPLITTER.split(directUrl).forEach(url -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(serviceId);
service.setInstanceId(String.format("%s:%s", serviceId, url));
service.setHomepageUrl(url);
serviceDTOList.add(service);
});
return serviceDTOList;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@Table(name = "Item")
@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Item extends BaseEntity {
@Column(name = "NamespaceId", nullable = false)
private long namespaceId;
@Column(name = "key", nullable = false)
private String key;
@Column(name = "value")
@Lob
private String value;
@Column(name = "comment")
private String comment;
@Column(name = "LineNum")
private Integer lineNum;
public String getComment() {
return comment;
}
public String getKey() {
return key;
}
public long getNamespaceId() {
return namespaceId;
}
public String getValue() {
return value;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setKey(String key) {
this.key = key;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
public void setValue(String value) {
this.value = value;
}
public Integer getLineNum() {
return lineNum;
}
public void setLineNum(Integer lineNum) {
this.lineNum = lineNum;
}
public String toString() {
return toStringHelper().add("namespaceId", namespaceId).add("key", key).add("value", value)
.add("lineNum", lineNum).add("comment", comment).toString();
}
}
| package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@Table(name = "Item")
@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Item extends BaseEntity {
@Column(name = "NamespaceId", nullable = false)
private long namespaceId;
@Column(name = "key", nullable = false)
private String key;
@Column(name = "value")
@Lob
private String value;
@Column(name = "comment")
private String comment;
@Column(name = "LineNum")
private Integer lineNum;
public String getComment() {
return comment;
}
public String getKey() {
return key;
}
public long getNamespaceId() {
return namespaceId;
}
public String getValue() {
return value;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setKey(String key) {
this.key = key;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
public void setValue(String value) {
this.value = value;
}
public Integer getLineNum() {
return lineNum;
}
public void setLineNum(Integer lineNum) {
this.lineNum = lineNum;
}
public String toString() {
return toStringHelper().add("namespaceId", namespaceId).add("key", key).add("value", value)
.add("lineNum", lineNum).add("comment", comment).toString();
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/ConfigReleaseWebhookNotifier.java | package com.ctrip.framework.apollo.portal.component;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.environment.Env;
/**
* publish webHook
*
* @author HuangSheng
*/
@Component
public class ConfigReleaseWebhookNotifier {
private static final Logger logger = LoggerFactory.getLogger(ConfigReleaseWebhookNotifier.class);
private final RestTemplateFactory restTemplateFactory;
private RestTemplate restTemplate;
public ConfigReleaseWebhookNotifier(RestTemplateFactory restTemplateFactory) {
this.restTemplateFactory = restTemplateFactory;
}
@PostConstruct
public void init() {
// init restTemplate
restTemplate = restTemplateFactory.getObject();
}
public void notify(String[] webHookUrls, Env env, ReleaseHistoryBO releaseHistory) {
if (webHookUrls == null) {
return;
}
for (String webHookUrl : webHookUrls) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
HttpEntity entity = new HttpEntity(releaseHistory, headers);
String url = webHookUrl + "?env={env}";
try {
restTemplate.postForObject(url, entity, String.class, env);
} catch (Exception e) {
logger.error("Notify webHook server failed, env: {}, webHook server url:{}", env, url, e);
}
}
}
}
| package com.ctrip.framework.apollo.portal.component;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.environment.Env;
/**
* publish webHook
*
* @author HuangSheng
*/
@Component
public class ConfigReleaseWebhookNotifier {
private static final Logger logger = LoggerFactory.getLogger(ConfigReleaseWebhookNotifier.class);
private final RestTemplateFactory restTemplateFactory;
private RestTemplate restTemplate;
public ConfigReleaseWebhookNotifier(RestTemplateFactory restTemplateFactory) {
this.restTemplateFactory = restTemplateFactory;
}
@PostConstruct
public void init() {
// init restTemplate
restTemplate = restTemplateFactory.getObject();
}
public void notify(String[] webHookUrls, Env env, ReleaseHistoryBO releaseHistory) {
if (webHookUrls == null) {
return;
}
for (String webHookUrl : webHookUrls) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
HttpEntity entity = new HttpEntity(releaseHistory, headers);
String url = webHookUrl + "?env={env}";
try {
restTemplate.postForObject(url, entity, String.class, env);
} catch (Exception e) {
logger.error("Notify webHook server failed, env: {}, webHook server url:{}", env, url, e);
}
}
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java | package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.PropertySource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Spring boot application entry point
*
* @author Jason Song([email protected])
*/
@EnableAspectJAutoProxy
@EnableAutoConfiguration
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(ConfigServiceApplication.class, args);
}
}
| package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.PropertySource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Spring boot application entry point
*
* @author Jason Song([email protected])
*/
@EnableAspectJAutoProxy
@EnableAutoConfiguration
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(ConfigServiceApplication.class, args);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/YamlConfigFileTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.yaml.YamlParser;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class YamlConfigFileTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private YamlParser yamlParser;
@Mock
private PropertiesFactory propertiesFactory;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
MockInjector.setInstance(YamlParser.class, yamlParser);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testWhenHasContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someContent = "someKey: 'someValue'";
someProperties.setProperty(key, someContent);
someSourceType = ConfigSourceType.LOCAL;
Properties yamlProperties = new Properties();
yamlProperties.setProperty("someKey", "someValue");
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someContent)).thenReturn(yamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someContent, configFile.getContent());
assertSame(yamlProperties, configFile.asProperties());
}
@Test
public void testWhenHasContentWithOrder() throws Exception {
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someContent = "someKey: 'someValue'\nsomeKey2: 'someValue2'";
someProperties.setProperty(key, someContent);
someSourceType = ConfigSourceType.LOCAL;
Properties yamlProperties = new YamlParser().yamlToProperties(someContent);
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someContent)).thenReturn(yamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someContent, configFile.getContent());
assertSame(yamlProperties, configFile.asProperties());
String[] actualArrays = configFile.asProperties().keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testWhenHasNoContent() throws Exception {
when(configRepository.getConfig()).thenReturn(null);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
Properties properties = configFile.asProperties();
assertTrue(properties.isEmpty());
}
@Test
public void testWhenInvalidYamlContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someInvalidContent = ",";
someProperties.setProperty(key, someInvalidContent);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someInvalidContent))
.thenThrow(new RuntimeException("some exception"));
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someInvalidContent, configFile.getContent());
Throwable exceptionThrown = null;
try {
configFile.asProperties();
} catch (Throwable ex) {
exceptionThrown = ex;
}
assertTrue(exceptionThrown instanceof ApolloConfigException);
assertNotNull(exceptionThrown.getCause());
}
@Test
public void testWhenConfigRepositoryHasError() throws Exception {
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
assertEquals(ConfigSourceType.NONE, configFile.getSourceType());
Properties properties = configFile.asProperties();
assertTrue(properties.isEmpty());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someKey: 'someValue'";
String anotherValue = "anotherKey: 'anotherValue'";
someProperties.setProperty(key, someValue);
someSourceType = ConfigSourceType.LOCAL;
Properties someYamlProperties = new Properties();
someYamlProperties.setProperty("someKey", "someValue");
Properties anotherYamlProperties = new Properties();
anotherYamlProperties.setProperty("anotherKey", "anotherValue");
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someValue)).thenReturn(someYamlProperties);
when(yamlParser.yamlToProperties(anotherValue)).thenReturn(anotherYamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
assertEquals(someSourceType, configFile.getSourceType());
assertSame(someYamlProperties, configFile.asProperties());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, anotherValue);
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
configFile.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, configFile.getContent());
assertEquals(anotherSourceType, configFile.getSourceType());
assertSame(anotherYamlProperties, configFile.asProperties());
}
@Test
public void testWhenConfigRepositoryHasErrorAndThenRecovered() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someKey: 'someValue'";
someProperties.setProperty(key, someValue);
someSourceType = ConfigSourceType.LOCAL;
Properties someYamlProperties = new Properties();
someYamlProperties.setProperty("someKey", "someValue");
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someValue)).thenReturn(someYamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
assertEquals(ConfigSourceType.NONE, configFile.getSourceType());
assertTrue(configFile.asProperties().isEmpty());
configFile.onRepositoryChange(someNamespace, someProperties);
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
assertEquals(someSourceType, configFile.getSourceType());
assertSame(someYamlProperties, configFile.asProperties());
}
}
| package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.yaml.YamlParser;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class YamlConfigFileTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private YamlParser yamlParser;
@Mock
private PropertiesFactory propertiesFactory;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
MockInjector.setInstance(YamlParser.class, yamlParser);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testWhenHasContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someContent = "someKey: 'someValue'";
someProperties.setProperty(key, someContent);
someSourceType = ConfigSourceType.LOCAL;
Properties yamlProperties = new Properties();
yamlProperties.setProperty("someKey", "someValue");
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someContent)).thenReturn(yamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someContent, configFile.getContent());
assertSame(yamlProperties, configFile.asProperties());
}
@Test
public void testWhenHasContentWithOrder() throws Exception {
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someContent = "someKey: 'someValue'\nsomeKey2: 'someValue2'";
someProperties.setProperty(key, someContent);
someSourceType = ConfigSourceType.LOCAL;
Properties yamlProperties = new YamlParser().yamlToProperties(someContent);
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someContent)).thenReturn(yamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someContent, configFile.getContent());
assertSame(yamlProperties, configFile.asProperties());
String[] actualArrays = configFile.asProperties().keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testWhenHasNoContent() throws Exception {
when(configRepository.getConfig()).thenReturn(null);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
Properties properties = configFile.asProperties();
assertTrue(properties.isEmpty());
}
@Test
public void testWhenInvalidYamlContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someInvalidContent = ",";
someProperties.setProperty(key, someInvalidContent);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someInvalidContent))
.thenThrow(new RuntimeException("some exception"));
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertSame(someInvalidContent, configFile.getContent());
Throwable exceptionThrown = null;
try {
configFile.asProperties();
} catch (Throwable ex) {
exceptionThrown = ex;
}
assertTrue(exceptionThrown instanceof ApolloConfigException);
assertNotNull(exceptionThrown.getCause());
}
@Test
public void testWhenConfigRepositoryHasError() throws Exception {
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
assertEquals(ConfigSourceType.NONE, configFile.getSourceType());
Properties properties = configFile.asProperties();
assertTrue(properties.isEmpty());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someKey: 'someValue'";
String anotherValue = "anotherKey: 'anotherValue'";
someProperties.setProperty(key, someValue);
someSourceType = ConfigSourceType.LOCAL;
Properties someYamlProperties = new Properties();
someYamlProperties.setProperty("someKey", "someValue");
Properties anotherYamlProperties = new Properties();
anotherYamlProperties.setProperty("anotherKey", "anotherValue");
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someValue)).thenReturn(someYamlProperties);
when(yamlParser.yamlToProperties(anotherValue)).thenReturn(anotherYamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
assertEquals(someSourceType, configFile.getSourceType());
assertSame(someYamlProperties, configFile.asProperties());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, anotherValue);
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
configFile.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, configFile.getContent());
assertEquals(anotherSourceType, configFile.getSourceType());
assertSame(anotherYamlProperties, configFile.asProperties());
}
@Test
public void testWhenConfigRepositoryHasErrorAndThenRecovered() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someKey: 'someValue'";
someProperties.setProperty(key, someValue);
someSourceType = ConfigSourceType.LOCAL;
Properties someYamlProperties = new Properties();
someYamlProperties.setProperty("someKey", "someValue");
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
when(configRepository.getSourceType()).thenReturn(someSourceType);
when(yamlParser.yamlToProperties(someValue)).thenReturn(someYamlProperties);
YamlConfigFile configFile = new YamlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
assertEquals(ConfigSourceType.NONE, configFile.getSourceType());
assertTrue(configFile.asProperties().isEmpty());
configFile.onRepositoryChange(someNamespace, someProperties);
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
assertEquals(someSourceType, configFile.getSourceType());
assertSame(someYamlProperties, configFile.asProperties());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/GlobalDefaultExceptionHandler.java | package com.ctrip.framework.apollo.common.controller;
import com.ctrip.framework.apollo.common.exception.AbstractApolloHttpException;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintViolationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.validation.ObjectError;
import org.springframework.web.HttpMediaTypeException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.client.HttpStatusCodeException;
import static org.slf4j.event.Level.ERROR;
import static org.slf4j.event.Level.WARN;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@ControllerAdvice
public class GlobalDefaultExceptionHandler {
private Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {
}.getType();
private static final Logger logger = LoggerFactory.getLogger(GlobalDefaultExceptionHandler.class);
//处理系统内置的Exception
@ExceptionHandler(Throwable.class)
public ResponseEntity<Map<String, Object>> exception(HttpServletRequest request, Throwable ex) {
return handleError(request, INTERNAL_SERVER_ERROR, ex);
}
@ExceptionHandler({HttpRequestMethodNotSupportedException.class, HttpMediaTypeException.class})
public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request,
ServletException ex) {
return handleError(request, BAD_REQUEST, ex, WARN);
}
@ExceptionHandler(HttpStatusCodeException.class)
public ResponseEntity<Map<String, Object>> restTemplateException(HttpServletRequest request,
HttpStatusCodeException ex) {
return handleError(request, ex.getStatusCode(), ex);
}
@ExceptionHandler(AccessDeniedException.class)
public ResponseEntity<Map<String, Object>> accessDeny(HttpServletRequest request,
AccessDeniedException ex) {
return handleError(request, FORBIDDEN, ex);
}
//处理自定义Exception
@ExceptionHandler({AbstractApolloHttpException.class})
public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request, AbstractApolloHttpException ex) {
return handleError(request, ex.getHttpStatus(), ex);
}
@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseEntity<Map<String, Object>> handleMethodArgumentNotValidException(
HttpServletRequest request, MethodArgumentNotValidException ex
) {
final Optional<ObjectError> firstError = ex.getBindingResult().getAllErrors().stream().findFirst();
if (firstError.isPresent()) {
final String firstErrorMessage = firstError.get().getDefaultMessage();
return handleError(request, BAD_REQUEST, new BadRequestException(firstErrorMessage));
}
return handleError(request, BAD_REQUEST, ex);
}
@ExceptionHandler(ConstraintViolationException.class)
public ResponseEntity<Map<String, Object>> handleConstraintViolationException(
HttpServletRequest request, ConstraintViolationException ex
) {
return handleError(request, BAD_REQUEST, new BadRequestException(ex.getMessage()));
}
private ResponseEntity<Map<String, Object>> handleError(HttpServletRequest request,
HttpStatus status, Throwable ex) {
return handleError(request, status, ex, ERROR);
}
private ResponseEntity<Map<String, Object>> handleError(HttpServletRequest request,
HttpStatus status, Throwable ex, Level logLevel) {
String message = ex.getMessage();
printLog(message, ex, logLevel);
Map<String, Object> errorAttributes = new HashMap<>();
boolean errorHandled = false;
if (ex instanceof HttpStatusCodeException) {
try {
//try to extract the original error info if it is thrown from apollo programs, e.g. admin service
errorAttributes = gson.fromJson(((HttpStatusCodeException) ex).getResponseBodyAsString(), mapType);
status = ((HttpStatusCodeException) ex).getStatusCode();
errorHandled = true;
} catch (Throwable th) {
//ignore
}
}
if (!errorHandled) {
errorAttributes.put("status", status.value());
errorAttributes.put("message", message);
errorAttributes.put("timestamp",
LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
errorAttributes.put("exception", ex.getClass().getName());
}
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
return new ResponseEntity<>(errorAttributes, headers, status);
}
//打印日志, 其中logLevel为日志级别: ERROR/WARN/DEBUG/INFO/TRACE
private void printLog(String message, Throwable ex, Level logLevel) {
switch (logLevel) {
case ERROR:
logger.error(message, ex);
break;
case WARN:
logger.warn(message, ex);
break;
case DEBUG:
logger.debug(message, ex);
break;
case INFO:
logger.info(message, ex);
break;
case TRACE:
logger.trace(message, ex);
break;
}
Tracer.logError(ex);
}
}
| package com.ctrip.framework.apollo.common.controller;
import com.ctrip.framework.apollo.common.exception.AbstractApolloHttpException;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintViolationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.validation.ObjectError;
import org.springframework.web.HttpMediaTypeException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.client.HttpStatusCodeException;
import static org.slf4j.event.Level.ERROR;
import static org.slf4j.event.Level.WARN;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@ControllerAdvice
public class GlobalDefaultExceptionHandler {
private Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {
}.getType();
private static final Logger logger = LoggerFactory.getLogger(GlobalDefaultExceptionHandler.class);
//处理系统内置的Exception
@ExceptionHandler(Throwable.class)
public ResponseEntity<Map<String, Object>> exception(HttpServletRequest request, Throwable ex) {
return handleError(request, INTERNAL_SERVER_ERROR, ex);
}
@ExceptionHandler({HttpRequestMethodNotSupportedException.class, HttpMediaTypeException.class})
public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request,
ServletException ex) {
return handleError(request, BAD_REQUEST, ex, WARN);
}
@ExceptionHandler(HttpStatusCodeException.class)
public ResponseEntity<Map<String, Object>> restTemplateException(HttpServletRequest request,
HttpStatusCodeException ex) {
return handleError(request, ex.getStatusCode(), ex);
}
@ExceptionHandler(AccessDeniedException.class)
public ResponseEntity<Map<String, Object>> accessDeny(HttpServletRequest request,
AccessDeniedException ex) {
return handleError(request, FORBIDDEN, ex);
}
//处理自定义Exception
@ExceptionHandler({AbstractApolloHttpException.class})
public ResponseEntity<Map<String, Object>> badRequest(HttpServletRequest request, AbstractApolloHttpException ex) {
return handleError(request, ex.getHttpStatus(), ex);
}
@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseEntity<Map<String, Object>> handleMethodArgumentNotValidException(
HttpServletRequest request, MethodArgumentNotValidException ex
) {
final Optional<ObjectError> firstError = ex.getBindingResult().getAllErrors().stream().findFirst();
if (firstError.isPresent()) {
final String firstErrorMessage = firstError.get().getDefaultMessage();
return handleError(request, BAD_REQUEST, new BadRequestException(firstErrorMessage));
}
return handleError(request, BAD_REQUEST, ex);
}
@ExceptionHandler(ConstraintViolationException.class)
public ResponseEntity<Map<String, Object>> handleConstraintViolationException(
HttpServletRequest request, ConstraintViolationException ex
) {
return handleError(request, BAD_REQUEST, new BadRequestException(ex.getMessage()));
}
private ResponseEntity<Map<String, Object>> handleError(HttpServletRequest request,
HttpStatus status, Throwable ex) {
return handleError(request, status, ex, ERROR);
}
private ResponseEntity<Map<String, Object>> handleError(HttpServletRequest request,
HttpStatus status, Throwable ex, Level logLevel) {
String message = ex.getMessage();
printLog(message, ex, logLevel);
Map<String, Object> errorAttributes = new HashMap<>();
boolean errorHandled = false;
if (ex instanceof HttpStatusCodeException) {
try {
//try to extract the original error info if it is thrown from apollo programs, e.g. admin service
errorAttributes = gson.fromJson(((HttpStatusCodeException) ex).getResponseBodyAsString(), mapType);
status = ((HttpStatusCodeException) ex).getStatusCode();
errorHandled = true;
} catch (Throwable th) {
//ignore
}
}
if (!errorHandled) {
errorAttributes.put("status", status.value());
errorAttributes.put("message", message);
errorAttributes.put("timestamp",
LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
errorAttributes.put("exception", ex.getClass().getName());
}
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
return new ResponseEntity<>(errorAttributes, headers, status);
}
//打印日志, 其中logLevel为日志级别: ERROR/WARN/DEBUG/INFO/TRACE
private void printLog(String message, Throwable ex, Level logLevel) {
switch (logLevel) {
case ERROR:
logger.error(message, ex);
break;
case WARN:
logger.warn(message, ex);
break;
case DEBUG:
logger.debug(message, ex);
break;
case INFO:
logger.info(message, ex);
break;
case TRACE:
logger.trace(message, ex);
break;
}
Tracer.logError(ex);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/SpringValueProcessor.java | package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.spring.property.PlaceholderHelper;
import com.ctrip.framework.apollo.spring.property.SpringValue;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinition;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueRegistry;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
/**
* Spring value processor of field or method which has @Value and xml config placeholders.
*
* @author github.com/zhegexiaohuozi [email protected]
* @since 2017/12/20.
*/
public class SpringValueProcessor extends ApolloProcessor implements BeanFactoryPostProcessor, BeanFactoryAware {
private static final Logger logger = LoggerFactory.getLogger(SpringValueProcessor.class);
private final ConfigUtil configUtil;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private BeanFactory beanFactory;
private Multimap<String, SpringValueDefinition> beanName2SpringValueDefinitions;
public SpringValueProcessor() {
configUtil = ApolloInjector.getInstance(ConfigUtil.class);
placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
beanName2SpringValueDefinitions = LinkedListMultimap.create();
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled() && beanFactory instanceof BeanDefinitionRegistry) {
beanName2SpringValueDefinitions = SpringValueDefinitionProcessor
.getBeanName2SpringValueDefinitions((BeanDefinitionRegistry) beanFactory);
}
}
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled()) {
super.postProcessBeforeInitialization(bean, beanName);
processBeanPropertyValues(bean, beanName);
}
return bean;
}
@Override
protected void processField(Object bean, String beanName, Field field) {
// register @Value on field
Value value = field.getAnnotation(Value.class);
if (value == null) {
return;
}
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
if (keys.isEmpty()) {
return;
}
for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
springValueRegistry.register(beanFactory, key, springValue);
logger.debug("Monitoring {}", springValue);
}
}
@Override
protected void processMethod(Object bean, String beanName, Method method) {
//register @Value on method
Value value = method.getAnnotation(Value.class);
if (value == null) {
return;
}
//skip Configuration bean methods
if (method.getAnnotation(Bean.class) != null) {
return;
}
if (method.getParameterTypes().length != 1) {
logger.error("Ignore @Value setter {}.{}, expecting 1 parameter, actual {} parameters",
bean.getClass().getName(), method.getName(), method.getParameterTypes().length);
return;
}
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
if (keys.isEmpty()) {
return;
}
for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
springValueRegistry.register(beanFactory, key, springValue);
logger.info("Monitoring {}", springValue);
}
}
private void processBeanPropertyValues(Object bean, String beanName) {
Collection<SpringValueDefinition> propertySpringValues = beanName2SpringValueDefinitions
.get(beanName);
if (propertySpringValues == null || propertySpringValues.isEmpty()) {
return;
}
for (SpringValueDefinition definition : propertySpringValues) {
try {
PropertyDescriptor pd = BeanUtils
.getPropertyDescriptor(bean.getClass(), definition.getPropertyName());
Method method = pd.getWriteMethod();
if (method == null) {
continue;
}
SpringValue springValue = new SpringValue(definition.getKey(), definition.getPlaceholder(),
bean, beanName, method, false);
springValueRegistry.register(beanFactory, definition.getKey(), springValue);
logger.debug("Monitoring {}", springValue);
} catch (Throwable ex) {
logger.error("Failed to enable auto update feature for {}.{}", bean.getClass(),
definition.getPropertyName());
}
}
// clear
beanName2SpringValueDefinitions.removeAll(beanName);
}
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
}
}
| package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.spring.property.PlaceholderHelper;
import com.ctrip.framework.apollo.spring.property.SpringValue;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinition;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueRegistry;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
/**
* Spring value processor of field or method which has @Value and xml config placeholders.
*
* @author github.com/zhegexiaohuozi [email protected]
* @since 2017/12/20.
*/
public class SpringValueProcessor extends ApolloProcessor implements BeanFactoryPostProcessor, BeanFactoryAware {
private static final Logger logger = LoggerFactory.getLogger(SpringValueProcessor.class);
private final ConfigUtil configUtil;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private BeanFactory beanFactory;
private Multimap<String, SpringValueDefinition> beanName2SpringValueDefinitions;
public SpringValueProcessor() {
configUtil = ApolloInjector.getInstance(ConfigUtil.class);
placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
beanName2SpringValueDefinitions = LinkedListMultimap.create();
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled() && beanFactory instanceof BeanDefinitionRegistry) {
beanName2SpringValueDefinitions = SpringValueDefinitionProcessor
.getBeanName2SpringValueDefinitions((BeanDefinitionRegistry) beanFactory);
}
}
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled()) {
super.postProcessBeforeInitialization(bean, beanName);
processBeanPropertyValues(bean, beanName);
}
return bean;
}
@Override
protected void processField(Object bean, String beanName, Field field) {
// register @Value on field
Value value = field.getAnnotation(Value.class);
if (value == null) {
return;
}
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
if (keys.isEmpty()) {
return;
}
for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
springValueRegistry.register(beanFactory, key, springValue);
logger.debug("Monitoring {}", springValue);
}
}
@Override
protected void processMethod(Object bean, String beanName, Method method) {
//register @Value on method
Value value = method.getAnnotation(Value.class);
if (value == null) {
return;
}
//skip Configuration bean methods
if (method.getAnnotation(Bean.class) != null) {
return;
}
if (method.getParameterTypes().length != 1) {
logger.error("Ignore @Value setter {}.{}, expecting 1 parameter, actual {} parameters",
bean.getClass().getName(), method.getName(), method.getParameterTypes().length);
return;
}
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
if (keys.isEmpty()) {
return;
}
for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
springValueRegistry.register(beanFactory, key, springValue);
logger.info("Monitoring {}", springValue);
}
}
private void processBeanPropertyValues(Object bean, String beanName) {
Collection<SpringValueDefinition> propertySpringValues = beanName2SpringValueDefinitions
.get(beanName);
if (propertySpringValues == null || propertySpringValues.isEmpty()) {
return;
}
for (SpringValueDefinition definition : propertySpringValues) {
try {
PropertyDescriptor pd = BeanUtils
.getPropertyDescriptor(bean.getClass(), definition.getPropertyName());
Method method = pd.getWriteMethod();
if (method == null) {
continue;
}
SpringValue springValue = new SpringValue(definition.getKey(), definition.getPlaceholder(),
bean, beanName, method, false);
springValueRegistry.register(beanFactory, definition.getKey(), springValue);
logger.debug("Monitoring {}", springValue);
} catch (Throwable ex) {
logger.error("Failed to enable auto update feature for {}.{}", bean.getClass(),
definition.getPropertyName());
}
}
// clear
beanName2SpringValueDefinitions.removeAll(beanName);
}
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/Apollo.java | package com.ctrip.framework.apollo;
/**
* @author Jason Song([email protected])
*/
public class Apollo {
public final static String VERSION =
"java-" + Apollo.class.getPackage().getImplementationVersion();
}
| package com.ctrip.framework.apollo;
/**
* @author Jason Song([email protected])
*/
public class Apollo {
public final static String VERSION =
"java-" + Apollo.class.getPackage().getImplementationVersion();
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/usage/apollo-user-guide.md | #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java | package com.ctrip.framework.apollo.util.yaml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.io.ByteArrayResource;
import org.yaml.snakeyaml.constructor.ConstructorException;
import org.yaml.snakeyaml.parser.ParserException;
public class YamlParserTest {
private YamlParser parser;
@Before
public void setUp() throws Exception {
parser = new YamlParser();
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testValidCases() throws Exception {
test("case1.yaml");
test("case3.yaml");
test("case4.yaml");
test("case5.yaml");
test("case6.yaml");
test("case7.yaml");
}
@Test(expected = ParserException.class)
public void testcase2() throws Exception {
testInvalid("case2.yaml");
}
@Test(expected = ParserException.class)
public void testcase8() throws Exception {
testInvalid("case8.yaml");
}
@Test(expected = ConstructorException.class)
public void testcase9() throws Exception {
testInvalid("case9.yaml");
}
@Test
public void testOrderProperties() throws IOException {
String yamlContent = loadYaml("orderedcase.yaml");
Properties nonOrderedProperties = parser.yamlToProperties(yamlContent);
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
parser = new YamlParser();
Properties orderedProperties = parser.yamlToProperties(yamlContent);
assertTrue(orderedProperties instanceof OrderedProperties);
checkPropertiesEquals(nonOrderedProperties, orderedProperties);
String[] propertyNames = orderedProperties.stringPropertyNames().toArray(new String[0]);
assertEquals("k2", propertyNames[0]);
assertEquals("k4", propertyNames[1]);
assertEquals("k1", propertyNames[2]);
}
private void test(String caseName) throws Exception {
String yamlContent = loadYaml(caseName);
check(yamlContent);
}
private String loadYaml(String caseName) throws IOException {
File file = new File("src/test/resources/yaml/" + caseName);
return Files.toString(file, Charsets.UTF_8);
}
private void testInvalid(String caseName) throws Exception {
File file = new File("src/test/resources/yaml/" + caseName);
String yamlContent = Files.toString(file, Charsets.UTF_8);
parser.yamlToProperties(yamlContent);
}
private void check(String yamlContent) {
YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean();
yamlPropertiesFactoryBean.setResources(new ByteArrayResource(yamlContent.getBytes()));
Properties expected = yamlPropertiesFactoryBean.getObject();
Properties actual = parser.yamlToProperties(yamlContent);
assertTrue("expected: " + expected + " actual: " + actual, checkPropertiesEquals(expected, actual));
}
private boolean checkPropertiesEquals(Properties expected, Properties actual) {
if (expected == actual)
return true;
if (expected.size() != actual.size())
return false;
for (Object key : expected.keySet()) {
if (!expected.getProperty((String) key).equals(actual.getProperty((String) key))) {
return false;
}
}
return true;
}
}
| package com.ctrip.framework.apollo.util.yaml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.io.ByteArrayResource;
import org.yaml.snakeyaml.constructor.ConstructorException;
import org.yaml.snakeyaml.parser.ParserException;
public class YamlParserTest {
private YamlParser parser;
@Before
public void setUp() throws Exception {
parser = new YamlParser();
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testValidCases() throws Exception {
test("case1.yaml");
test("case3.yaml");
test("case4.yaml");
test("case5.yaml");
test("case6.yaml");
test("case7.yaml");
}
@Test(expected = ParserException.class)
public void testcase2() throws Exception {
testInvalid("case2.yaml");
}
@Test(expected = ParserException.class)
public void testcase8() throws Exception {
testInvalid("case8.yaml");
}
@Test(expected = ConstructorException.class)
public void testcase9() throws Exception {
testInvalid("case9.yaml");
}
@Test
public void testOrderProperties() throws IOException {
String yamlContent = loadYaml("orderedcase.yaml");
Properties nonOrderedProperties = parser.yamlToProperties(yamlContent);
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
parser = new YamlParser();
Properties orderedProperties = parser.yamlToProperties(yamlContent);
assertTrue(orderedProperties instanceof OrderedProperties);
checkPropertiesEquals(nonOrderedProperties, orderedProperties);
String[] propertyNames = orderedProperties.stringPropertyNames().toArray(new String[0]);
assertEquals("k2", propertyNames[0]);
assertEquals("k4", propertyNames[1]);
assertEquals("k1", propertyNames[2]);
}
private void test(String caseName) throws Exception {
String yamlContent = loadYaml(caseName);
check(yamlContent);
}
private String loadYaml(String caseName) throws IOException {
File file = new File("src/test/resources/yaml/" + caseName);
return Files.toString(file, Charsets.UTF_8);
}
private void testInvalid(String caseName) throws Exception {
File file = new File("src/test/resources/yaml/" + caseName);
String yamlContent = Files.toString(file, Charsets.UTF_8);
parser.yamlToProperties(yamlContent);
}
private void check(String yamlContent) {
YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean();
yamlPropertiesFactoryBean.setResources(new ByteArrayResource(yamlContent.getBytes()));
Properties expected = yamlPropertiesFactoryBean.getObject();
Properties actual = parser.yamlToProperties(yamlContent);
assertTrue("expected: " + expected + " actual: " + actual, checkPropertiesEquals(expected, actual));
}
private boolean checkPropertiesEquals(Properties expected, Properties actual) {
if (expected == actual)
return true;
if (expected.size() != actual.size())
return false;
for (Object key : expected.keySet()) {
if (!expected.getProperty((String) key).equals(actual.getProperty((String) key))) {
return false;
}
}
return true;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/MQConfiguration.java | package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.portal.spi.ctrip.CtripMQService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultMQService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
public class MQConfiguration {
@Configuration
@Profile("ctrip")
public static class CtripMQConfiguration {
@Bean
public CtripMQService mqService() {
return new CtripMQService();
}
}
/**
* spring.profiles.active != ctrip
*/
@Configuration
@ConditionalOnMissingProfile({"ctrip"})
public static class DefaultMQConfiguration {
@Bean
public DefaultMQService mqService() {
return new DefaultMQService();
}
}
}
| package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.portal.spi.ctrip.CtripMQService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultMQService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
public class MQConfiguration {
@Configuration
@Profile("ctrip")
public static class CtripMQConfiguration {
@Bean
public CtripMQService mqService() {
return new CtripMQService();
}
}
/**
* spring.profiles.active != ctrip
*/
@Configuration
@ConditionalOnMissingProfile({"ctrip"})
public static class DefaultMQConfiguration {
@Bean
public DefaultMQService mqService() {
return new DefaultMQService();
}
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultNetworkProvider.java | package com.ctrip.framework.foundation.internals.provider;
import com.ctrip.framework.foundation.internals.NetworkInterfaceManager;
import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
import com.ctrip.framework.foundation.spi.provider.Provider;
public class DefaultNetworkProvider implements NetworkProvider {
@Override
public String getProperty(String name, String defaultValue) {
if ("host.address".equalsIgnoreCase(name)) {
String val = getHostAddress();
return val == null ? defaultValue : val;
}
if ("host.name".equalsIgnoreCase(name)) {
String val = getHostName();
return val == null ? defaultValue : val;
}
return defaultValue;
}
@Override
public void initialize() {
}
@Override
public String getHostAddress() {
return NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
}
@Override
public String getHostName() {
return NetworkInterfaceManager.INSTANCE.getLocalHostName();
}
@Override
public Class<? extends Provider> getType() {
return NetworkProvider.class;
}
@Override
public String toString() {
return "hostName [" + getHostName() + "] hostIP [" + getHostAddress() + "] (DefaultNetworkProvider)";
}
}
| package com.ctrip.framework.foundation.internals.provider;
import com.ctrip.framework.foundation.internals.NetworkInterfaceManager;
import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
import com.ctrip.framework.foundation.spi.provider.Provider;
public class DefaultNetworkProvider implements NetworkProvider {
@Override
public String getProperty(String name, String defaultValue) {
if ("host.address".equalsIgnoreCase(name)) {
String val = getHostAddress();
return val == null ? defaultValue : val;
}
if ("host.name".equalsIgnoreCase(name)) {
String val = getHostName();
return val == null ? defaultValue : val;
}
return defaultValue;
}
@Override
public void initialize() {
}
@Override
public String getHostAddress() {
return NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
}
@Override
public String getHostName() {
return NetworkInterfaceManager.INSTANCE.getLocalHostName();
}
@Override
public Class<? extends Provider> getType() {
return NetworkProvider.class;
}
@Override
public String toString() {
return "hostName [" + getHostName() + "] hostIP [" + getHostAddress() + "] (DefaultNetworkProvider)";
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/util/parser/DurationParserTest.java | package com.ctrip.framework.apollo.util.parser;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class DurationParserTest {
private Parsers.DurationParser durationParser = Parsers.forDuration();
@Test
public void testParseMilliSeconds() throws Exception {
String text = "345MS";
long expected = 345;
checkParseToMillis(expected, text);
}
@Test
public void testParseMilliSecondsWithNoSuffix() throws Exception {
String text = "123";
long expected = 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseSeconds() throws Exception {
String text = "20S";
long expected = 20 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseMinutes() throws Exception {
String text = "15M";
long expected = 15 * 60 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseHours() throws Exception {
String text = "10H";
long expected = 10 * 3600 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseDays() throws Exception {
String text = "2D";
long expected = 2 * 24 * 3600 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullText() throws Exception {
String text = "2D3H4M5S123MS";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullTextWithLowerCase() throws Exception {
String text = "2d3h4m5s123ms";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullTextWithNoMS() throws Exception {
String text = "2D3H4M5S123";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test(expected = ParserException.class)
public void testParseException() throws Exception {
String text = "someInvalidText";
durationParser.parseToMillis(text);
}
private void checkParseToMillis(long expected, String text) throws Exception {
assertEquals(expected, durationParser.parseToMillis(text));
}
} | package com.ctrip.framework.apollo.util.parser;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class DurationParserTest {
private Parsers.DurationParser durationParser = Parsers.forDuration();
@Test
public void testParseMilliSeconds() throws Exception {
String text = "345MS";
long expected = 345;
checkParseToMillis(expected, text);
}
@Test
public void testParseMilliSecondsWithNoSuffix() throws Exception {
String text = "123";
long expected = 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseSeconds() throws Exception {
String text = "20S";
long expected = 20 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseMinutes() throws Exception {
String text = "15M";
long expected = 15 * 60 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseHours() throws Exception {
String text = "10H";
long expected = 10 * 3600 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseDays() throws Exception {
String text = "2D";
long expected = 2 * 24 * 3600 * 1000;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullText() throws Exception {
String text = "2D3H4M5S123MS";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullTextWithLowerCase() throws Exception {
String text = "2d3h4m5s123ms";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test
public void testParseFullTextWithNoMS() throws Exception {
String text = "2D3H4M5S123";
long expected = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
checkParseToMillis(expected, text);
}
@Test(expected = ParserException.class)
public void testParseException() throws Exception {
String text = "someInvalidText";
durationParser.parseToMillis(text);
}
private void checkParseToMillis(long expected, String text) throws Exception {
assertEquals(expected, durationParser.parseToMillis(text));
}
} | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/GrayReleaseRuleItemTransformer.java | package com.ctrip.framework.apollo.common.utils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.Set;
/**
* @author Jason Song([email protected])
*/
public class GrayReleaseRuleItemTransformer {
private static final Gson gson = new Gson();
private static final Type grayReleaseRuleItemsType = new TypeToken<Set<GrayReleaseRuleItemDTO>>() {
}.getType();
public static Set<GrayReleaseRuleItemDTO> batchTransformFromJSON(String content) {
return gson.fromJson(content, grayReleaseRuleItemsType);
}
public static String batchTransformToJSON(Set<GrayReleaseRuleItemDTO> ruleItems) {
return gson.toJson(ruleItems);
}
}
| package com.ctrip.framework.apollo.common.utils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.Set;
/**
* @author Jason Song([email protected])
*/
public class GrayReleaseRuleItemTransformer {
private static final Gson gson = new Gson();
private static final Type grayReleaseRuleItemsType = new TypeToken<Set<GrayReleaseRuleItemDTO>>() {
}.getType();
public static Set<GrayReleaseRuleItemDTO> batchTransformFromJSON(String content) {
return gson.fromJson(content, grayReleaseRuleItemsType);
}
public static String batchTransformToJSON(Set<GrayReleaseRuleItemDTO> ruleItems) {
return gson.toJson(ruleItems);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java | package com.ctrip.framework.apollo.internals;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
public class LocalFileConfigRepositoryTest {
private File someBaseDir;
private String someNamespace;
private ConfigRepository upstreamRepo;
private Properties someProperties;
private static String someAppId = "someApp";
private static String someCluster = "someCluster";
private String defaultKey;
private String defaultValue;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someBaseDir = new File("src/test/resources/config-cache");
someBaseDir.mkdir();
someNamespace = "someName";
someProperties = new Properties();
defaultKey = "defaultKey";
defaultValue = "defaultValue";
someProperties.setProperty(defaultKey, defaultValue);
someSourceType = ConfigSourceType.REMOTE;
upstreamRepo = mock(ConfigRepository.class);
when(upstreamRepo.getConfig()).thenReturn(someProperties);
when(upstreamRepo.getSourceType()).thenReturn(someSourceType);
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someBaseDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someCluster, someNamespace));
}
@Test
public void testLoadConfigWithLocalFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue\nxxx\nyyy";
Properties someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
createLocalCachePropertyFile(someProperties);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(someValue, properties.getProperty(someKey));
assertEquals(ConfigSourceType.LOCAL, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithLocalFileAndFallbackRepo() throws Exception {
File file = new File(someBaseDir, assembleLocalCacheFileName());
String someValue = "someValue";
Files.write(defaultKey + "=" + someValue, file, Charsets.UTF_8);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(defaultValue, properties.getProperty(defaultKey));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFile() throws Exception {
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
Properties result = localFileConfigRepository.getConfig();
assertThat(
"LocalFileConfigRepository's properties should be the same as fallback repo's when there is no local cache",
result.entrySet(), equalTo(someProperties.entrySet()));
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFileMultipleTimes() throws Exception {
LocalFileConfigRepository localRepo =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties someProperties = localRepo.getConfig();
LocalFileConfigRepository
anotherLocalRepoWithNoFallback =
new LocalFileConfigRepository(someNamespace);
anotherLocalRepoWithNoFallback.setLocalCacheDir(someBaseDir, true);
Properties anotherProperties = anotherLocalRepoWithNoFallback.getConfig();
assertThat(
"LocalFileConfigRepository should persist local cache files and return that afterwards",
someProperties.entrySet(), equalTo(anotherProperties.entrySet()));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
localFileConfigRepository.addChangeListener(someListener);
localFileConfigRepository.getConfig();
Properties anotherProperties = new Properties();
anotherProperties.put("anotherKey", "anotherValue");
ConfigSourceType anotherSourceType = ConfigSourceType.NONE;
when(upstreamRepo.getSourceType()).thenReturn(anotherSourceType);
localFileConfigRepository.onRepositoryChange(someNamespace, anotherProperties);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(anotherProperties, captor.getValue());
assertEquals(anotherSourceType, localFileConfigRepository.getSourceType());
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(someBaseDir, assembleLocalCacheFileName());
FileOutputStream in = null;
try {
in = new FileOutputStream(file);
properties.store(in, "Persisted by LocalFileConfigRepositoryTest");
} finally {
if (in != null) {
in.close();
}
}
return file;
}
}
| package com.ctrip.framework.apollo.internals;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
public class LocalFileConfigRepositoryTest {
private File someBaseDir;
private String someNamespace;
private ConfigRepository upstreamRepo;
private Properties someProperties;
private static String someAppId = "someApp";
private static String someCluster = "someCluster";
private String defaultKey;
private String defaultValue;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someBaseDir = new File("src/test/resources/config-cache");
someBaseDir.mkdir();
someNamespace = "someName";
someProperties = new Properties();
defaultKey = "defaultKey";
defaultValue = "defaultValue";
someProperties.setProperty(defaultKey, defaultValue);
someSourceType = ConfigSourceType.REMOTE;
upstreamRepo = mock(ConfigRepository.class);
when(upstreamRepo.getConfig()).thenReturn(someProperties);
when(upstreamRepo.getSourceType()).thenReturn(someSourceType);
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someBaseDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someCluster, someNamespace));
}
@Test
public void testLoadConfigWithLocalFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue\nxxx\nyyy";
Properties someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
createLocalCachePropertyFile(someProperties);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(someValue, properties.getProperty(someKey));
assertEquals(ConfigSourceType.LOCAL, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithLocalFileAndFallbackRepo() throws Exception {
File file = new File(someBaseDir, assembleLocalCacheFileName());
String someValue = "someValue";
Files.write(defaultKey + "=" + someValue, file, Charsets.UTF_8);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(defaultValue, properties.getProperty(defaultKey));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFile() throws Exception {
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
Properties result = localFileConfigRepository.getConfig();
assertThat(
"LocalFileConfigRepository's properties should be the same as fallback repo's when there is no local cache",
result.entrySet(), equalTo(someProperties.entrySet()));
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFileMultipleTimes() throws Exception {
LocalFileConfigRepository localRepo =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties someProperties = localRepo.getConfig();
LocalFileConfigRepository
anotherLocalRepoWithNoFallback =
new LocalFileConfigRepository(someNamespace);
anotherLocalRepoWithNoFallback.setLocalCacheDir(someBaseDir, true);
Properties anotherProperties = anotherLocalRepoWithNoFallback.getConfig();
assertThat(
"LocalFileConfigRepository should persist local cache files and return that afterwards",
someProperties.entrySet(), equalTo(anotherProperties.entrySet()));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
localFileConfigRepository.addChangeListener(someListener);
localFileConfigRepository.getConfig();
Properties anotherProperties = new Properties();
anotherProperties.put("anotherKey", "anotherValue");
ConfigSourceType anotherSourceType = ConfigSourceType.NONE;
when(upstreamRepo.getSourceType()).thenReturn(anotherSourceType);
localFileConfigRepository.onRepositoryChange(someNamespace, anotherProperties);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(anotherProperties, captor.getValue());
assertEquals(anotherSourceType, localFileConfigRepository.getSourceType());
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(someBaseDir, assembleLocalCacheFileName());
FileOutputStream in = null;
try {
in = new FileOutputStream(file);
properties.store(in, "Persisted by LocalFileConfigRepositoryTest");
} finally {
if (in != null) {
in.close();
}
}
return file;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigServiceLocatorTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import java.util.List;
import org.junit.After;
import org.junit.Test;
public class ConfigServiceLocatorTest {
@After
public void tearDown() throws Exception {
System.clearProperty("apollo.configService");
}
@Test
public void testGetConfigServicesWithSystemProperty() throws Exception {
String someConfigServiceUrl = " someConfigServiceUrl ";
String anotherConfigServiceUrl = " anotherConfigServiceUrl ";
System.setProperty("apollo.configService", someConfigServiceUrl + "," + anotherConfigServiceUrl);
ConfigServiceLocator configServiceLocator = new ConfigServiceLocator();
List<ServiceDTO> result = configServiceLocator.getConfigServices();
assertEquals(2, result.size());
assertEquals(someConfigServiceUrl.trim(), result.get(0).getHomepageUrl());
assertEquals(anotherConfigServiceUrl.trim(), result.get(1).getHomepageUrl());
}
}
| package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import java.util.List;
import org.junit.After;
import org.junit.Test;
public class ConfigServiceLocatorTest {
@After
public void tearDown() throws Exception {
System.clearProperty("apollo.configService");
}
@Test
public void testGetConfigServicesWithSystemProperty() throws Exception {
String someConfigServiceUrl = " someConfigServiceUrl ";
String anotherConfigServiceUrl = " anotherConfigServiceUrl ";
System.setProperty("apollo.configService", someConfigServiceUrl + "," + anotherConfigServiceUrl);
ConfigServiceLocator configServiceLocator = new ConfigServiceLocator();
List<ServiceDTO> result = configServiceLocator.getConfigServices();
assertEquals(2, result.size());
assertEquals(someConfigServiceUrl.trim(), result.get(0).getHomepageUrl());
assertEquals(anotherConfigServiceUrl.trim(), result.get(1).getHomepageUrl());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapMappingProperties.java |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rdn key
*/
private String rdnKey;
/**
* user display name
*/
private String userDisplayName;
/**
* email
*/
private String email;
public String getObjectClass() {
return objectClass;
}
public void setObjectClass(String objectClass) {
this.objectClass = objectClass;
}
public String getLoginId() {
return loginId;
}
public void setLoginId(String loginId) {
this.loginId = loginId;
}
public String getRdnKey() {
return rdnKey;
}
public void setRdnKey(String rdnKey) {
this.rdnKey = rdnKey;
}
public String getUserDisplayName() {
return userDisplayName;
}
public void setUserDisplayName(String userDisplayName) {
this.userDisplayName = userDisplayName;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}
|
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rdn key
*/
private String rdnKey;
/**
* user display name
*/
private String userDisplayName;
/**
* email
*/
private String email;
public String getObjectClass() {
return objectClass;
}
public void setObjectClass(String objectClass) {
this.objectClass = objectClass;
}
public String getLoginId() {
return loginId;
}
public void setLoginId(String loginId) {
this.loginId = loginId;
}
public String getRdnKey() {
return rdnKey;
}
public void setRdnKey(String rdnKey) {
this.rdnKey = rdnKey;
}
public String getUserDisplayName() {
return userDisplayName;
}
public void setUserDisplayName(String userDisplayName) {
this.userDisplayName = userDisplayName;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/package-info.java | /**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.common.customize;
| /**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.common.customize;
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java | package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.repository.ConsumerAuditRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRoleRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerTokenRepository;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.hash.Hashing;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
@Service
public class ConsumerService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Joiner KEY_JOINER = Joiner.on("|");
private final UserInfoHolder userInfoHolder;
private final ConsumerTokenRepository consumerTokenRepository;
private final ConsumerRepository consumerRepository;
private final ConsumerAuditRepository consumerAuditRepository;
private final ConsumerRoleRepository consumerRoleRepository;
private final PortalConfig portalConfig;
private final RolePermissionService rolePermissionService;
private final UserService userService;
public ConsumerService(
final UserInfoHolder userInfoHolder,
final ConsumerTokenRepository consumerTokenRepository,
final ConsumerRepository consumerRepository,
final ConsumerAuditRepository consumerAuditRepository,
final ConsumerRoleRepository consumerRoleRepository,
final PortalConfig portalConfig,
final RolePermissionService rolePermissionService,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.consumerTokenRepository = consumerTokenRepository;
this.consumerRepository = consumerRepository;
this.consumerAuditRepository = consumerAuditRepository;
this.consumerRoleRepository = consumerRoleRepository;
this.portalConfig = portalConfig;
this.rolePermissionService = rolePermissionService;
this.userService = userService;
}
public Consumer createConsumer(Consumer consumer) {
String appId = consumer.getAppId();
Consumer managedConsumer = consumerRepository.findByAppId(appId);
if (managedConsumer != null) {
throw new BadRequestException("Consumer already exist");
}
String ownerName = consumer.getOwnerName();
UserInfo owner = userService.findByUserId(ownerName);
if (owner == null) {
throw new BadRequestException(String.format("User does not exist. UserId = %s", ownerName));
}
consumer.setOwnerEmail(owner.getEmail());
String operator = userInfoHolder.getUser().getUserId();
consumer.setDataChangeCreatedBy(operator);
consumer.setDataChangeLastModifiedBy(operator);
return consumerRepository.save(consumer);
}
public ConsumerToken generateAndSaveConsumerToken(Consumer consumer, Date expires) {
Preconditions.checkArgument(consumer != null, "Consumer can not be null");
ConsumerToken consumerToken = generateConsumerToken(consumer, expires);
consumerToken.setId(0);
return consumerTokenRepository.save(consumerToken);
}
public ConsumerToken getConsumerTokenByAppId(String appId) {
Consumer consumer = consumerRepository.findByAppId(appId);
if (consumer == null) {
return null;
}
return consumerTokenRepository.findByConsumerId(consumer.getId());
}
public Long getConsumerIdByToken(String token) {
if (Strings.isNullOrEmpty(token)) {
return null;
}
ConsumerToken consumerToken = consumerTokenRepository.findTopByTokenAndExpiresAfter(token,
new Date());
return consumerToken == null ? null : consumerToken.getConsumerId();
}
public Consumer getConsumerByConsumerId(long consumerId) {
return consumerRepository.findById(consumerId).orElse(null);
}
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) {
return assignNamespaceRoleToConsumer(token, appId, namespaceName, null);
}
@Transactional
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role namespaceModifyRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildModifyNamespaceRoleName(appId, namespaceName, env));
Role namespaceReleaseRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildReleaseNamespaceRoleName(appId, namespaceName, env));
if (namespaceModifyRole == null || namespaceReleaseRole == null) {
throw new BadRequestException("Namespace's role does not exist. Please check whether namespace has created.");
}
long namespaceModifyRoleId = namespaceModifyRole.getId();
long namespaceReleaseRoleId = namespaceReleaseRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceModifyRoleId);
ConsumerRole managedReleaseRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceReleaseRoleId);
if (managedModifyRole != null && managedReleaseRole != null) {
return Arrays.asList(managedModifyRole, managedReleaseRole);
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole namespaceModifyConsumerRole = createConsumerRole(consumerId, namespaceModifyRoleId, operator);
ConsumerRole namespaceReleaseConsumerRole = createConsumerRole(consumerId, namespaceReleaseRoleId, operator);
ConsumerRole createdModifyConsumerRole = consumerRoleRepository.save(namespaceModifyConsumerRole);
ConsumerRole createdReleaseConsumerRole = consumerRoleRepository.save(namespaceReleaseConsumerRole);
return Arrays.asList(createdModifyConsumerRole, createdReleaseConsumerRole);
}
@Transactional
public ConsumerRole assignAppRoleToConsumer(String token, String appId) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role masterRole = rolePermissionService.findRoleByRoleName(RoleUtils.buildAppMasterRoleName(appId));
if (masterRole == null) {
throw new BadRequestException("App's role does not exist. Please check whether app has created.");
}
long roleId = masterRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, roleId);
if (managedModifyRole != null) {
return managedModifyRole;
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole consumerRole = createConsumerRole(consumerId, roleId, operator);
return consumerRoleRepository.save(consumerRole);
}
@Transactional
public void createConsumerAudits(Iterable<ConsumerAudit> consumerAudits) {
consumerAuditRepository.saveAll(consumerAudits);
}
@Transactional
public ConsumerToken createConsumerToken(ConsumerToken entity) {
entity.setId(0); //for protection
return consumerTokenRepository.save(entity);
}
private ConsumerToken generateConsumerToken(Consumer consumer, Date expires) {
long consumerId = consumer.getId();
String createdBy = userInfoHolder.getUser().getUserId();
Date createdTime = new Date();
ConsumerToken consumerToken = new ConsumerToken();
consumerToken.setConsumerId(consumerId);
consumerToken.setExpires(expires);
consumerToken.setDataChangeCreatedBy(createdBy);
consumerToken.setDataChangeCreatedTime(createdTime);
consumerToken.setDataChangeLastModifiedBy(createdBy);
consumerToken.setDataChangeLastModifiedTime(createdTime);
generateAndEnrichToken(consumer, consumerToken);
return consumerToken;
}
void generateAndEnrichToken(Consumer consumer, ConsumerToken consumerToken) {
Preconditions.checkArgument(consumer != null);
if (consumerToken.getDataChangeCreatedTime() == null) {
consumerToken.setDataChangeCreatedTime(new Date());
}
consumerToken.setToken(generateToken(consumer.getAppId(), consumerToken
.getDataChangeCreatedTime(), portalConfig.consumerTokenSalt()));
}
String generateToken(String consumerAppId, Date generationTime, String
consumerTokenSalt) {
return Hashing.sha1().hashString(KEY_JOINER.join(consumerAppId, TIMESTAMP_FORMAT.format
(generationTime), consumerTokenSalt), Charsets.UTF_8).toString();
}
ConsumerRole createConsumerRole(Long consumerId, Long roleId, String operator) {
ConsumerRole consumerRole = new ConsumerRole();
consumerRole.setConsumerId(consumerId);
consumerRole.setRoleId(roleId);
consumerRole.setDataChangeCreatedBy(operator);
consumerRole.setDataChangeLastModifiedBy(operator);
return consumerRole;
}
}
| package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.repository.ConsumerAuditRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRoleRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerTokenRepository;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.hash.Hashing;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
@Service
public class ConsumerService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Joiner KEY_JOINER = Joiner.on("|");
private final UserInfoHolder userInfoHolder;
private final ConsumerTokenRepository consumerTokenRepository;
private final ConsumerRepository consumerRepository;
private final ConsumerAuditRepository consumerAuditRepository;
private final ConsumerRoleRepository consumerRoleRepository;
private final PortalConfig portalConfig;
private final RolePermissionService rolePermissionService;
private final UserService userService;
public ConsumerService(
final UserInfoHolder userInfoHolder,
final ConsumerTokenRepository consumerTokenRepository,
final ConsumerRepository consumerRepository,
final ConsumerAuditRepository consumerAuditRepository,
final ConsumerRoleRepository consumerRoleRepository,
final PortalConfig portalConfig,
final RolePermissionService rolePermissionService,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.consumerTokenRepository = consumerTokenRepository;
this.consumerRepository = consumerRepository;
this.consumerAuditRepository = consumerAuditRepository;
this.consumerRoleRepository = consumerRoleRepository;
this.portalConfig = portalConfig;
this.rolePermissionService = rolePermissionService;
this.userService = userService;
}
public Consumer createConsumer(Consumer consumer) {
String appId = consumer.getAppId();
Consumer managedConsumer = consumerRepository.findByAppId(appId);
if (managedConsumer != null) {
throw new BadRequestException("Consumer already exist");
}
String ownerName = consumer.getOwnerName();
UserInfo owner = userService.findByUserId(ownerName);
if (owner == null) {
throw new BadRequestException(String.format("User does not exist. UserId = %s", ownerName));
}
consumer.setOwnerEmail(owner.getEmail());
String operator = userInfoHolder.getUser().getUserId();
consumer.setDataChangeCreatedBy(operator);
consumer.setDataChangeLastModifiedBy(operator);
return consumerRepository.save(consumer);
}
public ConsumerToken generateAndSaveConsumerToken(Consumer consumer, Date expires) {
Preconditions.checkArgument(consumer != null, "Consumer can not be null");
ConsumerToken consumerToken = generateConsumerToken(consumer, expires);
consumerToken.setId(0);
return consumerTokenRepository.save(consumerToken);
}
public ConsumerToken getConsumerTokenByAppId(String appId) {
Consumer consumer = consumerRepository.findByAppId(appId);
if (consumer == null) {
return null;
}
return consumerTokenRepository.findByConsumerId(consumer.getId());
}
public Long getConsumerIdByToken(String token) {
if (Strings.isNullOrEmpty(token)) {
return null;
}
ConsumerToken consumerToken = consumerTokenRepository.findTopByTokenAndExpiresAfter(token,
new Date());
return consumerToken == null ? null : consumerToken.getConsumerId();
}
public Consumer getConsumerByConsumerId(long consumerId) {
return consumerRepository.findById(consumerId).orElse(null);
}
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) {
return assignNamespaceRoleToConsumer(token, appId, namespaceName, null);
}
@Transactional
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role namespaceModifyRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildModifyNamespaceRoleName(appId, namespaceName, env));
Role namespaceReleaseRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildReleaseNamespaceRoleName(appId, namespaceName, env));
if (namespaceModifyRole == null || namespaceReleaseRole == null) {
throw new BadRequestException("Namespace's role does not exist. Please check whether namespace has created.");
}
long namespaceModifyRoleId = namespaceModifyRole.getId();
long namespaceReleaseRoleId = namespaceReleaseRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceModifyRoleId);
ConsumerRole managedReleaseRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceReleaseRoleId);
if (managedModifyRole != null && managedReleaseRole != null) {
return Arrays.asList(managedModifyRole, managedReleaseRole);
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole namespaceModifyConsumerRole = createConsumerRole(consumerId, namespaceModifyRoleId, operator);
ConsumerRole namespaceReleaseConsumerRole = createConsumerRole(consumerId, namespaceReleaseRoleId, operator);
ConsumerRole createdModifyConsumerRole = consumerRoleRepository.save(namespaceModifyConsumerRole);
ConsumerRole createdReleaseConsumerRole = consumerRoleRepository.save(namespaceReleaseConsumerRole);
return Arrays.asList(createdModifyConsumerRole, createdReleaseConsumerRole);
}
@Transactional
public ConsumerRole assignAppRoleToConsumer(String token, String appId) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role masterRole = rolePermissionService.findRoleByRoleName(RoleUtils.buildAppMasterRoleName(appId));
if (masterRole == null) {
throw new BadRequestException("App's role does not exist. Please check whether app has created.");
}
long roleId = masterRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, roleId);
if (managedModifyRole != null) {
return managedModifyRole;
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole consumerRole = createConsumerRole(consumerId, roleId, operator);
return consumerRoleRepository.save(consumerRole);
}
@Transactional
public void createConsumerAudits(Iterable<ConsumerAudit> consumerAudits) {
consumerAuditRepository.saveAll(consumerAudits);
}
@Transactional
public ConsumerToken createConsumerToken(ConsumerToken entity) {
entity.setId(0); //for protection
return consumerTokenRepository.save(entity);
}
private ConsumerToken generateConsumerToken(Consumer consumer, Date expires) {
long consumerId = consumer.getId();
String createdBy = userInfoHolder.getUser().getUserId();
Date createdTime = new Date();
ConsumerToken consumerToken = new ConsumerToken();
consumerToken.setConsumerId(consumerId);
consumerToken.setExpires(expires);
consumerToken.setDataChangeCreatedBy(createdBy);
consumerToken.setDataChangeCreatedTime(createdTime);
consumerToken.setDataChangeLastModifiedBy(createdBy);
consumerToken.setDataChangeLastModifiedTime(createdTime);
generateAndEnrichToken(consumer, consumerToken);
return consumerToken;
}
void generateAndEnrichToken(Consumer consumer, ConsumerToken consumerToken) {
Preconditions.checkArgument(consumer != null);
if (consumerToken.getDataChangeCreatedTime() == null) {
consumerToken.setDataChangeCreatedTime(new Date());
}
consumerToken.setToken(generateToken(consumer.getAppId(), consumerToken
.getDataChangeCreatedTime(), portalConfig.consumerTokenSalt()));
}
String generateToken(String consumerAppId, Date generationTime, String
consumerTokenSalt) {
return Hashing.sha1().hashString(KEY_JOINER.join(consumerAppId, TIMESTAMP_FORMAT.format
(generationTime), consumerTokenSalt), Charsets.UTF_8).toString();
}
ConsumerRole createConsumerRole(Long consumerId, Long roleId, String operator) {
ConsumerRole consumerRole = new ConsumerRole();
consumerRole.setConsumerId(consumerId);
consumerRole.setRoleId(roleId);
consumerRole.setDataChangeCreatedBy(operator);
consumerRole.setDataChangeLastModifiedBy(operator);
return consumerRole;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsImportController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.service.ConfigsImportService;
import com.ctrip.framework.apollo.portal.util.ConfigFileUtils;
import java.io.IOException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
* Import the configs from file.
* First version: move code from {@link ConfigsExportController}
* @author wxq
*/
@RestController
public class ConfigsImportController {
private final ConfigsImportService configsImportService;
public ConfigsImportController(
final ConfigsImportService configsImportService
) {
this.configsImportService = configsImportService;
}
/**
* copy from old {@link ConfigsExportController}.
* @param file Yml file's name must ends with {@code .yml}.
* Properties file's name must ends with {@code .properties}.
* etc.
* @throws IOException
*/
@PreAuthorize(value = "@permissionValidator.hasModifyNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/items/import")
public void importConfigFile(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@RequestParam("file") MultipartFile file) throws IOException {
// check file
ConfigFileUtils.check(file);
final String format = ConfigFileUtils.getFormat(file.getOriginalFilename());
final String standardFilename = ConfigFileUtils.toFilename(appId, clusterName, namespaceName, ConfigFileFormat.fromString(format));
configsImportService.importOneConfigFromFile(env, standardFilename, file.getInputStream());
}
}
| package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.service.ConfigsImportService;
import com.ctrip.framework.apollo.portal.util.ConfigFileUtils;
import java.io.IOException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
* Import the configs from file.
* First version: move code from {@link ConfigsExportController}
* @author wxq
*/
@RestController
public class ConfigsImportController {
private final ConfigsImportService configsImportService;
public ConfigsImportController(
final ConfigsImportService configsImportService
) {
this.configsImportService = configsImportService;
}
/**
* copy from old {@link ConfigsExportController}.
* @param file Yml file's name must ends with {@code .yml}.
* Properties file's name must ends with {@code .properties}.
* etc.
* @throws IOException
*/
@PreAuthorize(value = "@permissionValidator.hasModifyNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/items/import")
public void importConfigFile(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@RequestParam("file") MultipartFile file) throws IOException {
// check file
ConfigFileUtils.check(file);
final String format = ConfigFileUtils.getFormat(file.getOriginalFilename());
final String standardFilename = ConfigFileUtils.toFilename(appId, clusterName, namespaceName, ConfigFileFormat.fromString(format));
configsImportService.importOneConfigFromFile(env, standardFilename, file.getInputStream());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/main/resources/application-kubernetes.properties | apollo.eureka.server.enabled=false
eureka.client.enabled=false
spring.cloud.discovery.enabled=false | apollo.eureka.server.enabled=false
eureka.client.enabled=false
spring.cloud.discovery.enabled=false | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-buildtools/src/main/resources/LICENSE-2.0.txt |
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. |
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/resources/static/img/secret.png | PNG
IHDR X IDATx^
\eyϹ$#4Q$u
ݳ$Bɘ={A\
II퐀ɞ
4ZHm) S"c ɞ!`͞s38{?Ϟ{%KI B`r:~H@@dǭ],khʱk:!f J :DA_K=D0퐃p}ƞ H@zFmI]6W~k?IDǂ :&]<Š,lQ}/
T='3@O^ YC { HGO8<g |(\BAbܾ H H m`ylΤ5 ߗ"\̢^ v Y|1'5emZ!?⻧MA 8*.D6l*LҥR@4^{27Rp $P3% *_x釬߯L \lRx
q觔jD anV2]%p RB&8"KНnWkVh!+]T1Ĩ/ċF! b-&\<ܽZ\.: Sy A߈xy ^7Eސ۩hN8KFjij:U}\sF>veRpܥݵNܨmL>ہ
#5*lԷV2D``Rt/2d-oyʟgȤj 3-6:ƽ?WwhAh3r%빟ȹ]r]8 s T7%[7qڦ/;k2m@f/p;܉M `Aszv_xq^s_ArNp. jy 3: Eo}Y=' YߺrBQh]#ڹ.hܰR4dπkɄ H=> FൿC1gBīS@gX?@;?ksW$ܻ0_^dҺM-+ t97T Z~7 X?Lw?xMK
@;zدv|tݺވN,+s۩=b-"s ݶڷtFZ50Fi'훛.Dž$
(^nR ]D=u9kd5SM@[e`y*( A{$IL%w!VQ:/ߐwҞ M vҀMm]}v=7dܫݛye0^_Wa.R<z5'kd*Ca_{ ns۩|
+!Z4j 4{5kw~"}~ CV繻'S)+ aM
Hw N\kPr/" *"< 4c)22> vnoPg Y/I IjOݦ<#]~*|H]:^R;,`SK ލT }a*;>v?وxdZ-Qdbt@"6)l{GkRfS,/t
|诮3: gt!\|{Ra;n ǫY|Y RR"Uw_oRRpܕ,T:
1ͻORat@N
_;TE qO,<^ ۩hF^+ڎ$&8ʠ%,ۗ[ڎ{ O55}T *8o2pa./Qoz@p*8oYl6yϮ0{ N+/; 5AThy R͍뷪jB j TkU;ͫXW} &|:aU`5]1^"o6 "t'(hn W&HeD';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v'HqF+
]k# VD 1_#^ ]c=C=ox|ڄ"t# $Yj$ 4KO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@yO3 60g2L_d6*d`<DVf3<udѬ]ִs>\eA$S qÆ]J ٽz H 8vxes͊ c穒qKMt$Q'IVd`.IͬkI@ޡ~#Z4jJ [
)j2cYkܻFe ˕!]*=-J'MIkPI$ /%} gV 'ϻjP ~iyH@"/3_~%w!V%M\ sXhجH~2Y Y WDjF:L*m; .J[De |KRN|w:<% :( 4D6+L[D9b kOwvܗ L_D%]Mڻg=ڨn qิUJ@Tդ=IݤʳFp>?+I*IQ :7쒻W&!>1Mv w;W.mF5Mz._|uq{Q)AY ڈr l]4uxJ@tP1)][;,
%w >WDi>6}Y) %M\ߏ/yqo'@GXYR?3Z>Y[p.N,&A]'`ܻRE:hȊ$+H]kJ ` Oy9r3-%t{/ YX0z$
;A80/ H[O꧙ hwhUШ}61[Ëa^ ^u] }o .a^O Upܥ̈́ 9x8%8ۺH9թzH'YtR̯0u2s~!Yі?pxZ&[email protected]ۄˋmb'Qv
y 6CfEk$ %""t 7P/ 9nEx I ѣVtZFi1]=^?1 5 T% wpis
IvIjf]KbeC}G`}nF} 7.I
ʒܠQ?ɒ# g+|$Ik[̷1sc}G>d`^2A{e!0NSIM lKܢ *:k_&)N"٨}-9`Zy e}pʑ˞Sq2})ϫΤ$mU >Ŋu)fp3ѣAvlRhJhK@҉_$&7Pq?KUzdF[be8cjo}"b h# Yі N$T˴ G%Tvvedd7VFKM{OY_t~GbTW(^ .[$h0>߮t:I?aoߗ -9y~ĩF
oԫ E "/O`]^ N@*̶7-W튷z'Dn NձvI % Zq+3}!y* kVf4zfH[AY`cAmg 'FїC-c{{Ib*G9-VJ̆Z36Z.sc - ǧS&jZyМkPPLPE27d䦕r$ *fnH@rJ9r愀L4RLE`E6d䢍red(C+y C H@ { 4QLpE|{('PH@HO@Ao @) J$ wPWJ@N` A ?`h+=K Ƞu\\2 ѓ IENDB` | PNG
IHDR X IDATx^
\eyϹ$#4Q$u
ݳ$Bɘ={A\
II퐀ɞ
4ZHm) S"c ɞ!`͞s38{?Ϟ{%KI B`r:~H@@dǭ],khʱk:!f J :DA_K=D0퐃p}ƞ H@zFmI]6W~k?IDǂ :&]<Š,lQ}/
T='3@O^ YC { HGO8<g |(\BAbܾ H H m`ylΤ5 ߗ"\̢^ v Y|1'5emZ!?⻧MA 8*.D6l*LҥR@4^{27Rp $P3% *_x釬߯L \lRx
q觔jD anV2]%p RB&8"KНnWkVh!+]T1Ĩ/ċF! b-&\<ܽZ\.: Sy A߈xy ^7Eސ۩hN8KFjij:U}\sF>veRpܥݵNܨmL>ہ
#5*lԷV2D``Rt/2d-oyʟgȤj 3-6:ƽ?WwhAh3r%빟ȹ]r]8 s T7%[7qڦ/;k2m@f/p;܉M `Aszv_xq^s_ArNp. jy 3: Eo}Y=' YߺrBQh]#ڹ.hܰR4dπkɄ H=> FൿC1gBīS@gX?@;?ksW$ܻ0_^dҺM-+ t97T Z~7 X?Lw?xMK
@;zدv|tݺވN,+s۩=b-"s ݶڷtFZ50Fi'훛.Dž$
(^nR ]D=u9kd5SM@[e`y*( A{$IL%w!VQ:/ߐwҞ M vҀMm]}v=7dܫݛye0^_Wa.R<z5'kd*Ca_{ ns۩|
+!Z4j 4{5kw~"}~ CV繻'S)+ aM
Hw N\kPr/" *"< 4c)22> vnoPg Y/I IjOݦ<#]~*|H]:^R;,`SK ލT }a*;>v?وxdZ-Qdbt@"6)l{GkRfS,/t
|诮3: gt!\|{Ra;n ǫY|Y RR"Uw_oRRpܕ,T:
1ͻORat@N
_;TE qO,<^ ۩hF^+ڎ$&8ʠ%,ۗ[ڎ{ O55}T *8o2pa./Qoz@p*8oYl6yϮ0{ N+/; 5AThy R͍뷪jB j TkU;ͫXW} &|:aU`5]1^"o6 "t'(hn W&HeD';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v2As ҝLm ?Z I&HwF2Ab0RU&HheDc';' HV Ldtg$$#e[eV&H4v'HqF+
]k# VD 1_#^ ]c=C=ox|ڄ"t# $Yj$ 4KO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@8D@bPT$ A$ 5KJO@yO3 60g2L_d6*d`<DVf3<udѬ]ִs>\eA$S qÆ]J ٽz H 8vxes͊ c穒qKMt$Q'IVd`.IͬkI@ޡ~#Z4jJ [
)j2cYkܻFe ˕!]*=-J'MIkPI$ /%} gV 'ϻjP ~iyH@"/3_~%w!V%M\ sXhجH~2Y Y WDjF:L*m; .J[De |KRN|w:<% :( 4D6+L[D9b kOwvܗ L_D%]Mڻg=ڨn qิUJ@Tդ=IݤʳFp>?+I*IQ :7쒻W&!>1Mv w;W.mF5Mz._|uq{Q)AY ڈr l]4uxJ@tP1)][;,
%w >WDi>6}Y) %M\ߏ/yqo'@GXYR?3Z>Y[p.N,&A]'`ܻRE:hȊ$+H]kJ ` Oy9r3-%t{/ YX0z$
;A80/ H[O꧙ hwhUШ}61[Ëa^ ^u] }o .a^O Upܥ̈́ 9x8%8ۺH9թzH'YtR̯0u2s~!Yі?pxZ&[email protected]ۄˋmb'Qv
y 6CfEk$ %""t 7P/ 9nEx I ѣVtZFi1]=^?1 5 T% wpis
IvIjf]KbeC}G`}nF} 7.I
ʒܠQ?ɒ# g+|$Ik[̷1sc}G>d`^2A{e!0NSIM lKܢ *:k_&)N"٨}-9`Zy e}pʑ˞Sq2})ϫΤ$mU >Ŋu)fp3ѣAvlRhJhK@҉_$&7Pq?KUzdF[be8cjo}"b h# Yі N$T˴ G%Tvvedd7VFKM{OY_t~GbTW(^ .[$h0>߮t:I?aoߗ -9y~ĩF
oԫ E "/O`]^ N@*̶7-W튷z'Dn NձvI % Zq+3}!y* kVf4zfH[AY`cAmg 'FїC-c{{Ib*G9-VJ̆Z36Z.sc - ǧS&jZyМkPPLPE27d䦕r$ *fnH@rJ9r愀L4RLE`E6d䢍red(C+y C H@ { 4QLpE|{('PH@HO@Ao @) J$ wPWJ@N` A ?`h+=K Ƞu\\2 ѓ IENDB` | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/XmlConfigFileTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.util.concurrent.SettableFuture;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class XmlConfigFileTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
System.clearProperty(PropertiesFactory.APOLLO_PROPERTY_ORDER_ENABLE);
}
@Test
public void testWhenHasContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(ConfigFileFormat.XML, configFile.getConfigFileFormat());
assertEquals(someNamespace, configFile.getNamespace());
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
}
@Test
public void testWhenHasNoContent() throws Exception {
when(configRepository.getConfig()).thenReturn(null);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
}
@Test
public void testWhenConfigRepositoryHasError() throws Exception {
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
String anotherValue = "anotherValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, anotherValue);
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(someValue, changeEvent.getOldValue());
assertEquals(anotherValue, changeEvent.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, changeEvent.getChangeType());
}
@Test
public void testOnRepositoryChangeWithContentAdded() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(null, configFile.getContent());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, someValue);
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someValue, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(null, changeEvent.getOldValue());
assertEquals(someValue, changeEvent.getNewValue());
assertEquals(PropertyChangeType.ADDED, changeEvent.getChangeType());
}
@Test
public void testOnRepositoryChangeWithContentDeleted() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
Properties anotherProperties = new Properties();
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(null, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(someValue, changeEvent.getOldValue());
assertEquals(null, changeEvent.getNewValue());
assertEquals(PropertyChangeType.DELETED, changeEvent.getChangeType());
}
@Test
public void testWhenConfigRepositoryHasErrorAndThenRecovered() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
configFile.onRepositoryChange(someNamespace, someProperties);
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
}
}
| package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.util.concurrent.SettableFuture;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class XmlConfigFileTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
System.clearProperty(PropertiesFactory.APOLLO_PROPERTY_ORDER_ENABLE);
}
@Test
public void testWhenHasContent() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(ConfigFileFormat.XML, configFile.getConfigFileFormat());
assertEquals(someNamespace, configFile.getNamespace());
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
}
@Test
public void testWhenHasNoContent() throws Exception {
when(configRepository.getConfig()).thenReturn(null);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
}
@Test
public void testWhenConfigRepositoryHasError() throws Exception {
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
String anotherValue = "anotherValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, anotherValue);
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(someValue, changeEvent.getOldValue());
assertEquals(anotherValue, changeEvent.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, changeEvent.getChangeType());
}
@Test
public void testOnRepositoryChangeWithContentAdded() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(null, configFile.getContent());
Properties anotherProperties = new Properties();
anotherProperties.setProperty(key, someValue);
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someValue, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(null, changeEvent.getOldValue());
assertEquals(someValue, changeEvent.getNewValue());
assertEquals(PropertyChangeType.ADDED, changeEvent.getChangeType());
}
@Test
public void testOnRepositoryChangeWithContentDeleted() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertEquals(someValue, configFile.getContent());
Properties anotherProperties = new Properties();
final SettableFuture<ConfigFileChangeEvent> configFileChangeFuture = SettableFuture.create();
ConfigFileChangeListener someListener = new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
configFileChangeFuture.set(changeEvent);
}
};
configFile.addChangeListener(someListener);
configFile.onRepositoryChange(someNamespace, anotherProperties);
ConfigFileChangeEvent changeEvent = configFileChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(null, configFile.getContent());
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(someValue, changeEvent.getOldValue());
assertEquals(null, changeEvent.getNewValue());
assertEquals(PropertyChangeType.DELETED, changeEvent.getChangeType());
}
@Test
public void testWhenConfigRepositoryHasErrorAndThenRecovered() throws Exception {
Properties someProperties = new Properties();
String key = ConfigConsts.CONFIG_FILE_CONTENT_KEY;
String someValue = "someValue";
someProperties.setProperty(key, someValue);
when(configRepository.getConfig()).thenThrow(new RuntimeException("someError"));
XmlConfigFile configFile = new XmlConfigFile(someNamespace, configRepository);
assertFalse(configFile.hasContent());
assertNull(configFile.getContent());
configFile.onRepositoryChange(someNamespace, someProperties);
assertTrue(configFile.hasContent());
assertEquals(someValue, configFile.getContent());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest2.xml | <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.foundation.Foundation;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpUtil;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.gson.reflect.TypeToken;
public class ConfigServiceLocator {
private static final Logger logger = LoggerFactory.getLogger(ConfigServiceLocator.class);
private HttpUtil m_httpUtil;
private ConfigUtil m_configUtil;
private AtomicReference<List<ServiceDTO>> m_configServices;
private Type m_responseType;
private ScheduledExecutorService m_executorService;
private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
/**
* Create a config service locator.
*/
public ConfigServiceLocator() {
List<ServiceDTO> initial = Lists.newArrayList();
m_configServices = new AtomicReference<>(initial);
m_responseType = new TypeToken<List<ServiceDTO>>() {
}.getType();
m_httpUtil = ApolloInjector.getInstance(HttpUtil.class);
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
this.m_executorService = Executors.newScheduledThreadPool(1,
ApolloThreadFactory.create("ConfigServiceLocator", true));
initConfigServices();
}
private void initConfigServices() {
// get from run time configurations
List<ServiceDTO> customizedConfigServices = getCustomizedConfigService();
if (customizedConfigServices != null) {
setConfigServices(customizedConfigServices);
return;
}
// update from meta service
this.tryUpdateConfigServices();
this.schedulePeriodicRefresh();
}
private List<ServiceDTO> getCustomizedConfigService() {
// 1. Get from System Property
String configServices = System.getProperty("apollo.configService");
if (Strings.isNullOrEmpty(configServices)) {
// 2. Get from OS environment variable
configServices = System.getenv("APOLLO_CONFIGSERVICE");
}
if (Strings.isNullOrEmpty(configServices)) {
// 3. Get from server.properties
configServices = Foundation.server().getProperty("apollo.configService", null);
}
if (Strings.isNullOrEmpty(configServices)) {
return null;
}
logger.warn("Located config services from apollo.configService configuration: {}, will not refresh config services from remote meta service!", configServices);
// mock service dto list
String[] configServiceUrls = configServices.split(",");
List<ServiceDTO> serviceDTOS = Lists.newArrayList();
for (String configServiceUrl : configServiceUrls) {
configServiceUrl = configServiceUrl.trim();
ServiceDTO serviceDTO = new ServiceDTO();
serviceDTO.setHomepageUrl(configServiceUrl);
serviceDTO.setAppName(ServiceNameConsts.APOLLO_CONFIGSERVICE);
serviceDTO.setInstanceId(configServiceUrl);
serviceDTOS.add(serviceDTO);
}
return serviceDTOS;
}
/**
* Get the config service info from remote meta server.
*
* @return the services dto
*/
public List<ServiceDTO> getConfigServices() {
if (m_configServices.get().isEmpty()) {
updateConfigServices();
}
return m_configServices.get();
}
private boolean tryUpdateConfigServices() {
try {
updateConfigServices();
return true;
} catch (Throwable ex) {
//ignore
}
return false;
}
private void schedulePeriodicRefresh() {
this.m_executorService.scheduleAtFixedRate(
new Runnable() {
@Override
public void run() {
logger.debug("refresh config services");
Tracer.logEvent("Apollo.MetaService", "periodicRefresh");
tryUpdateConfigServices();
}
}, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
m_configUtil.getRefreshIntervalTimeUnit());
}
private synchronized void updateConfigServices() {
String url = assembleMetaServiceUrl();
HttpRequest request = new HttpRequest(url);
int maxRetries = 2;
Throwable exception = null;
for (int i = 0; i < maxRetries; i++) {
Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "getConfigService");
transaction.addData("Url", url);
try {
HttpResponse<List<ServiceDTO>> response = m_httpUtil.doGet(request, m_responseType);
transaction.setStatus(Transaction.SUCCESS);
List<ServiceDTO> services = response.getBody();
if (services == null || services.isEmpty()) {
logConfigService("Empty response!");
continue;
}
setConfigServices(services);
return;
} catch (Throwable ex) {
Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
transaction.setStatus(ex);
exception = ex;
} finally {
transaction.complete();
}
try {
m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());
} catch (InterruptedException ex) {
//ignore
}
}
throw new ApolloConfigException(
String.format("Get config services failed from %s", url), exception);
}
private void setConfigServices(List<ServiceDTO> services) {
m_configServices.set(services);
logConfigServices(services);
}
private String assembleMetaServiceUrl() {
String domainName = m_configUtil.getMetaServerDomainName();
String appId = m_configUtil.getAppId();
String localIp = m_configUtil.getLocalIp();
Map<String, String> queryParams = Maps.newHashMap();
queryParams.put("appId", queryParamEscaper.escape(appId));
if (!Strings.isNullOrEmpty(localIp)) {
queryParams.put("ip", queryParamEscaper.escape(localIp));
}
return domainName + "/services/config?" + MAP_JOINER.join(queryParams);
}
private void logConfigServices(List<ServiceDTO> serviceDtos) {
for (ServiceDTO serviceDto : serviceDtos) {
logConfigService(serviceDto.getHomepageUrl());
}
}
private void logConfigService(String serviceUrl) {
Tracer.logEvent("Apollo.Config.Services", serviceUrl);
}
}
| package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.foundation.Foundation;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpUtil;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.gson.reflect.TypeToken;
public class ConfigServiceLocator {
private static final Logger logger = LoggerFactory.getLogger(ConfigServiceLocator.class);
private HttpUtil m_httpUtil;
private ConfigUtil m_configUtil;
private AtomicReference<List<ServiceDTO>> m_configServices;
private Type m_responseType;
private ScheduledExecutorService m_executorService;
private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
/**
* Create a config service locator.
*/
public ConfigServiceLocator() {
List<ServiceDTO> initial = Lists.newArrayList();
m_configServices = new AtomicReference<>(initial);
m_responseType = new TypeToken<List<ServiceDTO>>() {
}.getType();
m_httpUtil = ApolloInjector.getInstance(HttpUtil.class);
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
this.m_executorService = Executors.newScheduledThreadPool(1,
ApolloThreadFactory.create("ConfigServiceLocator", true));
initConfigServices();
}
private void initConfigServices() {
// get from run time configurations
List<ServiceDTO> customizedConfigServices = getCustomizedConfigService();
if (customizedConfigServices != null) {
setConfigServices(customizedConfigServices);
return;
}
// update from meta service
this.tryUpdateConfigServices();
this.schedulePeriodicRefresh();
}
private List<ServiceDTO> getCustomizedConfigService() {
// 1. Get from System Property
String configServices = System.getProperty("apollo.configService");
if (Strings.isNullOrEmpty(configServices)) {
// 2. Get from OS environment variable
configServices = System.getenv("APOLLO_CONFIGSERVICE");
}
if (Strings.isNullOrEmpty(configServices)) {
// 3. Get from server.properties
configServices = Foundation.server().getProperty("apollo.configService", null);
}
if (Strings.isNullOrEmpty(configServices)) {
return null;
}
logger.warn("Located config services from apollo.configService configuration: {}, will not refresh config services from remote meta service!", configServices);
// mock service dto list
String[] configServiceUrls = configServices.split(",");
List<ServiceDTO> serviceDTOS = Lists.newArrayList();
for (String configServiceUrl : configServiceUrls) {
configServiceUrl = configServiceUrl.trim();
ServiceDTO serviceDTO = new ServiceDTO();
serviceDTO.setHomepageUrl(configServiceUrl);
serviceDTO.setAppName(ServiceNameConsts.APOLLO_CONFIGSERVICE);
serviceDTO.setInstanceId(configServiceUrl);
serviceDTOS.add(serviceDTO);
}
return serviceDTOS;
}
/**
* Get the config service info from remote meta server.
*
* @return the services dto
*/
public List<ServiceDTO> getConfigServices() {
if (m_configServices.get().isEmpty()) {
updateConfigServices();
}
return m_configServices.get();
}
private boolean tryUpdateConfigServices() {
try {
updateConfigServices();
return true;
} catch (Throwable ex) {
//ignore
}
return false;
}
private void schedulePeriodicRefresh() {
this.m_executorService.scheduleAtFixedRate(
new Runnable() {
@Override
public void run() {
logger.debug("refresh config services");
Tracer.logEvent("Apollo.MetaService", "periodicRefresh");
tryUpdateConfigServices();
}
}, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
m_configUtil.getRefreshIntervalTimeUnit());
}
private synchronized void updateConfigServices() {
String url = assembleMetaServiceUrl();
HttpRequest request = new HttpRequest(url);
int maxRetries = 2;
Throwable exception = null;
for (int i = 0; i < maxRetries; i++) {
Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "getConfigService");
transaction.addData("Url", url);
try {
HttpResponse<List<ServiceDTO>> response = m_httpUtil.doGet(request, m_responseType);
transaction.setStatus(Transaction.SUCCESS);
List<ServiceDTO> services = response.getBody();
if (services == null || services.isEmpty()) {
logConfigService("Empty response!");
continue;
}
setConfigServices(services);
return;
} catch (Throwable ex) {
Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
transaction.setStatus(ex);
exception = ex;
} finally {
transaction.complete();
}
try {
m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());
} catch (InterruptedException ex) {
//ignore
}
}
throw new ApolloConfigException(
String.format("Get config services failed from %s", url), exception);
}
private void setConfigServices(List<ServiceDTO> services) {
m_configServices.set(services);
logConfigServices(services);
}
private String assembleMetaServiceUrl() {
String domainName = m_configUtil.getMetaServerDomainName();
String appId = m_configUtil.getAppId();
String localIp = m_configUtil.getLocalIp();
Map<String, String> queryParams = Maps.newHashMap();
queryParams.put("appId", queryParamEscaper.escape(appId));
if (!Strings.isNullOrEmpty(localIp)) {
queryParams.put("ip", queryParamEscaper.escape(localIp));
}
return domainName + "/services/config?" + MAP_JOINER.join(queryParams);
}
private void logConfigServices(List<ServiceDTO> serviceDtos) {
for (ServiceDTO serviceDto : serviceDtos) {
logConfigService(serviceDto.getHomepageUrl());
}
}
private void logConfigService(String serviceUrl) {
Tracer.logEvent("Apollo.Config.Services", serviceUrl);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/config/apollo-portal.conf | MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003173/
# console appender log file name
LOG_FILENAME=console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE | MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003173/
# console appender log file name
LOG_FILENAME=console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-adminservice/src/test/resources/data.sql | INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','[email protected]');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'cluster1');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'cluster2');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'cluster3');
INSERT INTO Cluster (AppId, Name) VALUES ('fxhermesproducer', 'default');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'fx.apollo.config');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'fx.apollo.admin');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'fx.apollo.portal');
INSERT INTO AppNamespace (AppID, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (1, '100003171', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'cluster1', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxhermesproducer', 'default', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1);
INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}');
| INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','[email protected]');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','[email protected]');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'cluster1');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'cluster2');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'cluster3');
INSERT INTO Cluster (AppId, Name) VALUES ('fxhermesproducer', 'default');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'fx.apollo.config');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'fx.apollo.admin');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'fx.apollo.portal');
INSERT INTO AppNamespace (AppID, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (1, '100003171', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'cluster1', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxhermesproducer', 'default', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1);
INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}');
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerExceptionTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class ControllerExceptionTest {
private AppController appController;
@Mock
private AppService appService;
@Mock
private AdminService adminService;
@Before
public void setUp() {
appController = new AppController(appService, adminService);
}
@Test(expected = NotFoundException.class)
public void testFindNotExists() {
when(appService.findOne(any(String.class))).thenReturn(null);
appController.get("unexist");
}
@Test(expected = NotFoundException.class)
public void testDeleteNotExists() {
when(appService.findOne(any(String.class))).thenReturn(null);
appController.delete("unexist", null);
}
@Test
public void testFindEmpty() {
when(appService.findAll(any(Pageable.class))).thenReturn(new ArrayList<>());
Pageable pageable = PageRequest.of(0, 10);
List<AppDTO> appDTOs = appController.find(null, pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
appDTOs = appController.find("", pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
}
@Test
public void testFindByName() {
Pageable pageable = PageRequest.of(0, 10);
List<AppDTO> appDTOs = appController.find("unexist", pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
}
@Test(expected = ServiceException.class)
public void createFailed() {
AppDTO dto = generateSampleDTOData();
when(appService.findOne(any(String.class))).thenReturn(null);
when(adminService.createNewApp(any(App.class)))
.thenThrow(new ServiceException("create app failed"));
appController.create(dto);
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("[email protected]");
dto.setDataChangeLastModifiedBy("test");
dto.setDataChangeCreatedBy("test");
return dto;
}
}
| package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class ControllerExceptionTest {
private AppController appController;
@Mock
private AppService appService;
@Mock
private AdminService adminService;
@Before
public void setUp() {
appController = new AppController(appService, adminService);
}
@Test(expected = NotFoundException.class)
public void testFindNotExists() {
when(appService.findOne(any(String.class))).thenReturn(null);
appController.get("unexist");
}
@Test(expected = NotFoundException.class)
public void testDeleteNotExists() {
when(appService.findOne(any(String.class))).thenReturn(null);
appController.delete("unexist", null);
}
@Test
public void testFindEmpty() {
when(appService.findAll(any(Pageable.class))).thenReturn(new ArrayList<>());
Pageable pageable = PageRequest.of(0, 10);
List<AppDTO> appDTOs = appController.find(null, pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
appDTOs = appController.find("", pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
}
@Test
public void testFindByName() {
Pageable pageable = PageRequest.of(0, 10);
List<AppDTO> appDTOs = appController.find("unexist", pageable);
Assert.assertNotNull(appDTOs);
Assert.assertEquals(0, appDTOs.size());
}
@Test(expected = ServiceException.class)
public void createFailed() {
AppDTO dto = generateSampleDTOData();
when(appService.findOne(any(String.class))).thenReturn(null);
when(adminService.createNewApp(any(App.class)))
.thenThrow(new ServiceException("create app failed"));
appController.create(dto);
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("[email protected]");
dto.setDataChangeLastModifiedBy("test");
dto.setDataChangeCreatedBy("test");
return dto;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/resources/META-INF/spring.handlers | http\://www.ctrip.com/schema/apollo=com.ctrip.framework.apollo.spring.config.NamespaceHandler | http\://www.ctrip.com/schema/apollo=com.ctrip.framework.apollo.spring.config.NamespaceHandler | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./CONTRIBUTING.md | ## Contributing to apollo
Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
### Sign the Contributor License Agreement
Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
### Code Conventions
Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files.
* Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.
* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
* A few unit tests should be added for a new feature or an important bug fix.
* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project).
* Normally, we would squash commits for one feature into one commit. There are 2 ways to do this:
1. To rebase and squash based on the remote branch
* `git rebase -i <remote>/master`
* merge commits via `fixup`, etc
2. Create a new branch and merge these commits into one
* `git checkout -b <some-branch-name> <remote>/master`
* `git merge --squash <current-feature-branch>`
* When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
| ## Contributing to apollo
Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
### Sign the Contributor License Agreement
Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
### Code Conventions
Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files.
* Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.
* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
* A few unit tests should be added for a new feature or an important bug fix.
* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project).
* Normally, we would squash commits for one feature into one commit. There are 2 ways to do this:
1. To rebase and squash based on the remote branch
* `git rebase -i <remote>/master`
* merge commits via `fixup`, etc
2. Create a new branch and merge these commits into one
* `git checkout -b <some-branch-name> <remote>/master`
* `git merge --squash <current-feature-branch>`
* When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/resources/static/i18n/zh-CN.json | {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.SystemRoleManage": "系统权限管理",
"Common.Nav.OpenMange": "开放平台授权管理",
"Common.Nav.SystemConfig": "系统参数",
"Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace",
"Common.Nav.SystemInfo": "系统信息",
"Common.Nav.ConfigExport": "配置导出",
"Common.Nav.Logout": "退出",
"Common.Department": "部门",
"Common.Cluster": "集群",
"Common.Environment": "环境",
"Common.Email": "邮箱",
"Common.AppId": "AppId",
"Common.Namespace": "Namespace",
"Common.AppName": "应用名称",
"Common.AppOwner": "负责人",
"Common.AppOwnerLong": "应用负责人",
"Common.AppAdmin": "项目管理员",
"Common.ClusterName": "集群名称",
"Common.Submit": "提交",
"Common.Save": "保存",
"Common.Created": "创建成功",
"Common.CreateFailed": "创建失败",
"Common.Deleted": "删除成功",
"Common.DeleteFailed": "删除失败",
"Common.ReturnToIndex": "返回到项目首页",
"Common.Cancel": "取消",
"Common.Ok": "确定",
"Common.Search": "查询",
"Common.IsRootUser": "当前页面只对Apollo管理员开放",
"Common.PleaseChooseDepartment": "请选择部门",
"Common.PleaseChooseOwner": "请选择应用负责人",
"Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试",
"Component.DeleteNamespace.Title": "删除Namespace",
"Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?",
"Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?",
"Component.GrayscalePublishRule.Title": "编辑灰度规则",
"Component.GrayscalePublishRule.AppId": "灰度的AppId",
"Component.GrayscalePublishRule.AcceptRule": "灰度应用规则",
"Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例",
"Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例",
"Component.GrayscalePublishRule.IP": "灰度的IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)",
"Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以",
"Component.GrayscalePublishRule.EnterIp": "手动输入IP",
"Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮",
"Component.GrayscalePublishRule.Add": "添加",
"Component.ConfigItem.Title": "添加配置项",
"Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)",
"Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项",
"Component.ConfigItem.ModifyItem": "修改配置项",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击",
"Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符",
"Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "选择集群",
"Component.MergePublish.Title": "全量发布",
"Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。",
"Component.MergePublish.NextStep": "全量发布后,您希望",
"Component.MergePublish.DeleteGrayscale": "删除灰度版本",
"Component.MergePublish.ReservedGrayscale": "保留灰度版本",
"Component.Namespace.Branch.IsChanged": "有修改",
"Component.Namespace.Branch.ChangeUser": "当前修改者",
"Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布",
"Component.Namespace.Branch.GrayscalePublish": "灰度发布",
"Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置",
"Component.Namespace.Branch.AllPublish": "全量发布",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本",
"Component.Namespace.Branch.DiscardGrayscale": "放弃灰度",
"Component.Namespace.Branch.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Branch.Tab.Configuration": "配置",
"Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表",
"Component.Namespace.Branch.Tab.ChangeHistory": "更改历史",
"Component.Namespace.Branch.Body.Item": "灰度的配置",
"Component.Namespace.Branch.Body.AddedItem": "新增灰度配置",
"Component.Namespace.Branch.Body.PublishState": "发布状态",
"Component.Namespace.Branch.Body.ItemSort": "排序",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值",
"Component.Namespace.Branch.Body.ItemComment": "备注",
"Component.Namespace.Branch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Branch.Body.ItemOperator": "操作",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.Branch.Body.ItemNoPublish": "未发布",
"Component.Namespace.Branch.Body.ItemPublished": "已发布",
"Component.Namespace.Branch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.Branch.Body.ClickToSee": "点击查看",
"Component.Namespace.Branch.Body.DeletedItem": "删除的配置",
"Component.Namespace.Branch.Body.Delete": "删",
"Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置",
"Component.Namespace.Branch.Body.ModifiedItem": "修改的配置",
"Component.Namespace.Branch.Body.Modify": "改",
"Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置",
"Component.Namespace.Branch.Body.Added": "新",
"Component.Namespace.Branch.Body.Op.Modify": "修改",
"Component.Namespace.Branch.Body.Op.Delete": "删除",
"Component.Namespace.MasterBranch.Body.Title": "主版本的配置",
"Component.Namespace.MasterBranch.Body.PublishState": "发布状态",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "备注",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.MasterBranch.Body.ItemOperator": "操作",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布",
"Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.MasterBranch.Body.ItemPublished": "已发布",
"Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置",
"Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找项目管理员申请权限.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表",
"Component.Namespace.Branch.GrayScaleRule.Operator": "操作",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "修改",
"Component.Namespace.Branch.GrayScaleRule.Delete": "删除",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则",
"Component.Namespace.Branch.Instance.RefreshList": "刷新列表",
"Component.Namespace.Branch.Instance.ItemToSee": "查看配置",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间",
"Component.Namespace.Branch.Instance.LoadMore": "刷新列表",
"Component.Namespace.Branch.Instance.NoInstance": "无实例信息",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "新增",
"Component.Namespace.Branch.History.Modified": "更新",
"Component.Namespace.Branch.History.Deleted": "删除",
"Component.Namespace.Branch.History.LoadMore": "加载更多",
"Component.Namespace.Branch.History.NoHistory": "无更改历史",
"Component.Namespace.Header.Title.Private": "私有",
"Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.Public": "公共",
"Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到",
"Component.Namespace.Header.Title.Extend": "关联",
"Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]",
"Component.Namespace.Header.Title.Master": "主版本",
"Component.Namespace.Header.Title.Grayscale": "灰度版本",
"Component.Namespace.Master.LoadNamespace": "加载Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "加载Namespace",
"Component.Namespace.Master.Items.Changed": "有修改",
"Component.Namespace.Master.Items.ChangedUser": "当前修改者",
"Component.Namespace.Master.Items.Publish": "发布",
"Component.Namespace.Master.Items.PublishTips": "发布配置",
"Component.Namespace.Master.Items.Rollback": "回滚",
"Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置",
"Component.Namespace.Master.Items.PublishHistory": "发布历史",
"Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史",
"Component.Namespace.Master.Items.Grant": "授权",
"Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限",
"Component.Namespace.Master.Items.Grayscale": "灰度",
"Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本",
"Component.Namespace.Master.Items.RequestPermission": "申请配置权限",
"Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请",
"Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Master.Items.ItemList": "表格",
"Component.Namespace.Master.Items.ItemListByText": "文本",
"Component.Namespace.Master.Items.ItemHistory": "更改历史",
"Component.Namespace.Master.Items.ItemInstance": "实例列表",
"Component.Namespace.Master.Items.CopyText": "复制文本",
"Component.Namespace.Master.Items.GrammarCheck": "语法检查",
"Component.Namespace.Master.Items.CancelChanged": "取消修改",
"Component.Namespace.Master.Items.Change": "修改配置",
"Component.Namespace.Master.Items.SummitChanged": "提交修改",
"Component.Namespace.Master.Items.SortByKey": "按Key过滤配置",
"Component.Namespace.Master.Items.FilterItem": "过滤配置",
"Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置",
"Component.Namespace.Master.Items.SyncItem": "同步配置",
"Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改",
"Component.Namespace.Master.Items.RevokeItem": "撤销配置",
"Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置",
"Component.Namespace.Master.Items.DiffItem": "比较配置",
"Component.Namespace.Master.Items.AddItem": "新增配置",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。",
"Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤",
"Component.Namespace.Master.Items.Body.PublishState": "发布状态",
"Component.Namespace.Master.Items.Body.Sort": "排序",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "备注",
"Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Master.Items.Body.ItemOperator": "操作",
"Component.Namespace.Master.Items.Body.NoPublish": "未发布",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值",
"Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值",
"Component.Namespace.Master.Items.Body.Published": "已发布",
"Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置",
"Component.Namespace.Master.Items.Body.ClickToSee": "点击查看",
"Component.Namespace.Master.Items.Body.Grayscale": "灰",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值",
"Component.Namespace.Master.Items.Body.NewAdded": "新",
"Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置",
"Component.Namespace.Master.Items.Body.Modified": "改",
"Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置",
"Component.Namespace.Master.Items.Body.Deleted": "删",
"Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置",
"Component.Namespace.Master.Items.Body.ModifyTips": "修改",
"Component.Namespace.Master.Items.Body.DeleteTips": "删除",
"Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置",
"Component.Namespace.Master.Items.Body.Public.Title": "公共的配置",
"Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史",
"Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息",
"Component.PublishDeny.Title": "发布受限",
"Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~",
"Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）",
"Component.PublishDeny.EmergencyPublish": "紧急发布",
"Component.PublishDeny.Close": "关闭",
"Component.Publish.Title": "发布",
"Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})",
"Component.Publish.Grayscale": "灰度发布",
"Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)",
"Component.Publish.AllPublish": "全量发布",
"Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)",
"Component.Publish.ToSeeChange": "查看变更",
"Component.Publish.PublishedValue": "发布的值",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "未发布的值",
"Component.Publish.ModifyUser": "修改人",
"Component.Publish.ModifyTime": "修改时间",
"Component.Publish.NewAdded": "新",
"Component.Publish.NewAddedTips": "新增的配置",
"Component.Publish.Modified": "改",
"Component.Publish.ModifiedTips": "修改的配置",
"Component.Publish.Deleted": "删",
"Component.Publish.DeletedTips": "删除的配置",
"Component.Publish.MasterValue": "主版本值",
"Component.Publish.GrayValue": "灰度版本的值",
"Component.Publish.GrayPublishedValue": "灰度版本发布的值",
"Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值",
"Component.Publish.ItemNoChange": "配置没有变化",
"Component.Publish.GrayItemNoChange": "灰度配置没有变化",
"Component.Publish.NoGrayItems": "没有灰度的配置项",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "发布",
"Component.Rollback.To": "回滚到",
"Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本",
"Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置",
"Component.Rollback.ClickToView": "点击查看",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "回滚前",
"Component.Rollback.RollbackAfterValue": "回滚后",
"Component.Rollback.Added": "新增",
"Component.Rollback.Modified": "更新",
"Component.Rollback.Deleted": "删除",
"Component.Rollback.NoChange": "配置没有变化",
"Component.Rollback.OpRollback": "回滚",
"Component.ShowText.Title": "查看",
"Login.Login": "登录",
"Login.UserNameOrPasswordIncorrect": "用户名或密码错误",
"Login.LogoutSuccessfully": "登出成功",
"Index.MyProject": "我的项目",
"Index.CreateProject": "创建项目",
"Index.LoadMore": "加载更多",
"Index.FavoriteItems": "收藏的项目",
"Index.Topping": "置顶",
"Index.FavoriteTip": "您还没有收藏过任何项目，在项目主页可以收藏项目哟~",
"Index.RecentlyViewedItems": "最近浏览的项目",
"Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败",
"Index.Topped": "置顶成功",
"Index.CancelledFavorite": "取消收藏成功",
"Cluster.CreateCluster": "新建集群",
"Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置",
"Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群",
"Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)",
"Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致",
"Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)",
"Cluster.ChooseEnvironment": "选择环境",
"Cluster.LoadingEnvironmentError": "加载环境信息出错",
"Cluster.ClusterCreated": "集群创建成功",
"Cluster.ClusterCreateFailed": "集群创建失败",
"Cluster.PleaseChooseEnvironment": "请选择环境",
"Config.Title": "Apollo配置中心",
"Config.AppIdNotFound": "不存在，",
"Config.ClickByCreate": "点击创建",
"Config.EnvList": "环境列表",
"Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置",
"Config.ProjectInfo": "项目信息",
"Config.ModifyBasicProjectInfo": "修改项目基本信息",
"Config.Favorite": "收藏",
"Config.CancelFavorite": "取消收藏",
"Config.MissEnv": "缺失的环境",
"Config.MissNamespace": "缺失的Namespace",
"Config.ProjectManage": "管理项目",
"Config.AccessKeyManage": "管理密钥",
"Config.CreateAppMissEnv": "补缺环境",
"Config.CreateAppMissNamespace": "补缺Namespace",
"Config.AddCluster": "添加集群",
"Config.AddNamespace": "添加Namespace",
"Config.CurrentlyOperatorEnv": "当前操作环境",
"Config.DoNotRemindAgain": "不再提示",
"Config.Note": "注意",
"Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！",
"Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。",
"Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。",
"Config.RevokeItem.DialogTitle": "撤销配置",
"Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?",
"Config.DeleteItem.DialogTitle": "删除配置",
"Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?",
"Config.PublishNoPermission.DialogTitle": "发布",
"Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找项目管理员 '{{masterUsers}}' 分配发布权限",
"Config.ModifyNoPermission.DialogTitle": "申请配置权限",
"Config.ModifyNoPermission.DialogContent": "请找项目管理员 '{{masterUsers}}' 分配编辑或发布权限",
"Config.MasterNoPermission.DialogTitle": "申请配置权限",
"Config.MasterNoPermission.DialogContent": "您不是项目管理员， 只有项目管理员才有添加集群、namespace的权限。如需管理员权限，请找项目管理员 '{{masterUsers}}' 分配管理员权限",
"Config.NamespaceLocked.DialogTitle": "编辑受限",
"Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.",
"Config.RollbackAlert.DialogTitle": "回滚",
"Config.RollbackAlert.DialogContent": "确定要回滚吗?",
"Config.EmergencyPublishAlert.DialogTitle": "紧急发布",
"Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?",
"Config.DeleteBranch.DialogTitle": "删除灰度",
"Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?",
"Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示",
"Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效",
"Config.MergeAndReleaseDeny.DialogTitle": "全量发布",
"Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId",
"Config.SyntaxCheckFailed.DialogTitle": "语法检查错误",
"Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示",
"Config.CreateBranchTips.DialogTitle": "创建灰度须知",
"Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br> 1.创建灰度版本 <br> 2.配置灰度配置项<br> 3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br> 4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br> 1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效",
"Config.ProjectMissEnvInfos": "当前项目有环境缺失，请点击页面左侧『补缺环境』补齐数据",
"Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据",
"Config.SystemError": "系统出错,请重试或联系系统负责人",
"Config.FavoriteSuccessfully": "收藏成功",
"Config.FavoriteFailed": "收藏失败",
"Config.CancelledFavorite": "取消收藏成功",
"Config.CancelFavoriteFailed": "取消收藏失败",
"Config.GetUserInfoFailed": "获取用户登录信息失败",
"Config.LoadingAllNamespaceError": "加载配置信息出错",
"Config.CancelFavoriteError": "取消收藏失败",
"Config.Deleted": "删除成功",
"Config.DeleteFailed": "删除失败",
"Config.GrayscaleCreated": "创建灰度成功",
"Config.GrayscaleCreateFailed": "创建灰度失败",
"Config.BranchDeleted": "分支删除成功",
"Config.BranchDeleteFailed": "分支删除失败",
"Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败",
"Config.DeleteNamespaceNoPermissionFailedTips": "您没有项目管理员权限，只有管理员才能删除Namespace，请找项目管理员 [{{users}}] 删除Namespace",
"Delete.Title": "删除应用、集群、AppNamespace",
"Delete.DeleteApp": "删除应用",
"Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)",
"Delete.AppIdTips": "(删除前请先查询应用信息)",
"Delete.AppInfo": "应用信息",
"Delete.DeleteCluster": "删除集群",
"Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)",
"Delete.EnvName": "环境名称",
"Delete.ClusterNameTips": "(删除前请先查询应用集群信息)",
"Delete.ClusterInfo": "集群信息",
"Delete.DeleteNamespace": "删除AppNamespace",
"Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到项目页面中自行删除！）",
"Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。",
"Delete.AppNamespaceName": "AppNamespace名称",
"Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace信息",
"Delete.IsRootUserTips": "当前页面只对Apollo管理员开放",
"Delete.PleaseEnterAppId": "请输入appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！",
"Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？",
"Delete.Deleted": "删除成功",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称",
"Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称",
"Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'",
"Namespace.Title": "新建Namespace",
"Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)",
"Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置",
"Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace",
"Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何项目读取",
"Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求",
"Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可",
"Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace",
"Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到",
"Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置",
"Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容",
"Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去",
"Namespace.CreateNamespace": "创建Namespace",
"Namespace.AssociationPublicNamespace": "关联公共Namespace",
"Namespace.ChooseCluster": "选择集群",
"Namespace.NamespaceName": "名称",
"Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀",
"Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)",
"Namespace.NamespaceType": "类型",
"Namespace.NamespaceType.Public": "public",
"Namespace.NamespaceType.Private": "private",
"Namespace.Remark": "备注",
"Namespace.Namespace": "namespace",
"Namespace.PleaseChooseNamespace": "请选择Namespace",
"Namespace.LoadingPublicNamespaceError": "加载公共namespace错误",
"Namespace.LoadingAppInfoError": "加载App信息出错",
"Namespace.PleaseChooseCluster": "请选择集群",
"Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符",
"ServiceConfig.Title": "应用配置",
"ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）",
"ServiceConfig.Key": "key",
"ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)",
"ServiceConfig.Value": "value",
"ServiceConfig.Comment": "comment",
"ServiceConfig.Saved": "保存成功",
"ServiceConfig.SaveFailed": "保存失败",
"ServiceConfig.PleaseEnterKey": "请输入key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项",
"AccessKey.Tips.1": "每个环境最多可添加5个访问密钥",
"AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置",
"AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：",
"AccessKey.Tips.3.1": "通过jvm参数-Dapollo.accesskey.secret",
"AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESSKEY_SECRET",
"AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.accesskey.secret（注意多环境secret不一样）",
"AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥",
"AccessKey.ConfigAccessKeys.Secret": "访问密钥",
"AccessKey.ConfigAccessKeys.Status": "状态",
"AccessKey.ConfigAccessKeys.LastModify": "最后修改人",
"AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间",
"AccessKey.ConfigAccessKeys.Operator": "操作",
"AccessKey.Operator.Disable": "禁用",
"AccessKey.Operator.Enable": "启用",
"AccessKey.Operator.Disabled": "已禁用",
"AccessKey.Operator.Enabled": "已启用",
"AccessKey.Operator.Remove": "删除",
"AccessKey.Operator.CreateSuccess": "访问密钥创建成功",
"AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功",
"AccessKey.Operator.EnabledSuccess": "访问密钥启用成功",
"AccessKey.Operator.RemoveSuccess": "访问密钥删除成功",
"AccessKey.Operator.CreateError": "访问密钥创建失败",
"AccessKey.Operator.DisabledError": "访问密钥禁用失败",
"AccessKey.Operator.EnabledError": "访问密钥启用失败",
"AccessKey.Operator.RemoveError": "访问密钥删除失败",
"AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?",
"AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?",
"AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?",
"AccessKey.LoadError": "加载访问密钥出错",
"SystemInfo.Title": "系统信息",
"SystemInfo.SystemVersion": "系统版本",
"SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。",
"SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）",
"SystemInfo.MetaServerAddress": "Meta server地址",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.Title": "系统权限管理",
"SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限",
"SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建项目)",
"SystemRole.ChooseUser": "用户选择",
"SystemRole.Add": "添加",
"SystemRole.AuthorizedUser": "已拥有权限用户",
"SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限",
"SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改项目管理员)",
"SystemRole.AppIdTips": "(请先查询应用信息)",
"SystemRole.AppInfo": "应用信息",
"SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master",
"SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master",
"SystemRole.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.PleaseChooseUser": "请选择用户名",
"SystemRole.Added": "添加成功",
"SystemRole.AddFailed": "添加失败",
"SystemRole.Deleted": "删除成功",
"SystemRole.DeleteFailed": "删除失败",
"SystemRole.GetCanCreateProjectUsersError": "获取拥有创建项目权限的用户列表出错",
"SystemRole.PleaseEnterAppId": "请输入appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！",
"SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}",
"SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"UserMange.Title": "用户管理",
"UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）",
"UserMange.UserName": "用户名",
"UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。",
"UserMange.Pwd": "密码",
"UserMange.Email": "邮箱",
"UserMange.Created": "创建用户成功",
"UserMange.CreateFailed": "创建用户失败",
"Open.Manage.Title": "开放平台",
"Open.Manage.CreateThirdApp": "创建第三方应用",
"Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)",
"Open.Manage.ThirdAppId": "第三方应用ID",
"Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)",
"Open.Manage.ThirdAppName": "第三方应用名称",
"Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"Open.Manage.ProjectOwner": "项目负责人",
"Open.Manage.Create": "创建",
"Open.Manage.GrantPermission": "赋权",
"Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "被管理的AppId",
"Open.Manage.ManagedNamespace": "被管理的Namespace",
"Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Open.Manage.GrantType": "授权类型",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "环境",
"Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)",
"Open.Manage.PleaseEnterAppId": "请输入appId",
"Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建",
"Open.Manage.GrantSuccessfully": "赋权成功",
"Open.Manage.GrantFailed": "赋权失败",
"Namespace.Role.Title": "权限管理",
"Namespace.Role.GrantModifyTo": "修改权",
"Namespace.Role.GrantModifyTo2": "(可以修改配置)",
"Namespace.Role.AllEnv": "所有环境",
"Namespace.Role.GrantPublishTo": "发布权",
"Namespace.Role.GrantPublishTo2": "(可以发布配置)",
"Namespace.Role.Add": "添加",
"Namespace.Role.NoPermission": "您没有权限哟!",
"Namespace.Role.InitNamespacePermissionError": "初始化授权出错",
"Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错",
"Namespace.Role.GetGrantUserError": "加载授权用户出错",
"Namespace.Role.PleaseChooseUser": "请选择用户",
"Namespace.Role.Added": "添加成功",
"Namespace.Role.AddFailed": "添加失败",
"Namespace.Role.Deleted": "删除成功",
"Namespace.Role.DeleteFailed": "删除失败",
"Config.Sync.Title": "同步配置",
"Config.Sync.FistStep": "(第一步:选择同步信息)",
"Config.Sync.SecondStep": "(第二步:检查Diff)",
"Config.Sync.PreviousStep": "上一步",
"Config.Sync.NextStep": "下一步",
"Config.Sync.Sync": "同步",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致",
"Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效",
"Config.Sync.SyncNamespace": "同步的Namespace",
"Config.Sync.SyncToCluster": "同步到哪个集群",
"Config.Sync.NeedToSyncItem": "需要同步的配置",
"Config.Sync.SortByLastModifyTime": "按最后更新时间过滤",
"Config.Sync.BeginTime": "开始时间",
"Config.Sync.EndTime": "结束时间",
"Config.Sync.Filter": "过滤",
"Config.Sync.Rest": "重置",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "没有更新的配置",
"Config.Sync.IgnoreSync": "忽略同步",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "同步前",
"Config.Sync.Step2SyncAfter": "同步后",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "操作",
"Config.Sync.NewAdd": "新增",
"Config.Sync.NoSyncItem": "不同步该配置",
"Config.Sync.Delete": "删除",
"Config.Sync.Update": "更新",
"Config.Sync.SyncSuccessfully": "同步成功!",
"Config.Sync.SyncFailed": "同步失败!",
"Config.Sync.LoadingItemsError": "加载配置出错",
"Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置",
"Config.Sync.PleaseChooseCluster": "请选择集群",
"Config.History.Title": "发布历史",
"Config.History.MasterVersionPublish": "主版本发布",
"Config.History.MasterVersionRollback": "主版本回滚",
"Config.History.GrayscaleOperator": "灰度操作",
"Config.History.PublishHistory": "发布历史",
"Config.History.OperationType0": "普通发布",
"Config.History.OperationType1": "回滚",
"Config.History.OperationType2": "灰度发布",
"Config.History.OperationType3": "更新灰度规则",
"Config.History.OperationType4": "灰度全量发布",
"Config.History.OperationType5": "灰度发布(主版本发布)",
"Config.History.OperationType6": "灰度发布(主版本回滚)",
"Config.History.OperationType7": "放弃灰度",
"Config.History.OperationType8": "删除灰度(全量发布)",
"Config.History.UrgentPublish": "紧急发布",
"Config.History.LoadMore": "加载更多",
"Config.History.Abandoned": "已废弃",
"Config.History.RollbackTo": "回滚到此版本",
"Config.History.RollbackToTips": "回滚已发布的配置到此版本",
"Config.History.ChangedItem": "变更的配置",
"Config.History.ChangedItemTips": "查看此次发布与上次版本的变更",
"Config.History.AllItem": "全部配置",
"Config.History.AllItemTips": "查看此次发布的所有配置信息",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "新增",
"Config.History.ChangeTypeModify": "修改",
"Config.History.ChangeTypeDelete": "删除",
"Config.History.NoChange": "无配置更改",
"Config.History.NoItem": "无配置",
"Config.History.GrayscaleRule": "灰度规则",
"Config.History.GrayscaleAppId": "灰度的AppId",
"Config.History.GrayscaleIp": "灰度的IP",
"Config.History.NoGrayscaleRule": "无灰度规则",
"Config.History.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史",
"Config.History.NoPublishHistory": "无发布历史信息",
"Config.History.LoadingHistoryError": "无发布历史信息",
"Config.Diff.Title": "比较配置",
"Config.Diff.FirstStep": "(第一步:选择比较信息)",
"Config.Diff.SecondStep": "(第二步:查看差异配置)",
"Config.Diff.PreviousStep": "上一步",
"Config.Diff.NextStep": "下一步",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
"Config.Diff.DiffCluster": "要比较的集群",
"Config.Diff.HasDiffComment": "是否比较注释",
"Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
"ConfigExport.Title": "配置导出",
"ConfigExport.TitleTips" : "超级管理员会下载所有项目的配置，普通用户只会下载自己项目的配置",
"ConfigExport.Download": "下载",
"App.CreateProject": "创建项目",
"App.AppIdTips": "（应用唯一标识）",
"App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.AppOwnerTips": "(开启项目管理员分配权限控制后，应用负责人和项目管理员默认为本账号，不可选择)",
"App.AppAdminTips1": "(应用负责人默认具有项目管理员权限，",
"App.AppAdminTips2": "项目管理员可以创建Namespace和集群、分配用户权限)",
"App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.Title": "项目管理",
"App.Setting.Admin": "管理员",
"App.Setting.AdminTips": "(项目管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理项目、Namespace权限)",
"App.Setting.Add": "添加",
"App.Setting.BasicInfo": "基本信息",
"App.Setting.ProjectName": "项目名称",
"App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.Setting.ProjectOwner": "项目负责人",
"App.Setting.Modify": "修改项目信息",
"App.Setting.Cancel": "取消修改",
"App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.DeleteAdmin": "删除管理员",
"App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员",
"App.Setting.PleaseChooseUser": "请选择用户",
"App.Setting.Added": "添加成功",
"App.Setting.AddFailed": "添加失败",
"App.Setting.Deleted": "删除成功",
"App.Setting.DeleteFailed": "删除失败",
"App.Setting.Modified": "修改成功",
"Valdr.App.AppId.Size": "AppId长度不能多于64个字符",
"Valdr.App.AppId.Required": "AppId不能为空",
"Valdr.App.appName.Size": "应用名称长度不能多于128个字符",
"Valdr.App.appName.Required": "应用名称不能为空",
"Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符",
"Valdr.Cluster.ClusterName.Required": "集群名称不能为空",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空",
"Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Item.Key.Size": "Key长度不能多于128个字符",
"Valdr.Item.Key.Required": "Key不能为空",
"Valdr.Item.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符",
"Valdr.Release.ReleaseName.Required": "Release Name不能为空",
"Valdr.Release.Comment.Size": "备注长度不能多于64个字符",
"ApolloConfirmDialog.DefaultConfirmBtnName": "确认",
"ApolloConfirmDialog.SearchPlaceHolder": "搜索项目(AppId、项目名)",
"RulesModal.ChooseInstances": "从实例列表中选择",
"RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空",
"RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则",
"RulesModal.IpListCanNotBeNull": "IP列表不能为空",
"ItemModal.KeyExists": "key='{{key}}' 已存在",
"ItemModal.AddedTips": "添加成功,如需生效请发布",
"ItemModal.AddFailed": "添加失败",
"ItemModal.PleaseChooseCluster": "请选择集群",
"ItemModal.ModifiedTips": "更新成功, 如需生效请发布",
"ItemModal.ModifyFailed": "更新失败",
"ItemModal.Tabs": "制表符",
"ItemModal.NewLine": "换行符",
"ItemModal.Space": "空格",
"ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错",
"ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错",
"ApolloNsPanel.Deleted": "删除成功",
"ApolloNsPanel.GrayscaleModified": "灰度规则更新成功",
"ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败",
"ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布",
"ApolloNsPanel.ModifyFailed": "更新失败",
"ApolloNsPanel.GrammarIsRight": "语法正确！",
"ReleaseModal.Published": "发布成功",
"ReleaseModal.PublishFailed": "发布失败",
"ReleaseModal.GrayscalePublished": "灰度发布成功",
"ReleaseModal.GrayscalePublishFailed": "灰度发布失败",
"ReleaseModal.AllPublished": "全量发布成功",
"ReleaseModal.AllPublishFailed": "全量发布失败",
"Rollback.NoRollbackList": "没有可以回滚的发布历史",
"Rollback.SameAsCurrentRelease": "该版本与当前版本相同",
"Rollback.RollbackSuccessfully": "回滚成功",
"Rollback.RollbackFailed": "回滚失败",
"Revoke.RevokeFailed": "撤销失败",
"Revoke.RevokeSuccessfully": "撤销成功"
}
| {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.SystemRoleManage": "系统权限管理",
"Common.Nav.OpenMange": "开放平台授权管理",
"Common.Nav.SystemConfig": "系统参数",
"Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace",
"Common.Nav.SystemInfo": "系统信息",
"Common.Nav.ConfigExport": "配置导出",
"Common.Nav.Logout": "退出",
"Common.Department": "部门",
"Common.Cluster": "集群",
"Common.Environment": "环境",
"Common.Email": "邮箱",
"Common.AppId": "AppId",
"Common.Namespace": "Namespace",
"Common.AppName": "应用名称",
"Common.AppOwner": "负责人",
"Common.AppOwnerLong": "应用负责人",
"Common.AppAdmin": "项目管理员",
"Common.ClusterName": "集群名称",
"Common.Submit": "提交",
"Common.Save": "保存",
"Common.Created": "创建成功",
"Common.CreateFailed": "创建失败",
"Common.Deleted": "删除成功",
"Common.DeleteFailed": "删除失败",
"Common.ReturnToIndex": "返回到项目首页",
"Common.Cancel": "取消",
"Common.Ok": "确定",
"Common.Search": "查询",
"Common.IsRootUser": "当前页面只对Apollo管理员开放",
"Common.PleaseChooseDepartment": "请选择部门",
"Common.PleaseChooseOwner": "请选择应用负责人",
"Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试",
"Component.DeleteNamespace.Title": "删除Namespace",
"Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?",
"Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?",
"Component.GrayscalePublishRule.Title": "编辑灰度规则",
"Component.GrayscalePublishRule.AppId": "灰度的AppId",
"Component.GrayscalePublishRule.AcceptRule": "灰度应用规则",
"Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例",
"Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例",
"Component.GrayscalePublishRule.IP": "灰度的IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)",
"Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以",
"Component.GrayscalePublishRule.EnterIp": "手动输入IP",
"Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮",
"Component.GrayscalePublishRule.Add": "添加",
"Component.ConfigItem.Title": "添加配置项",
"Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)",
"Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项",
"Component.ConfigItem.ModifyItem": "修改配置项",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击",
"Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符",
"Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "选择集群",
"Component.MergePublish.Title": "全量发布",
"Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。",
"Component.MergePublish.NextStep": "全量发布后,您希望",
"Component.MergePublish.DeleteGrayscale": "删除灰度版本",
"Component.MergePublish.ReservedGrayscale": "保留灰度版本",
"Component.Namespace.Branch.IsChanged": "有修改",
"Component.Namespace.Branch.ChangeUser": "当前修改者",
"Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布",
"Component.Namespace.Branch.GrayscalePublish": "灰度发布",
"Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置",
"Component.Namespace.Branch.AllPublish": "全量发布",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本",
"Component.Namespace.Branch.DiscardGrayscale": "放弃灰度",
"Component.Namespace.Branch.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Branch.Tab.Configuration": "配置",
"Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表",
"Component.Namespace.Branch.Tab.ChangeHistory": "更改历史",
"Component.Namespace.Branch.Body.Item": "灰度的配置",
"Component.Namespace.Branch.Body.AddedItem": "新增灰度配置",
"Component.Namespace.Branch.Body.PublishState": "发布状态",
"Component.Namespace.Branch.Body.ItemSort": "排序",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值",
"Component.Namespace.Branch.Body.ItemComment": "备注",
"Component.Namespace.Branch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Branch.Body.ItemOperator": "操作",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.Branch.Body.ItemNoPublish": "未发布",
"Component.Namespace.Branch.Body.ItemPublished": "已发布",
"Component.Namespace.Branch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.Branch.Body.ClickToSee": "点击查看",
"Component.Namespace.Branch.Body.DeletedItem": "删除的配置",
"Component.Namespace.Branch.Body.Delete": "删",
"Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置",
"Component.Namespace.Branch.Body.ModifiedItem": "修改的配置",
"Component.Namespace.Branch.Body.Modify": "改",
"Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置",
"Component.Namespace.Branch.Body.Added": "新",
"Component.Namespace.Branch.Body.Op.Modify": "修改",
"Component.Namespace.Branch.Body.Op.Delete": "删除",
"Component.Namespace.MasterBranch.Body.Title": "主版本的配置",
"Component.Namespace.MasterBranch.Body.PublishState": "发布状态",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "备注",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.MasterBranch.Body.ItemOperator": "操作",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布",
"Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.MasterBranch.Body.ItemPublished": "已发布",
"Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置",
"Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找项目管理员申请权限.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表",
"Component.Namespace.Branch.GrayScaleRule.Operator": "操作",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "修改",
"Component.Namespace.Branch.GrayScaleRule.Delete": "删除",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则",
"Component.Namespace.Branch.Instance.RefreshList": "刷新列表",
"Component.Namespace.Branch.Instance.ItemToSee": "查看配置",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间",
"Component.Namespace.Branch.Instance.LoadMore": "刷新列表",
"Component.Namespace.Branch.Instance.NoInstance": "无实例信息",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "新增",
"Component.Namespace.Branch.History.Modified": "更新",
"Component.Namespace.Branch.History.Deleted": "删除",
"Component.Namespace.Branch.History.LoadMore": "加载更多",
"Component.Namespace.Branch.History.NoHistory": "无更改历史",
"Component.Namespace.Header.Title.Private": "私有",
"Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.Public": "公共",
"Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到",
"Component.Namespace.Header.Title.Extend": "关联",
"Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]",
"Component.Namespace.Header.Title.Master": "主版本",
"Component.Namespace.Header.Title.Grayscale": "灰度版本",
"Component.Namespace.Master.LoadNamespace": "加载Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "加载Namespace",
"Component.Namespace.Master.Items.Changed": "有修改",
"Component.Namespace.Master.Items.ChangedUser": "当前修改者",
"Component.Namespace.Master.Items.Publish": "发布",
"Component.Namespace.Master.Items.PublishTips": "发布配置",
"Component.Namespace.Master.Items.Rollback": "回滚",
"Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置",
"Component.Namespace.Master.Items.PublishHistory": "发布历史",
"Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史",
"Component.Namespace.Master.Items.Grant": "授权",
"Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限",
"Component.Namespace.Master.Items.Grayscale": "灰度",
"Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本",
"Component.Namespace.Master.Items.RequestPermission": "申请配置权限",
"Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请",
"Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Master.Items.ItemList": "表格",
"Component.Namespace.Master.Items.ItemListByText": "文本",
"Component.Namespace.Master.Items.ItemHistory": "更改历史",
"Component.Namespace.Master.Items.ItemInstance": "实例列表",
"Component.Namespace.Master.Items.CopyText": "复制文本",
"Component.Namespace.Master.Items.GrammarCheck": "语法检查",
"Component.Namespace.Master.Items.CancelChanged": "取消修改",
"Component.Namespace.Master.Items.Change": "修改配置",
"Component.Namespace.Master.Items.SummitChanged": "提交修改",
"Component.Namespace.Master.Items.SortByKey": "按Key过滤配置",
"Component.Namespace.Master.Items.FilterItem": "过滤配置",
"Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置",
"Component.Namespace.Master.Items.SyncItem": "同步配置",
"Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改",
"Component.Namespace.Master.Items.RevokeItem": "撤销配置",
"Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置",
"Component.Namespace.Master.Items.DiffItem": "比较配置",
"Component.Namespace.Master.Items.AddItem": "新增配置",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。",
"Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤",
"Component.Namespace.Master.Items.Body.PublishState": "发布状态",
"Component.Namespace.Master.Items.Body.Sort": "排序",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "备注",
"Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Master.Items.Body.ItemOperator": "操作",
"Component.Namespace.Master.Items.Body.NoPublish": "未发布",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值",
"Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值",
"Component.Namespace.Master.Items.Body.Published": "已发布",
"Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置",
"Component.Namespace.Master.Items.Body.ClickToSee": "点击查看",
"Component.Namespace.Master.Items.Body.Grayscale": "灰",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值",
"Component.Namespace.Master.Items.Body.NewAdded": "新",
"Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置",
"Component.Namespace.Master.Items.Body.Modified": "改",
"Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置",
"Component.Namespace.Master.Items.Body.Deleted": "删",
"Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置",
"Component.Namespace.Master.Items.Body.ModifyTips": "修改",
"Component.Namespace.Master.Items.Body.DeleteTips": "删除",
"Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置",
"Component.Namespace.Master.Items.Body.Public.Title": "公共的配置",
"Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史",
"Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息",
"Component.PublishDeny.Title": "发布受限",
"Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~",
"Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）",
"Component.PublishDeny.EmergencyPublish": "紧急发布",
"Component.PublishDeny.Close": "关闭",
"Component.Publish.Title": "发布",
"Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})",
"Component.Publish.Grayscale": "灰度发布",
"Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)",
"Component.Publish.AllPublish": "全量发布",
"Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)",
"Component.Publish.ToSeeChange": "查看变更",
"Component.Publish.PublishedValue": "发布的值",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "未发布的值",
"Component.Publish.ModifyUser": "修改人",
"Component.Publish.ModifyTime": "修改时间",
"Component.Publish.NewAdded": "新",
"Component.Publish.NewAddedTips": "新增的配置",
"Component.Publish.Modified": "改",
"Component.Publish.ModifiedTips": "修改的配置",
"Component.Publish.Deleted": "删",
"Component.Publish.DeletedTips": "删除的配置",
"Component.Publish.MasterValue": "主版本值",
"Component.Publish.GrayValue": "灰度版本的值",
"Component.Publish.GrayPublishedValue": "灰度版本发布的值",
"Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值",
"Component.Publish.ItemNoChange": "配置没有变化",
"Component.Publish.GrayItemNoChange": "灰度配置没有变化",
"Component.Publish.NoGrayItems": "没有灰度的配置项",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "发布",
"Component.Rollback.To": "回滚到",
"Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本",
"Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置",
"Component.Rollback.ClickToView": "点击查看",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "回滚前",
"Component.Rollback.RollbackAfterValue": "回滚后",
"Component.Rollback.Added": "新增",
"Component.Rollback.Modified": "更新",
"Component.Rollback.Deleted": "删除",
"Component.Rollback.NoChange": "配置没有变化",
"Component.Rollback.OpRollback": "回滚",
"Component.ShowText.Title": "查看",
"Login.Login": "登录",
"Login.UserNameOrPasswordIncorrect": "用户名或密码错误",
"Login.LogoutSuccessfully": "登出成功",
"Index.MyProject": "我的项目",
"Index.CreateProject": "创建项目",
"Index.LoadMore": "加载更多",
"Index.FavoriteItems": "收藏的项目",
"Index.Topping": "置顶",
"Index.FavoriteTip": "您还没有收藏过任何项目，在项目主页可以收藏项目哟~",
"Index.RecentlyViewedItems": "最近浏览的项目",
"Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败",
"Index.Topped": "置顶成功",
"Index.CancelledFavorite": "取消收藏成功",
"Cluster.CreateCluster": "新建集群",
"Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置",
"Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群",
"Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)",
"Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致",
"Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)",
"Cluster.ChooseEnvironment": "选择环境",
"Cluster.LoadingEnvironmentError": "加载环境信息出错",
"Cluster.ClusterCreated": "集群创建成功",
"Cluster.ClusterCreateFailed": "集群创建失败",
"Cluster.PleaseChooseEnvironment": "请选择环境",
"Config.Title": "Apollo配置中心",
"Config.AppIdNotFound": "不存在，",
"Config.ClickByCreate": "点击创建",
"Config.EnvList": "环境列表",
"Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置",
"Config.ProjectInfo": "项目信息",
"Config.ModifyBasicProjectInfo": "修改项目基本信息",
"Config.Favorite": "收藏",
"Config.CancelFavorite": "取消收藏",
"Config.MissEnv": "缺失的环境",
"Config.MissNamespace": "缺失的Namespace",
"Config.ProjectManage": "管理项目",
"Config.AccessKeyManage": "管理密钥",
"Config.CreateAppMissEnv": "补缺环境",
"Config.CreateAppMissNamespace": "补缺Namespace",
"Config.AddCluster": "添加集群",
"Config.AddNamespace": "添加Namespace",
"Config.CurrentlyOperatorEnv": "当前操作环境",
"Config.DoNotRemindAgain": "不再提示",
"Config.Note": "注意",
"Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！",
"Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。",
"Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。",
"Config.RevokeItem.DialogTitle": "撤销配置",
"Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?",
"Config.DeleteItem.DialogTitle": "删除配置",
"Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?",
"Config.PublishNoPermission.DialogTitle": "发布",
"Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找项目管理员 '{{masterUsers}}' 分配发布权限",
"Config.ModifyNoPermission.DialogTitle": "申请配置权限",
"Config.ModifyNoPermission.DialogContent": "请找项目管理员 '{{masterUsers}}' 分配编辑或发布权限",
"Config.MasterNoPermission.DialogTitle": "申请配置权限",
"Config.MasterNoPermission.DialogContent": "您不是项目管理员， 只有项目管理员才有添加集群、namespace的权限。如需管理员权限，请找项目管理员 '{{masterUsers}}' 分配管理员权限",
"Config.NamespaceLocked.DialogTitle": "编辑受限",
"Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.",
"Config.RollbackAlert.DialogTitle": "回滚",
"Config.RollbackAlert.DialogContent": "确定要回滚吗?",
"Config.EmergencyPublishAlert.DialogTitle": "紧急发布",
"Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?",
"Config.DeleteBranch.DialogTitle": "删除灰度",
"Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?",
"Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示",
"Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效",
"Config.MergeAndReleaseDeny.DialogTitle": "全量发布",
"Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId",
"Config.SyntaxCheckFailed.DialogTitle": "语法检查错误",
"Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示",
"Config.CreateBranchTips.DialogTitle": "创建灰度须知",
"Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br> 1.创建灰度版本 <br> 2.配置灰度配置项<br> 3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br> 4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br> 1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效",
"Config.ProjectMissEnvInfos": "当前项目有环境缺失，请点击页面左侧『补缺环境』补齐数据",
"Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据",
"Config.SystemError": "系统出错,请重试或联系系统负责人",
"Config.FavoriteSuccessfully": "收藏成功",
"Config.FavoriteFailed": "收藏失败",
"Config.CancelledFavorite": "取消收藏成功",
"Config.CancelFavoriteFailed": "取消收藏失败",
"Config.GetUserInfoFailed": "获取用户登录信息失败",
"Config.LoadingAllNamespaceError": "加载配置信息出错",
"Config.CancelFavoriteError": "取消收藏失败",
"Config.Deleted": "删除成功",
"Config.DeleteFailed": "删除失败",
"Config.GrayscaleCreated": "创建灰度成功",
"Config.GrayscaleCreateFailed": "创建灰度失败",
"Config.BranchDeleted": "分支删除成功",
"Config.BranchDeleteFailed": "分支删除失败",
"Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败",
"Config.DeleteNamespaceNoPermissionFailedTips": "您没有项目管理员权限，只有管理员才能删除Namespace，请找项目管理员 [{{users}}] 删除Namespace",
"Delete.Title": "删除应用、集群、AppNamespace",
"Delete.DeleteApp": "删除应用",
"Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)",
"Delete.AppIdTips": "(删除前请先查询应用信息)",
"Delete.AppInfo": "应用信息",
"Delete.DeleteCluster": "删除集群",
"Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)",
"Delete.EnvName": "环境名称",
"Delete.ClusterNameTips": "(删除前请先查询应用集群信息)",
"Delete.ClusterInfo": "集群信息",
"Delete.DeleteNamespace": "删除AppNamespace",
"Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到项目页面中自行删除！）",
"Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。",
"Delete.AppNamespaceName": "AppNamespace名称",
"Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace信息",
"Delete.IsRootUserTips": "当前页面只对Apollo管理员开放",
"Delete.PleaseEnterAppId": "请输入appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！",
"Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？",
"Delete.Deleted": "删除成功",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称",
"Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称",
"Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'",
"Namespace.Title": "新建Namespace",
"Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)",
"Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置",
"Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace",
"Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何项目读取",
"Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求",
"Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可",
"Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace",
"Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到",
"Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置",
"Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容",
"Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去",
"Namespace.CreateNamespace": "创建Namespace",
"Namespace.AssociationPublicNamespace": "关联公共Namespace",
"Namespace.ChooseCluster": "选择集群",
"Namespace.NamespaceName": "名称",
"Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀",
"Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)",
"Namespace.NamespaceType": "类型",
"Namespace.NamespaceType.Public": "public",
"Namespace.NamespaceType.Private": "private",
"Namespace.Remark": "备注",
"Namespace.Namespace": "namespace",
"Namespace.PleaseChooseNamespace": "请选择Namespace",
"Namespace.LoadingPublicNamespaceError": "加载公共namespace错误",
"Namespace.LoadingAppInfoError": "加载App信息出错",
"Namespace.PleaseChooseCluster": "请选择集群",
"Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符",
"ServiceConfig.Title": "应用配置",
"ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）",
"ServiceConfig.Key": "key",
"ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)",
"ServiceConfig.Value": "value",
"ServiceConfig.Comment": "comment",
"ServiceConfig.Saved": "保存成功",
"ServiceConfig.SaveFailed": "保存失败",
"ServiceConfig.PleaseEnterKey": "请输入key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项",
"AccessKey.Tips.1": "每个环境最多可添加5个访问密钥",
"AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置",
"AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：",
"AccessKey.Tips.3.1": "通过jvm参数-Dapollo.accesskey.secret",
"AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESSKEY_SECRET",
"AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.accesskey.secret（注意多环境secret不一样）",
"AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥",
"AccessKey.ConfigAccessKeys.Secret": "访问密钥",
"AccessKey.ConfigAccessKeys.Status": "状态",
"AccessKey.ConfigAccessKeys.LastModify": "最后修改人",
"AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间",
"AccessKey.ConfigAccessKeys.Operator": "操作",
"AccessKey.Operator.Disable": "禁用",
"AccessKey.Operator.Enable": "启用",
"AccessKey.Operator.Disabled": "已禁用",
"AccessKey.Operator.Enabled": "已启用",
"AccessKey.Operator.Remove": "删除",
"AccessKey.Operator.CreateSuccess": "访问密钥创建成功",
"AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功",
"AccessKey.Operator.EnabledSuccess": "访问密钥启用成功",
"AccessKey.Operator.RemoveSuccess": "访问密钥删除成功",
"AccessKey.Operator.CreateError": "访问密钥创建失败",
"AccessKey.Operator.DisabledError": "访问密钥禁用失败",
"AccessKey.Operator.EnabledError": "访问密钥启用失败",
"AccessKey.Operator.RemoveError": "访问密钥删除失败",
"AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?",
"AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?",
"AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?",
"AccessKey.LoadError": "加载访问密钥出错",
"SystemInfo.Title": "系统信息",
"SystemInfo.SystemVersion": "系统版本",
"SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。",
"SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）",
"SystemInfo.MetaServerAddress": "Meta server地址",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.Title": "系统权限管理",
"SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限",
"SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建项目)",
"SystemRole.ChooseUser": "用户选择",
"SystemRole.Add": "添加",
"SystemRole.AuthorizedUser": "已拥有权限用户",
"SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限",
"SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改项目管理员)",
"SystemRole.AppIdTips": "(请先查询应用信息)",
"SystemRole.AppInfo": "应用信息",
"SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master",
"SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master",
"SystemRole.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.PleaseChooseUser": "请选择用户名",
"SystemRole.Added": "添加成功",
"SystemRole.AddFailed": "添加失败",
"SystemRole.Deleted": "删除成功",
"SystemRole.DeleteFailed": "删除失败",
"SystemRole.GetCanCreateProjectUsersError": "获取拥有创建项目权限的用户列表出错",
"SystemRole.PleaseEnterAppId": "请输入appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！",
"SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}",
"SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"UserMange.Title": "用户管理",
"UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）",
"UserMange.UserName": "用户名",
"UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。",
"UserMange.Pwd": "密码",
"UserMange.Email": "邮箱",
"UserMange.Created": "创建用户成功",
"UserMange.CreateFailed": "创建用户失败",
"Open.Manage.Title": "开放平台",
"Open.Manage.CreateThirdApp": "创建第三方应用",
"Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)",
"Open.Manage.ThirdAppId": "第三方应用ID",
"Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)",
"Open.Manage.ThirdAppName": "第三方应用名称",
"Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"Open.Manage.ProjectOwner": "项目负责人",
"Open.Manage.Create": "创建",
"Open.Manage.GrantPermission": "赋权",
"Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "被管理的AppId",
"Open.Manage.ManagedNamespace": "被管理的Namespace",
"Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Open.Manage.GrantType": "授权类型",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "环境",
"Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)",
"Open.Manage.PleaseEnterAppId": "请输入appId",
"Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建",
"Open.Manage.GrantSuccessfully": "赋权成功",
"Open.Manage.GrantFailed": "赋权失败",
"Namespace.Role.Title": "权限管理",
"Namespace.Role.GrantModifyTo": "修改权",
"Namespace.Role.GrantModifyTo2": "(可以修改配置)",
"Namespace.Role.AllEnv": "所有环境",
"Namespace.Role.GrantPublishTo": "发布权",
"Namespace.Role.GrantPublishTo2": "(可以发布配置)",
"Namespace.Role.Add": "添加",
"Namespace.Role.NoPermission": "您没有权限哟!",
"Namespace.Role.InitNamespacePermissionError": "初始化授权出错",
"Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错",
"Namespace.Role.GetGrantUserError": "加载授权用户出错",
"Namespace.Role.PleaseChooseUser": "请选择用户",
"Namespace.Role.Added": "添加成功",
"Namespace.Role.AddFailed": "添加失败",
"Namespace.Role.Deleted": "删除成功",
"Namespace.Role.DeleteFailed": "删除失败",
"Config.Sync.Title": "同步配置",
"Config.Sync.FistStep": "(第一步:选择同步信息)",
"Config.Sync.SecondStep": "(第二步:检查Diff)",
"Config.Sync.PreviousStep": "上一步",
"Config.Sync.NextStep": "下一步",
"Config.Sync.Sync": "同步",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致",
"Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效",
"Config.Sync.SyncNamespace": "同步的Namespace",
"Config.Sync.SyncToCluster": "同步到哪个集群",
"Config.Sync.NeedToSyncItem": "需要同步的配置",
"Config.Sync.SortByLastModifyTime": "按最后更新时间过滤",
"Config.Sync.BeginTime": "开始时间",
"Config.Sync.EndTime": "结束时间",
"Config.Sync.Filter": "过滤",
"Config.Sync.Rest": "重置",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "没有更新的配置",
"Config.Sync.IgnoreSync": "忽略同步",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "同步前",
"Config.Sync.Step2SyncAfter": "同步后",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "操作",
"Config.Sync.NewAdd": "新增",
"Config.Sync.NoSyncItem": "不同步该配置",
"Config.Sync.Delete": "删除",
"Config.Sync.Update": "更新",
"Config.Sync.SyncSuccessfully": "同步成功!",
"Config.Sync.SyncFailed": "同步失败!",
"Config.Sync.LoadingItemsError": "加载配置出错",
"Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置",
"Config.Sync.PleaseChooseCluster": "请选择集群",
"Config.History.Title": "发布历史",
"Config.History.MasterVersionPublish": "主版本发布",
"Config.History.MasterVersionRollback": "主版本回滚",
"Config.History.GrayscaleOperator": "灰度操作",
"Config.History.PublishHistory": "发布历史",
"Config.History.OperationType0": "普通发布",
"Config.History.OperationType1": "回滚",
"Config.History.OperationType2": "灰度发布",
"Config.History.OperationType3": "更新灰度规则",
"Config.History.OperationType4": "灰度全量发布",
"Config.History.OperationType5": "灰度发布(主版本发布)",
"Config.History.OperationType6": "灰度发布(主版本回滚)",
"Config.History.OperationType7": "放弃灰度",
"Config.History.OperationType8": "删除灰度(全量发布)",
"Config.History.UrgentPublish": "紧急发布",
"Config.History.LoadMore": "加载更多",
"Config.History.Abandoned": "已废弃",
"Config.History.RollbackTo": "回滚到此版本",
"Config.History.RollbackToTips": "回滚已发布的配置到此版本",
"Config.History.ChangedItem": "变更的配置",
"Config.History.ChangedItemTips": "查看此次发布与上次版本的变更",
"Config.History.AllItem": "全部配置",
"Config.History.AllItemTips": "查看此次发布的所有配置信息",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "新增",
"Config.History.ChangeTypeModify": "修改",
"Config.History.ChangeTypeDelete": "删除",
"Config.History.NoChange": "无配置更改",
"Config.History.NoItem": "无配置",
"Config.History.GrayscaleRule": "灰度规则",
"Config.History.GrayscaleAppId": "灰度的AppId",
"Config.History.GrayscaleIp": "灰度的IP",
"Config.History.NoGrayscaleRule": "无灰度规则",
"Config.History.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史",
"Config.History.NoPublishHistory": "无发布历史信息",
"Config.History.LoadingHistoryError": "无发布历史信息",
"Config.Diff.Title": "比较配置",
"Config.Diff.FirstStep": "(第一步:选择比较信息)",
"Config.Diff.SecondStep": "(第二步:查看差异配置)",
"Config.Diff.PreviousStep": "上一步",
"Config.Diff.NextStep": "下一步",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
"Config.Diff.DiffCluster": "要比较的集群",
"Config.Diff.HasDiffComment": "是否比较注释",
"Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
"ConfigExport.Title": "配置导出",
"ConfigExport.TitleTips" : "超级管理员会下载所有项目的配置，普通用户只会下载自己项目的配置",
"ConfigExport.Download": "下载",
"App.CreateProject": "创建项目",
"App.AppIdTips": "（应用唯一标识）",
"App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.AppOwnerTips": "(开启项目管理员分配权限控制后，应用负责人和项目管理员默认为本账号，不可选择)",
"App.AppAdminTips1": "(应用负责人默认具有项目管理员权限，",
"App.AppAdminTips2": "项目管理员可以创建Namespace和集群、分配用户权限)",
"App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.Title": "项目管理",
"App.Setting.Admin": "管理员",
"App.Setting.AdminTips": "(项目管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理项目、Namespace权限)",
"App.Setting.Add": "添加",
"App.Setting.BasicInfo": "基本信息",
"App.Setting.ProjectName": "项目名称",
"App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.Setting.ProjectOwner": "项目负责人",
"App.Setting.Modify": "修改项目信息",
"App.Setting.Cancel": "取消修改",
"App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.DeleteAdmin": "删除管理员",
"App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员",
"App.Setting.PleaseChooseUser": "请选择用户",
"App.Setting.Added": "添加成功",
"App.Setting.AddFailed": "添加失败",
"App.Setting.Deleted": "删除成功",
"App.Setting.DeleteFailed": "删除失败",
"App.Setting.Modified": "修改成功",
"Valdr.App.AppId.Size": "AppId长度不能多于64个字符",
"Valdr.App.AppId.Required": "AppId不能为空",
"Valdr.App.appName.Size": "应用名称长度不能多于128个字符",
"Valdr.App.appName.Required": "应用名称不能为空",
"Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符",
"Valdr.Cluster.ClusterName.Required": "集群名称不能为空",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空",
"Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Item.Key.Size": "Key长度不能多于128个字符",
"Valdr.Item.Key.Required": "Key不能为空",
"Valdr.Item.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符",
"Valdr.Release.ReleaseName.Required": "Release Name不能为空",
"Valdr.Release.Comment.Size": "备注长度不能多于64个字符",
"ApolloConfirmDialog.DefaultConfirmBtnName": "确认",
"ApolloConfirmDialog.SearchPlaceHolder": "搜索项目(AppId、项目名)",
"RulesModal.ChooseInstances": "从实例列表中选择",
"RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空",
"RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则",
"RulesModal.IpListCanNotBeNull": "IP列表不能为空",
"ItemModal.KeyExists": "key='{{key}}' 已存在",
"ItemModal.AddedTips": "添加成功,如需生效请发布",
"ItemModal.AddFailed": "添加失败",
"ItemModal.PleaseChooseCluster": "请选择集群",
"ItemModal.ModifiedTips": "更新成功, 如需生效请发布",
"ItemModal.ModifyFailed": "更新失败",
"ItemModal.Tabs": "制表符",
"ItemModal.NewLine": "换行符",
"ItemModal.Space": "空格",
"ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错",
"ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错",
"ApolloNsPanel.Deleted": "删除成功",
"ApolloNsPanel.GrayscaleModified": "灰度规则更新成功",
"ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败",
"ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布",
"ApolloNsPanel.ModifyFailed": "更新失败",
"ApolloNsPanel.GrammarIsRight": "语法正确！",
"ReleaseModal.Published": "发布成功",
"ReleaseModal.PublishFailed": "发布失败",
"ReleaseModal.GrayscalePublished": "灰度发布成功",
"ReleaseModal.GrayscalePublishFailed": "灰度发布失败",
"ReleaseModal.AllPublished": "全量发布成功",
"ReleaseModal.AllPublishFailed": "全量发布失败",
"Rollback.NoRollbackList": "没有可以回滚的发布历史",
"Rollback.SameAsCurrentRelease": "该版本与当前版本相同",
"Rollback.RollbackSuccessfully": "回滚成功",
"Rollback.RollbackFailed": "回滚失败",
"Revoke.RevokeFailed": "撤销失败",
"Revoke.RevokeSuccessfully": "撤销成功"
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class SimpleConfigTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private PropertiesFactory propertiesFactory;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testGetProperty() throws Exception {
Properties someProperties = new Properties();
String someKey = "someKey";
String someValue = "someValue";
someProperties.setProperty(someKey, someValue);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
SimpleConfig config = new SimpleConfig(someNamespace, configRepository);
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someSourceType, config.getSourceType());
}
@Test
public void testLoadConfigFromConfigRepositoryError() throws Exception {
String someKey = "someKey";
String anyValue = "anyValue" + Math.random();
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
Config config = new SimpleConfig(someNamespace, configRepository);
assertEquals(anyValue, config.getProperty(someKey, anyValue));
assertEquals(ConfigSourceType.NONE, config.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String someKey = "someKey";
String someValue = "someValue";
String anotherKey = "anotherKey";
String anotherValue = "anotherValue";
someProperties.putAll(ImmutableMap.of(someKey, someValue, anotherKey, anotherValue));
Properties anotherProperties = new Properties();
String newKey = "newKey";
String newValue = "newValue";
String someValueNew = "someValueNew";
anotherProperties.putAll(ImmutableMap.of(someKey, someValueNew, newKey, newValue));
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
SimpleConfig config = new SimpleConfig(someNamespace, configRepository);
assertEquals(someSourceType, config.getSourceType());
config.addChangeListener(someListener);
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
config.onRepositoryChange(someNamespace, anotherProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(3, changeEvent.changedKeys().size());
ConfigChange someKeyChange = changeEvent.getChange(someKey);
assertEquals(someValue, someKeyChange.getOldValue());
assertEquals(someValueNew, someKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, someKeyChange.getChangeType());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(anotherValue, anotherKeyChange.getOldValue());
assertEquals(null, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, anotherKeyChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, config.getSourceType());
}
}
| package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class SimpleConfigTest {
private String someNamespace;
@Mock
private ConfigRepository configRepository;
@Mock
private PropertiesFactory propertiesFactory;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testGetProperty() throws Exception {
Properties someProperties = new Properties();
String someKey = "someKey";
String someValue = "someValue";
someProperties.setProperty(someKey, someValue);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
SimpleConfig config = new SimpleConfig(someNamespace, configRepository);
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someSourceType, config.getSourceType());
}
@Test
public void testLoadConfigFromConfigRepositoryError() throws Exception {
String someKey = "someKey";
String anyValue = "anyValue" + Math.random();
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
Config config = new SimpleConfig(someNamespace, configRepository);
assertEquals(anyValue, config.getProperty(someKey, anyValue));
assertEquals(ConfigSourceType.NONE, config.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
Properties someProperties = new Properties();
String someKey = "someKey";
String someValue = "someValue";
String anotherKey = "anotherKey";
String anotherValue = "anotherValue";
someProperties.putAll(ImmutableMap.of(someKey, someValue, anotherKey, anotherValue));
Properties anotherProperties = new Properties();
String newKey = "newKey";
String newValue = "newValue";
String someValueNew = "someValueNew";
anotherProperties.putAll(ImmutableMap.of(someKey, someValueNew, newKey, newValue));
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getConfig()).thenReturn(someProperties);
when(configRepository.getSourceType()).thenReturn(someSourceType);
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
SimpleConfig config = new SimpleConfig(someNamespace, configRepository);
assertEquals(someSourceType, config.getSourceType());
config.addChangeListener(someListener);
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
config.onRepositoryChange(someNamespace, anotherProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(3, changeEvent.changedKeys().size());
ConfigChange someKeyChange = changeEvent.getChange(someKey);
assertEquals(someValue, someKeyChange.getOldValue());
assertEquals(someValueNew, someKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, someKeyChange.getChangeType());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(anotherValue, anotherKeyChange.getOldValue());
assertEquals(null, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, anotherKeyChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, config.getSourceType());
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java | package com.ctrip.framework.apollo.spring.config;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.List;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class ConfigPropertySourceTest {
private ConfigPropertySource configPropertySource;
@Mock
private Config someConfig;
@Before
public void setUp() throws Exception {
String someName = "someName";
configPropertySource = new ConfigPropertySource(someName, someConfig);
}
@Test
public void testGetPropertyNames() throws Exception {
String somePropertyName = "somePropertyName";
String anotherPropertyName = "anotherPropertyName";
Set<String> somePropertyNames = Sets.newHashSet(somePropertyName, anotherPropertyName);
when(someConfig.getPropertyNames()).thenReturn(somePropertyNames);
String[] result = configPropertySource.getPropertyNames();
verify(someConfig, times(1)).getPropertyNames();
assertArrayEquals(somePropertyNames.toArray(), result);
}
@Test
public void testGetEmptyPropertyNames() throws Exception {
when(someConfig.getPropertyNames()).thenReturn(Sets.<String>newHashSet());
assertEquals(0, configPropertySource.getPropertyNames().length);
}
@Test
public void testGetProperty() throws Exception {
String somePropertyName = "somePropertyName";
String someValue = "someValue";
when(someConfig.getProperty(somePropertyName, null)).thenReturn(someValue);
assertEquals(someValue, configPropertySource.getProperty(somePropertyName));
verify(someConfig, times(1)).getProperty(somePropertyName, null);
}
@Test
public void testAddChangeListener() throws Exception {
ConfigChangeListener someListener = mock(ConfigChangeListener.class);
ConfigChangeListener anotherListener = mock(ConfigChangeListener.class);
final List<ConfigChangeListener> listeners = Lists.newArrayList();
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
listeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(someConfig).addChangeListener(any(ConfigChangeListener.class));
configPropertySource.addChangeListener(someListener);
configPropertySource.addChangeListener(anotherListener);
assertEquals(2, listeners.size());
assertTrue(listeners.containsAll(Lists.newArrayList(someListener, anotherListener)));
}
}
| package com.ctrip.framework.apollo.spring.config;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.List;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class ConfigPropertySourceTest {
private ConfigPropertySource configPropertySource;
@Mock
private Config someConfig;
@Before
public void setUp() throws Exception {
String someName = "someName";
configPropertySource = new ConfigPropertySource(someName, someConfig);
}
@Test
public void testGetPropertyNames() throws Exception {
String somePropertyName = "somePropertyName";
String anotherPropertyName = "anotherPropertyName";
Set<String> somePropertyNames = Sets.newHashSet(somePropertyName, anotherPropertyName);
when(someConfig.getPropertyNames()).thenReturn(somePropertyNames);
String[] result = configPropertySource.getPropertyNames();
verify(someConfig, times(1)).getPropertyNames();
assertArrayEquals(somePropertyNames.toArray(), result);
}
@Test
public void testGetEmptyPropertyNames() throws Exception {
when(someConfig.getPropertyNames()).thenReturn(Sets.<String>newHashSet());
assertEquals(0, configPropertySource.getPropertyNames().length);
}
@Test
public void testGetProperty() throws Exception {
String somePropertyName = "somePropertyName";
String someValue = "someValue";
when(someConfig.getProperty(somePropertyName, null)).thenReturn(someValue);
assertEquals(someValue, configPropertySource.getProperty(somePropertyName));
verify(someConfig, times(1)).getProperty(somePropertyName, null);
}
@Test
public void testAddChangeListener() throws Exception {
ConfigChangeListener someListener = mock(ConfigChangeListener.class);
ConfigChangeListener anotherListener = mock(ConfigChangeListener.class);
final List<ConfigChangeListener> listeners = Lists.newArrayList();
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
listeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(someConfig).addChangeListener(any(ConfigChangeListener.class));
configPropertySource.addChangeListener(someListener);
configPropertySource.addChangeListener(anotherListener);
assertEquals(2, listeners.size());
assertTrue(listeners.containsAll(Lists.newArrayList(someListener, anotherListener)));
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/build.sh | #!/bin/sh
# apollo config db info
apollo_config_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8'
apollo_config_db_username='FillInCorrectUser'
apollo_config_db_password='FillInCorrectPassword'
# apollo portal db info
apollo_portal_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloPortalDB?characterEncoding=utf8'
apollo_portal_db_username='FillInCorrectUser'
apollo_portal_db_password='FillInCorrectPassword'
# meta server url, different environments should have different meta server addresses
dev_meta=http://fill-in-dev-meta-server:8080
fat_meta=http://fill-in-fat-meta-server:8080
uat_meta=http://fill-in-uat-meta-server:8080
pro_meta=http://fill-in-pro-meta-server:8080
META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_meta -Dpro_meta=$pro_meta"
# =============== Please do not modify the following content =============== #
# go to script directory
cd "${0%/*}" || exit
cd ..
# package config-service and admin-service
echo "==== starting to build config-service and admin-service ===="
mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
echo "==== building config-service and admin-service finished ===="
echo "==== starting to build portal ===="
mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=github,auth -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS
echo "==== building portal finished ===="
| #!/bin/sh
# apollo config db info
apollo_config_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8'
apollo_config_db_username='FillInCorrectUser'
apollo_config_db_password='FillInCorrectPassword'
# apollo portal db info
apollo_portal_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloPortalDB?characterEncoding=utf8'
apollo_portal_db_username='FillInCorrectUser'
apollo_portal_db_password='FillInCorrectPassword'
# meta server url, different environments should have different meta server addresses
dev_meta=http://fill-in-dev-meta-server:8080
fat_meta=http://fill-in-fat-meta-server:8080
uat_meta=http://fill-in-uat-meta-server:8080
pro_meta=http://fill-in-pro-meta-server:8080
META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_meta -Dpro_meta=$pro_meta"
# =============== Please do not modify the following content =============== #
# go to script directory
cd "${0%/*}" || exit
cd ..
# package config-service and admin-service
echo "==== starting to build config-service and admin-service ===="
mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
echo "==== building config-service and admin-service finished ===="
echo "==== starting to build portal ===="
mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=github,auth -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS
echo "==== building portal finished ===="
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./.git/packed-refs | # pack-refs with: peeled fully-peeled sorted
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/remotes/origin/0.x
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/remotes/origin/1.1.2
c9eae5410524957ebca97d85eb00eb38fa266125 refs/remotes/origin/1.5.1
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/remotes/origin/1.7.1
204a43779246dfb661da737cb6dffec94ac0c3bb refs/remotes/origin/1.7.2
08754ff73c849763f703a3dfb416393c3ccd147e refs/remotes/origin/1.8.1
7c486fa11e146d4bad65c69611614211bf56c42a refs/remotes/origin/1.8.2
b7acfbef9596e7fe5f6498776ae53be7be3aadb9 refs/remotes/origin/1.9.1
c0cfd647f5844fad470e4ae7278994c1279feb76 refs/remotes/origin/1.x
e3369e5d553f0295e019fbbaaeef2165d543467f refs/remotes/origin/dependabot/maven/com.google.guava-guava-32.0.0-jre
0b15683ae036e4c98dae80de04c4b3e7c2c3c5f5 refs/remotes/origin/gh-pages
2eee86c4ecff61dff5930a6ed276b1fd30b68656 refs/remotes/origin/license
6657a58831a544606f78177b61d92bb959ccce94 refs/remotes/origin/master
e30679add187115bbdc812b6d6ec8398c98e0150 refs/remotes/origin/mvn-repo
f34231b223bdabb4ffcb232c3703129f71cbaad8 refs/remotes/origin/v1.6.1
a4ee45b3db9fd3176f67508648684a617b2254bf refs/remotes/origin/v1.6.2
d327f0703f690457220fb355e969562b75e6aee0 refs/tags/0.6.2
16f4e06379e78e1f03b9b89b5e491bf92fd71d45 refs/tags/tag-oidc-debug-log
af85fa7cde33706fcae6b5c07ce4fd11cdbb3ce6 refs/tags/tag-oidc-debug-log-2
37b6485c7605ccc4b8620d27d1414736369af291 refs/tags/v0.10.0
6b2467df6aa3c286102219e1c5b50efeeb68f747 refs/tags/v0.10.1
03825fa89b799a19be7f3bf0570f4e0c09b92cef refs/tags/v0.10.2
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/tags/v0.11.0
2219b0a23544b06a138fdfbc34a4320b2d9e00b5 refs/tags/v0.4.0
f5373b19100766c136aa4980edcf17e41975ee76 refs/tags/v0.5.0
d0fdd72846a0b2530ca9bc1743b3f52e864ab6ed refs/tags/v0.6.0
8372040f85896a93b60ccb14610c2bee2dcc9683 refs/tags/v0.6.3
aeb9230b228b641db443d0d0a9b64bca1ceed9fc refs/tags/v0.7.0
5bcb4095bbfdbdfbe4e176e00d3ce9bdc1a099d7 refs/tags/v0.8.0
2f3204d4181f5d35d7ee2ac5dc3b2c632be7f05a refs/tags/v0.9.0
ac10768ee2e11c488523ca0e845984f6f71499ac refs/tags/v0.9.1
a3cf5b2b6d8462e37dc90f327e064964323d2a80 refs/tags/v1.0.0
7b8ccbe13c2902ebdd3dcffd5d6dd43dd824ce80 refs/tags/v1.1.0
c22ac5637432c3c557bd857314401a3983e704d2 refs/tags/v1.1.1
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/tags/v1.1.2
dcc49834f2e3b12738c83078d19acebd2e336dc1 refs/tags/v1.2.0
d1ae147711af31ea522f988acb36a5c1bf3a4456 refs/tags/v1.3.0
6b0a06a4682e8171cc17f5f61ccc8d87f6871b6d refs/tags/v1.4.0
0d824bb9085c66d3e1bcb8e09f53cf16a978715c refs/tags/v1.5.0
c9eae5410524957ebca97d85eb00eb38fa266125 refs/tags/v1.5.1
a2ae4ad8a8442c7f7842803b50b7783997d2b984 refs/tags/v1.6.0
f34231b223bdabb4ffcb232c3703129f71cbaad8 refs/tags/v1.6.1
a4ee45b3db9fd3176f67508648684a617b2254bf refs/tags/v1.6.2
27aa832c8dba550aa12184fc106790bbe10791e8 refs/tags/v1.7.0
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/tags/v1.7.1
b2cb90e93dbb2eea3b94783a1a922afbd1fb6063 refs/tags/v1.7.2
891010618214b8e826b3c124f5572988135ade58 refs/tags/v1.8.0
08754ff73c849763f703a3dfb416393c3ccd147e refs/tags/v1.8.1
7c486fa11e146d4bad65c69611614211bf56c42a refs/tags/v1.8.2
772d2fa862b6622bbeb31b50437680887a35e749 refs/tags/v1.9.0
501e4b95db4f37fba411266ff24e7d7f460649b8 refs/tags/v1.9.1
e4516e38226b28d321135311f5fe23723ea63bc6 refs/tags/v1.9.2
cb308cb7a9b08178046f747c1f02c8385eeca28c refs/tags/v2.0.0
a882f3e8a0fec0e36d2cfcbc1ca44f0818d7b1cd refs/tags/v2.0.0-RC1
e04028dfe9ca3e5792be89b96a6fbd2ee80355b7 refs/tags/v2.0.1
60bd514df37a8cb2268a5e945a862dc86bd81445 refs/tags/v2.1.0
ee1517be717283ae5bbb990fd2c5a809bd841b4b refs/tags/v2.2.0
| # pack-refs with: peeled fully-peeled sorted
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/remotes/origin/0.x
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/remotes/origin/1.1.2
c9eae5410524957ebca97d85eb00eb38fa266125 refs/remotes/origin/1.5.1
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/remotes/origin/1.7.1
204a43779246dfb661da737cb6dffec94ac0c3bb refs/remotes/origin/1.7.2
08754ff73c849763f703a3dfb416393c3ccd147e refs/remotes/origin/1.8.1
7c486fa11e146d4bad65c69611614211bf56c42a refs/remotes/origin/1.8.2
b7acfbef9596e7fe5f6498776ae53be7be3aadb9 refs/remotes/origin/1.9.1
c0cfd647f5844fad470e4ae7278994c1279feb76 refs/remotes/origin/1.x
e3369e5d553f0295e019fbbaaeef2165d543467f refs/remotes/origin/dependabot/maven/com.google.guava-guava-32.0.0-jre
0b15683ae036e4c98dae80de04c4b3e7c2c3c5f5 refs/remotes/origin/gh-pages
2eee86c4ecff61dff5930a6ed276b1fd30b68656 refs/remotes/origin/license
6657a58831a544606f78177b61d92bb959ccce94 refs/remotes/origin/master
e30679add187115bbdc812b6d6ec8398c98e0150 refs/remotes/origin/mvn-repo
f34231b223bdabb4ffcb232c3703129f71cbaad8 refs/remotes/origin/v1.6.1
a4ee45b3db9fd3176f67508648684a617b2254bf refs/remotes/origin/v1.6.2
d327f0703f690457220fb355e969562b75e6aee0 refs/tags/0.6.2
16f4e06379e78e1f03b9b89b5e491bf92fd71d45 refs/tags/tag-oidc-debug-log
af85fa7cde33706fcae6b5c07ce4fd11cdbb3ce6 refs/tags/tag-oidc-debug-log-2
37b6485c7605ccc4b8620d27d1414736369af291 refs/tags/v0.10.0
6b2467df6aa3c286102219e1c5b50efeeb68f747 refs/tags/v0.10.1
03825fa89b799a19be7f3bf0570f4e0c09b92cef refs/tags/v0.10.2
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/tags/v0.11.0
2219b0a23544b06a138fdfbc34a4320b2d9e00b5 refs/tags/v0.4.0
f5373b19100766c136aa4980edcf17e41975ee76 refs/tags/v0.5.0
d0fdd72846a0b2530ca9bc1743b3f52e864ab6ed refs/tags/v0.6.0
8372040f85896a93b60ccb14610c2bee2dcc9683 refs/tags/v0.6.3
aeb9230b228b641db443d0d0a9b64bca1ceed9fc refs/tags/v0.7.0
5bcb4095bbfdbdfbe4e176e00d3ce9bdc1a099d7 refs/tags/v0.8.0
2f3204d4181f5d35d7ee2ac5dc3b2c632be7f05a refs/tags/v0.9.0
ac10768ee2e11c488523ca0e845984f6f71499ac refs/tags/v0.9.1
a3cf5b2b6d8462e37dc90f327e064964323d2a80 refs/tags/v1.0.0
7b8ccbe13c2902ebdd3dcffd5d6dd43dd824ce80 refs/tags/v1.1.0
c22ac5637432c3c557bd857314401a3983e704d2 refs/tags/v1.1.1
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/tags/v1.1.2
dcc49834f2e3b12738c83078d19acebd2e336dc1 refs/tags/v1.2.0
d1ae147711af31ea522f988acb36a5c1bf3a4456 refs/tags/v1.3.0
6b0a06a4682e8171cc17f5f61ccc8d87f6871b6d refs/tags/v1.4.0
0d824bb9085c66d3e1bcb8e09f53cf16a978715c refs/tags/v1.5.0
c9eae5410524957ebca97d85eb00eb38fa266125 refs/tags/v1.5.1
a2ae4ad8a8442c7f7842803b50b7783997d2b984 refs/tags/v1.6.0
f34231b223bdabb4ffcb232c3703129f71cbaad8 refs/tags/v1.6.1
a4ee45b3db9fd3176f67508648684a617b2254bf refs/tags/v1.6.2
27aa832c8dba550aa12184fc106790bbe10791e8 refs/tags/v1.7.0
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/tags/v1.7.1
b2cb90e93dbb2eea3b94783a1a922afbd1fb6063 refs/tags/v1.7.2
891010618214b8e826b3c124f5572988135ade58 refs/tags/v1.8.0
08754ff73c849763f703a3dfb416393c3ccd147e refs/tags/v1.8.1
7c486fa11e146d4bad65c69611614211bf56c42a refs/tags/v1.8.2
772d2fa862b6622bbeb31b50437680887a35e749 refs/tags/v1.9.0
501e4b95db4f37fba411266ff24e7d7f460649b8 refs/tags/v1.9.1
e4516e38226b28d321135311f5fe23723ea63bc6 refs/tags/v1.9.2
cb308cb7a9b08178046f747c1f02c8385eeca28c refs/tags/v2.0.0
a882f3e8a0fec0e36d2cfcbc1ca44f0818d7b1cd refs/tags/v2.0.0-RC1
e04028dfe9ca3e5792be89b96a6fbd2ee80355b7 refs/tags/v2.0.1
60bd514df37a8cb2268a5e945a862dc86bd81445 refs/tags/v2.1.0
ee1517be717283ae5bbb990fd2c5a809bd841b4b refs/tags/v2.2.0
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./doc/images/local-development/PortalApplication-Home.png | PNG
IHDR * n G
iCCPICC Profile HT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&6 2z,@LGhh@53U hrm:Y߯Ws29 @('r39(B#es\2]6ININ;Ss"¼P @aE) ?yf6'Cl!({ᱹ(ltlOuRR3QZNL.y? դ-
q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,, ܃ӟ1 C9^7 g:3H@$ pĢ f$toӁ2P gv B@@ l@9p -, (!CT)C.d YA+AaP, @H CP T j_ = F`
L`= v=@8^< UQ ߀< 0Mq@$IFDj)E
Bn#50L)㏉p0011L36f 3bUX', M` jl2.v1p8{?.[یۋkuzq1< 7ƻCl| ߇ & +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|
.* 6͋ơ ]
qt}:J/ Gms+)JCb32N01Q1'iΦ9
s|R䮔TԨtW2SG9Myr }*U^ϥu˙[4܇j
Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uu u tyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs 8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv
v#: tPW k :~qsr:ss<yItra t2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M [RcqX U)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[# ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.I NqIّ2s^S? IHNo d$d(/]+4
%˜Z6*
UgB2[7]+?D̕v/7Zi<_V`VpVt\v*UWCWw^Sf(/f-imY+Ya}
~ e
E7 M֛lQ-^lQ\Zm3g-.ybKv[mmlm{M|I^ ;;v~صdRIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU >p_ ~V.~DpDRVs־Nnk=\/ 91c
q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅aݹqw{Ks?HaG=)}w%vs= #oCϩK_h >;;rC_Moo ޜјѡ6W~͇αб 3>*×__|+nGB=e4d#; 5 - H2 yJд"xGO u. D1i, DZPft-r jMJ'&ޣohQ qڛOJ*,,64UeES @ IDATx \T?0 ;l,&פfmm{{M7mӦݚikILMѨVŸ
" 30y, `g 239sI(@
P (@
Pa=(@
P (@
P (@
P (@
P=F s)X
P (@
P (@
P (@
P=F s)X
P (@
P (@
P (@
P=FcjP (p]455ŋj.JR^F#L&zꅈڬ':U@ԩ923
P >*Hh_dd\yb C
ڿ0X ev ~ X
P#PZZ
͆T t)(@@@=GgҮZ\v\OF
P\ jIơ>'G
t^G||<Ν;*2n7ng (@M@I vX_
PP`^qv@pïVVo<N`Wf(? GKw$&%iE[וu5j1i v ;ε(Ləs'WQ:x:(pThtR+?Au+܍LJ%tAU;?pM*=9`K3"**
F /{& `X`WN<>[)}S;ؗt\GL۷y 8%Ɂ_qxxۿUR>
Zd\C=ڮXSo~#vr;^V 2쳘`bi 8(@
P (@
\'(߉P0w!<JG6غ([i+ڃ?kw9#\/!>j2N֫ IΓ'Pq˸LSrR`, R}/؟>ap
P (@
PnN T X<ww=XS429].>ʯIv6B+m%QZIAVzgaμɋƆJb*96g?l"?.-ԑVly} Yl!VnuM?ۯtuXl 'nա?
/f)@
P (@
P^Qm,ǰd}!{V¼ga9?Sz^DI7 [k0zLTZs0t@0K`]]lF tb FԸl$D`ѺXUV n0J7OP`Eh+:8rV%3J%R:jq't!Y`UJ]R7tu l9+IyXhOO 0-+RU a67!*.:CʓuD`F>
ё ۑzX
\fǎ CII 괙H0hР:T ;v`֭Gqd2u(O vZwE(ހ-US11ȯEBPG
ild'Wx;6;'ߌ>vmŞr%Ɣ&Oǐ XA~:2"}Mm+ w!\Ʀ&VH2Mmt '$R%|:IHJ5by]=#ڃ?'pغbj, b;.i_WS ,oosգ#}ۻ= US!*XW, (@
tk:߆EVds0H,|xZϸ)M|X<<n}}qJn}IߵUHHC;jJPGx\ ='n8ol==C: lLłEvjO`({ʕ+f 9zVl^^ ͛Mڪ e62 )+Oݛ$bpNr ?x
mEXb"*syۿ""m}~t;֊Oy;XQ5f
r*
zEjTki ǣ ԇG+^z.x;^\n,ݳA PPp{.9)|X's(Et|6[ y1vyok{AlY ޓ [_oW1֠E'U._JZbJj۱s3q.Ai']?TlDXSuغ넖Qܛ00%\D=w0Mx@16臽jYܐ+ͳp ayA {vYp
Ps9y=MEbK <>{9}, 7a'aF^<{̗uؿ\p4Yd){Q]G͈K 45RE;1H(- MF< qh
viu2phM;?6̙$q2" CA
{
>W\"TꘚR\lnz썔/FӁ(Luz>J_ $x)JRo]p<0w;plF㾁zXE~.LG_kO ơ:L$N6s5UV!"ZFKԱQꪮO{>j˰潍) u}LCZ pTL$gMaY^ kc7((yf^ڷ2>> x"\.N~;\MTz3ĥXVy Ux t`R]4rsqdl_Ϩ@k~lry
~OF ۹=wjI2UUUȑ#3fLM]VUM=qɣ8_%tβ=Ιc\ ff|Ut# ?<`sGz z8eHĐ#m
C )$[8/Q<< dS<%*A
< ̇ K%`w0 ï_x
jN wÑ*q TIص(<3=۳_ۿJ4䋜{ʔ+Qņ+ =)#1R@Ԭ *yg%ۊE * waS]2d,5 [0mH#c@npfexuZ.u3v WP|IuK a⢧q=~afkyD
P^(wT- Pn֕o :.ʺF=vuu1*U%ntr' ˳^
\4KȆFbV>囍K ;QWmfd)!A
;JNêO< Άj)]}ĹjԧHdL*Pb>tղ!y
,.bAɓ TD$HQ_|
MarZtRNZD4X#: nhpI<*V Lչ$r/8$A&U8K.Tv^ ,U]Y_0DLM$p"]AO^. %JO MJ$pTZSSp 1F29t.cZ*$H2pdsU*H 4Q_B' Sp ~[ B
TTT`ݺu0,\C㪫MkAP[[x1 ςK G>_
2^숨Ixj|&<hZ ~O'^Vۤ[MU7h/ ƅJ K.{`Ɇ*𱩦U$Ғ>r_{ͪ~h./٥}")Hs6EgUUk֟ՎtaYjаeY]
Y~-0ϔ o^pl< Llnp _
>0ůWc__G2X~zy5~!MB[Q:_)cux
'6^]u)^Gy c@Qoȑx[.'Om$ܵp,Y\TUr32^EE} q`^J93 灹bARbw-ysT. TPi $[ نN$A/
TѪ?b.Q^?~HM: {ES+(@
P|r&_NHܼg`a[u_LX{gވ FZ[Z䊊IZ8Ȳz" egc1_zj2J>~ :&cldH+֞<!qhllԞj;H=E>eN@'{I<1,C *Ef c,^ct|ͷ*N>R } :yBK(L ίh& &UV-u#,q kIkIݯw{T;/+o}HZqM 1"MKZ1<wvZ:}(q\?9ٯN|1ٸ)[ ei94ވ6Bٸ-@Ɲu_ Lö| NI -!j
P#Z x[W :P1}tޟ}f͚8iER6{yDɸww q7<iQTuʽz< C=7f(OIY ZsxjwM=nA4i
6jw:!/JʠwxG ~i I msl:'~I'f&R8h~n9>5R
GcuCwU--/nZY_AeΞM|e9!x78$9Y Uュ]rShЩ(1"3Hl =2HJy
$k s:<:ol ^;Zbq jŏq:KrI Cߴ9y7 ojFU; ;/^FDJ-^uy-?Pr 6 UQA#z; zPoNRA6%
g T+ɮ.<`=vo`\,} nmߡg/]{ RTh+J ᶫFӜ-(@
P }T83 ڃB}? N DC~+bV`\nJ}iXY6{{n(=[}clAQġS\l yx!8|6L77t+U] qGvc+ب9õ%cd!:Z}J1&♂-,6I BjDEXp]|T(<<19(! "<maK7p.%` E"ͽ
~ƍ[b
w1 Z˕(~ W-J1G0[jݒetRQSt
ҺjgA, ES0,_6>M G Z"|t< ǝAtUֹ_\ PgzSyy9>CzURh H =
FK έ
Fj5w}&_zO"r.Q:nYi,."k3xQgǏ^؏/߁ｔߎ;JE 'ЏJkx _z%b)-1 &x#7S4t)2R"/^_2T'`_-A
f-6nEqE=w `j<Q nfɈ;ˏAB|_
y?3v?$H1<9ϽYoz<!7\҂'P2h]LT6y?AG_)<Qǰ/`'2ކJA<Lc2cX1 hIós[viTv"M { Y \.#=@! SQ*"_D,ϙ ٯ{~Iƀ9ykj<ʽ%m3Qslߗ^yk/ϛ'S@{hPXgCҏ%OƏ ɝM&7gW H2FM̆pϤ0XkaeRia JA]DHk/Ƞ[܄;$0wqHR6%ΡjМT덺URյ@ΧU/C
L:d0>^~8(]SKY*pP¶A hU
EC[-Q~*7}5Ip,S[6(y$n G Oʥ{Mַk.,q$z,vO˓⽥#Z܁6z땚%|ψToR
;߮>}ZnHjS8'^YCk6i5'ƙ|(*NYJk5Yoɜ0I|Fz]VqF7 vZ..5k{ ~.A
wp e<Q U2WU tg{5 |wa _%sU>PegAsG~$lĘEߕ EsLx|kzئbTj e˖yj릛n)\Lg:ńQ< eAAd96i~JK.mBQ8%*y|0۵('龖#|[L< q0 ZLlg
JZ+[ZI.K+$
` M|yd6!ʀG롓.-{fBUI<[. ,GlwVE! `dos ~[ ~mIm\* p vQO"?BBU</<:.\G
P] &tx%7 i} 8~訌+(2 ;j1 Hnd']:n~76j8c/.ӏѳ7'.{:dZuݰ? Ճ% F!O{ t)2>F~ gK
1LfFzi\/-{5
qa4W֢.sPa #Z cy!w}SUX+tɷ#o+^B
H+sTT
صkWYR[5#XSB_ڀ%X"C1&;bK!B_({6ghi {c7\`6TUA6,6r.ލc@w}>:s N`xr7p9 @);id <bpFDq8-qG`XSkPUW;}Lu/ɸ#8-{vl>P"Z邠+t/5C:SA7匯 0赗ME'{=;XnZJåghʠYqҧ+ QU$SJ_L9PmB%լȝ LGc۵Qxmwr.+DHՓZo%ԻOTrxld>w G_Gۑ?(@
PCn 8/OdIO̎h|^fqMq-ND~>GQ+SZdDb >|~uH+ݏi nUe31Qs̳Q(.B=H-kj?*2%O7ERVYӅ2
~jXEf-^Z,8S} jʤV"*kemM-jO (8t
C k)v>"K{ex/J,+T%&I7* UFqƪse)*Po>Ġ@̴?y+4"J
r_y@xE2 }?1L/,ض9JoRLI
G瞥Ir 6{5^NHHN (US'|8efBnL.97J |:UG@/NV~hߜ ^\Є)ͫzSy k-~Ӏ)-~Ƕ V\ ƕ_n=uc}K
YeK6j0܆1y/!;VsH~5*EyLU
=osyqvf
0o$w$H2&;) /dJ jY^۱wɟ]:jz0t HO +$!3'Y= t7e/cW1&P (@()O #1Bfcn21v ("5Psr:dcg_ '9{̞Uc<Ha6>
6SMsgZ0
`K8b{X$hjq_b7_-:鴹5䐁d gBopǖd0YR֪Z?JF|AN ;*0V+*5,ﮗ LٞD[Sy ۆ5-Mvʠi{=P W&ׯR~2[Ck ظ 8UiAɸ%#^ltel-M, R@L2 >E s}Aumx7q!_6&6NU0׆?! r~*ƴ9IԀ+<*}C?3e&Jظd8:àYrzʂ ,$Z{ _6n܈̙3G4rGN xllocf$J\x YqXߗId)+/m@S<
?`γw9 eh,ȑa1|hO r bгy V×Eq1ȗEw3@ŁU=7F=6Bc?Y9j`(ۀ 2f$:^AOX,21_vU=BC&r|OZlQӱmru>WCY); mrC֎={EogV̀#oBjx/`m{ .\>!xSznw
SI<qFT5H&WXw (@?)q@ )^^;݉҈L=0 g`7 \
"*62EJF* p2C 5bCX% OL# =%!H}0H_.dx
kߴ|q6 r܄S2pCOT 2Xg3YuIMZ:1MF^~ ̪Nꑕ sz<ڶbezN &T,
C yf,v*.4o4jR),Jm2g%'{=͇#sȬxs mI% \x6_Qelu+>PepmU* Fp#O,E$ԛT)_z yXݿݳZ2"o")wQ 5rW$}uԑ-Vs.ru]Xzou;ܹs}UAsG!O i aKvn8ۼIM8(YXߗvs +~2۞_ܺw]] VXiYĉ{1j(ƿ̬oϮE 6## E2Qd~`ŁޏA!c ~Iwb_nj_~DE ķ0Jn 02+H >O<EL?"vnU+ڕ?._嘌t62 ̙ Oq[ 'Wqg|Yv.YQO-;[v|F̌GGVbCE+5b~յQ d P܍JrqS:t.RZi)MJ*Hh2*0Z1j[2DIQF5pgL'sO~_/u̚NX*0`)7e#J:0dFaMCsnARmgʭ (py8m숲2@ӳx ȽUa'bѢ8z%vX5.,߄#K aƬ9Hꛦ%!<a "7[O`㻟h721[1I'娶<̽MƱs`\lEΣDɓx.12w L*F ؉sV@ wr3<a'` V$IӬ6K@es
iPZVB}+
xŝLYpݓԂd,)<u) q2H "1PdU CSXd?axL Rk@yY5d`wI@z;\B벇q
P@MnucʕXoFK^^6M?NvAD 7vgH{7aƨaA?S* \$[iA-lemvsCg/WVVjcR/T gҥ8{718 9+]ݣ=&5c[dpF?{| 51e+J[/:*/4& 滗 6 =k_ ~`t 5O'(>rHhʐQ籿_=lQ};1iΔ 7R n8Z'@;ү)i {`yF̄ &m%@:~xR+%"]X0==vʔ;vQ k5% 78L;v9)MeEqU1'M0l2@dI6''wPy +MTS L5atrmLeȐxiw c?}w=6wF
P|.ZڎҳؿWNOlq } LUzjvl>\(7I0-_u:sw xA>ÚT>T1 g?"
e8C`9!] 6c:Dd`hbs!cT ;1ȴ i#pe
2^F ƢՕ2xY#rzDDc;∌aJGVS㒖#xw ~ #a>:m?a@Q 9AX d|; U,M5(9yubcn<K7 MȐ< %xl2+tzQOц%xeSˮ-2h>tYHe
Pm4=77ǎ Ӧ U
ҐA9؈[oQ f FgcQy9z8uѷ0/pH|Ȕ ,1eV{~v:)+fJ%㦉~o74o1( m11s(&7o 0kc} p\.|zƒG*Tջ$"-ahӨ9ӱ?p}>F^!;ߌ7]!7Xg'XSV59̹cџk=~ NiꨪM+GodE =rhRx6Z8^aT6e4RvT ##qqjW M #\GX!x2αO"uv
0:de&2
o`'X5j\U16ܻ $S.,i]ql 5=T
Df%& sx (@I
wDn$'$錖+" '$"c v ތyBL-> RN, #xe6 s!"1,wJ[^WpE=vU9XZo$[BE<XiØ?4?rW: "ӥ̂yH+{o_Nez<s 4i= M!Ӹ9 w6 ([~WܗR!Z)z_v!qntٽ`ǡÎrBƺx;Emҽ'o
oHW 됶%=12X5T_
YZ &5@i8Y{m;s@[_97(J@?1~x_}ק, <)j0kZ܄#=}o6 4y@_mU`.>.]@vv=v[Y{2 dN̾kJuVo̜r¯"sכ2k- ܌ɿɐ3 &' #waKHYKeb?Քt~U
͢ :zok{hQV/F` f[4.
?_[&[LvN3_(6ұekIFCV^u SMh45x
l{yէ)7?;k3Kn (@
2nݷBSt-ϐd~ ~')AGڀ2֥H0awcp%ǢoFvzГפ1[ fx; u
$z yr^Ξ-?c1z|ȣ5z`R]X - T' B\a%R=A
ud^s\4dߍ)_j
1k>b%P_aR# dk@?+ 1=%x O> {:r}ns i[2$3A}D RJ)m ˜&)
U°Uʄ 2q8KsSJ֣&>] <
+oC~| Iwĭ}sZrȂp'/'7)w`Z_G^"!'ݷ):Ƙiދ#;pByd@/is1" mn ruyey/ؙһ5oD7i
ʹka'7LՁY;Zv@fj0M pl/ =c?͢<{ܨffեgB{R [x7(@
t@tkC$~eDؖ!FHK"h2-=;DNA*e~}F߉/Q얇x^ O ~!{^ߑ ^>ڤyAQ-Л7ܼyZnJ ExTxH?/B
P=S ݼ:ȍ,wU)5
z @aڔ3 E;`3M _ګ}Uev~|`B]SM lNZuwxoU ~jL)HYN*/+EYF UCXRFL:Fݗ$,'z
Xp?j !vmsB (@
P (pmm,MPT~үϝ76Ls+̇/
,M2Yӣgԥer4>OtߌJetWeŨ. RpqҒÓ͒-+( 3da-B|p!,.ُUGCo#3<zŃ^au;(@
P (@
t@uP+De4ע_* e^g'q5oÀ8 RҐ F f\;d 0Ȍ Q2ǸA5m6ΦsHy
lQ2h+R'u&gTg1e1E 1KPnzkL55HV)@
P (@
P \}xc݅ _~Ӎ%*> @Ѝ¢e䒹I,L&КYS*{bԨQZ` ( ]e&ЙΈO>a(dA
%v(D8o
P (@
Pn
T )9yHSf (@
\hU^m< !k{.nDy (@
\ICy(@
[=7 7U9S RW^ڌSXښb* a npުc2zze(Miވ<g
PC /^DUU
qV<
P=C@uP-)T"""gT5`8
P (@
P B Ghn (@
P (@
P 0PqY (@
P (@
Pm- (@
P (@
\c*18 (@
P (@
P m (@
P (@k,@5gq (@
P (@
`"
P (@
P (p f5.Q (@
P (@lQ܅k)@
P (@
P*ER (@
P (\.\K
P (@
P@70P
, (@
P (@ TwZ
P (@
P An@g (@
P (@
`" R (@
P (
Tt: (@
P (@
P ] (@
P (@n`Y$(@
P (@
Pµ (@
P (@
t ݀")@
P (@
P.@Ep (@
P (@
PtI
P (@
P@p*p-(@
P (@
P @E7H
P (@
P 0P܅k)@
P (@
P*ER (@
P (\.\K
P (@
P@7>*A7"V`AP G
P (@
PlQ/+H
P (@
Pqq5ϔ (@
P ( (@
P (@
8 T8ךgJ
P (@
P TK
R (@
P n *nk3 (@
P (@
x*z%b)@
P (@
P7 7εR (@
P z = (@
P (@GZL)@
P (@
P=^ XA
P (@
P#@ōsy (@
P (@ /@ED (@
P (@
P`ƹ<S
P (@
P@0*`QQUz tN͛LgX#bbbbJ{Ub(@
P (@ Z7o8]|̇7YHD/
a VO (@
P TӹS-)TĹs3fn=Z@5wDdr (@
P-1*n___N'PʇE0Q (@
P Tu sFG'^O٩:gTe֕ (@
P/:O (@
P (S8FEO2W
1ENTqr7vǰ (@
P :. 7d=\opLsSFMkQ (@
P1آƼ7YgEO%[!>D;Ԉm"H ^4P<Y
P (@
P=]-*zb:,u |\UC[
P (@
P TZP (@
P ( Tπ (@
P (@ #@E(@
P (@
P To (@
P (@ #Y?z̥`E:"`G;7e @ IDAT3ĠYAҹZmk沶Z (@
P ( Tt1KB.#) Yems9yu .T5že3`HW (@
P X.f]+0 v"qC9.,Q ,a=bI?qh횐yr(@
P (@
t o @ZR+*l; rZ[)zEBJ`هP@
P (@
P ?R%B <,ӳ8 )@
P (@
\^-*.o=z@aV cMVe#ktȊz1qH/>>
+)@
P (@
P:[|
J-e <LD>%hX$8qܼN -} :V8\M8f^gq(@
P (@
t ]ܯ@e,irgnRǪzWR (@
P@
p.e (@
P (@
\ W})@
P (@
PR*S (@
P (p% T\ (@
P (@
PKR^fN
P (@
P0Pq%Zp8ch4:,Q< V (@
PYӓ~.M(~aqsqsB49 95M, (@
P (@ &@E N kدP +DBN1G
P (@
P &d׃9~L (@
P (г8FEϾ> (@
P (@
P`↺<Y
P (@
P@`g_ ֎ (@
P (pC 0PqC]n,(@
P (@
Pg t`ț0.S@l8NⷐCyL"H&2
VT|5xLMYVi#ZL(TjhH^q
(@
P (@
P=BS`Dr h9IC+ (ŎB5g_2F">" fomN`шt S .dcj|ĺhrI>:HPeJНO_c3Gpڂ &sAs%(@
P (@
P+ЩYWC MY@?8lG$D4LȞw}]胬,Ćr6DH֢bCzBTN.쫍C6La༄OQe+5|"&$fڰ{k!&"zj#aZy6i}Q% Laa&d
|E
P (@
P@ tjj
9K_{,
; Y&i2+3?GVI9farש5Yn(d|QB dkhXw[-RVS;X~S"8mg!
B*?έY o{x4w\A
P (@
P@ tjb|/]7á Q ?xhgXw7 }1'}ɪh5 L}qEi8"%`QQg-cT+ i1M:{ F Y h
TVX|ڑa)C)?>,^6.?)@
P (@
PlNl7lpSƏ:^n-N;"2.Ìƪ7mC~&T9T =ބ7!f/hx;`Q
8r8iu Zv!uH.;- (@
P (@
t@;(xB
y=]4@g1o Ji r(%6~"3.Źe
/ȨȊ ]:H~w]?"V\۳gٰw-ipgdS 8 ʉq;f]%^̌ ,-v1'YYjZʗ (@
P ( H).LHuM
I̵$q\mFԡ0hF}FdbrLFiOCC
;!iR Q7 B~ܓViZ8/:[ T#F܋] 'ј%VH~pFvAZF8Qӄ!ɃQ6*SqODymA┿{\Z-
Rf m0yS;]L9`db-tT].x/`Jg1?
P (@
P}}GOHM:B$u&Q~7*d߂d8JAΦXSUױB>f\{rС!,3bcc+V r@rz=~ںp%Wwa{X;\Ѫ(r+7L*8LMCtl Yaz7@` Y_j,I+\ TI j!c5_zk|7#*^FG˸(!_"qi0}GN5Po X^
Z ځ+(@
P (@
PMN THH+@A MC` HAjHO BJXk[Ut250`G>±0XWVɳl L 4/z /9 u?]"V R{:HY?lQ$u7CQ2@d&}kd,C@̃u_S|(Z#G
F :$ -[wO {?LMH?ZT̨L?"#GvFlx \iߋ
?l~FH&
P (@
P:N T?-~o'IB hK73{MCpO8!%i KSOkW"?wjvq|*ɳERhB_ n&ܛ|%OCܼVTol=H~Lg'0K W'}g"Yu~dBJ:,
c M@5. Hå/ GX*ci=&CCq\dsDlthHL$r U0 h 3L9Ze!硵i+(@
P (@
P=PHC9z0 =_a LKm rs*K.OfGiS-b ɯCVo`Bjݠ rMS0 fQE,8c7 &ŧ#% CouS@?Xj.+V븀Kq_/EƂѾLkϬ[.2ԥ g5j8
6\|dI69;vEL4Ο@0a7S^;$ ?ݐq(@
P (@
@Eiã~ O#ñ=&?c4W7s
ȗٽj̖c{E>KCl<Eo҂
|2ܒ @YbRk)rpl+ʎ)3HSa#Ω@P" =T(ނ(?qYm
ׁhg$Up KȆͲ j@%8%a κetwb9~bz
P (@
PW-遊` {˟pƯz%;2DBkM+_ƻ~ ?{u
̥_>ÓHSD꜃ EhĥN8vq
eOQEA2[L8Ū4rѲ;1h1n\Ukb 51Ue :\0{jǨ8UR9$x/ f9ޗѪq4v.P (@
P@ h8V5D~M{l<-\:~!w)*6n9Ҿ)ō
55
/)?eyefh]"2ęcDZa
ØlX`I2iuT $#^gad ^óW 53/(@
P (@
t@*:s)` E
T7nRaWZɝM=Zk3b\b QxM8e65{ ,r\j,1bX(fFiG|;>Ż^{Fˬ Cr7(@
P (@+`x@ Pz? x<<d6t8=UPÐ $ٌjKj#&bj@4mvb(֪ ָ %
.Bjwʑ ň<Q3}rf$q KD!3dɨmPi_S (@
P@h*Bp5HŌ/ C Uq:wf|q$Tk5 ,YGDD*Դf;ܳDGa4npdŚ^'ߙ Cz@Nl$Yl=r2l ~+B&, CLa@ϗ (@
P T+]"r3L%L[P]۪d ̨xRV0ֳL1J8ҥ#j<&'OBb F
! eZwad2KHi]i\(2~ܨ$'AvzjQlڃw
. FL2Kc] (@
P нun
iAJeU ߝOY_NR֩P-*&ߎW?ȴCR|'ZS &n*R (@
P [T\ވ{ 35j%)(@
P (@
P xFv$
P (@
P (JP2\O
P (@
P5`⚓@
P (@
P B 0PJ)@
P (@
P T\srH
P (@
P@(*Bp=(@
P (@
P\kN)@
P (@
P%@E( (@
P (@
P 0PqY (@
P (@
P% (@
P (@
\s*99 (@
P (@
P d>a0"sxf<k
kjϮ܇ (@
P@ 0Pm
p f=B Y7 Q1Q=.(@
P (@PP'bJCu] \.ҕ+?'3j%ZR Eo (@
P z =jtq] e@BUՏ%2 DDkA
7D
P (@
P' '_.QMKR sfI
P (@
P Ǩ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ gN࣪ο&:BH ePQAkVmV+֥Ֆ*U " $@IHB @dd;3,c| >df~C
P (@
P<*:ϒ[ (@
P (@
P[
0P-:(@
P (@
P'@EYrK (@
P (@
|K*% W (@
P (@
P<Kn (@
P (@o)@ŷ (@
P (@
t g-Q (@
P (-\ (@
P (@`,%
P (@
P S (@
P (y Tt%D
P (@
P`[ru
P (@
P :Oγ(@
P (@
P T|K@N
P (@
P@ 0Py(@
P (@
PRP^Qk (@
P (@
PSQ)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
ttKl!F
P (@
P 3*]P (@
P (1*:ĥ(@
P (@
P ^@.(@
P (@
P sR (@
P (@
xA
/ s (@
P (@
tL9q)
P (@
P @
P (@
P :&@Eǜ(@
P (@
P^` (@
P (@
P `cN\ (@
P (@/0Pd (@
P (@ 0P1'.E
P (@
P2wA
P (@
P@ (@
P (@
P Tx (@
P (@
Pc Tt̉KQ (@
P (*]P (@
P (1*:ĥ(@
P (@
P ^@.(@
P (@
P sR (@
P (@
xA
/ s (@
P (@
tL9q)
P (@
P @
P (@
P :&@Eǜ(@｀*Ϡ|^Z ==j:)ϿKi1p ikm 2vֳSvK:&`{cP\萀oCKr.%>]xx0@|yom/n|?\4/|9T|Rl,A݁2Fu}=lbi\AUUϞ¹z\[?]@RTcGƦCAvv?C_ u]iIѕxy& qIX!N+>SX10w[9m<U@H313<?8jL~lZO^v?. b/-xџjn5&RZM9.FD7$i+;*mi>xi,ݲ I8ࣵ GQ^[jX,};(--S'p C;N^6svnߊ%=q l]\Xu( U#Ui@cZ ?3RcmgG?YYJ
pG>?.oi=Qx橗i 3 ΄(@
tX% (@
|O#rvGu.0h`4XLMS
Up m85sūKvȣ>fڲ 6l:~9g P}wM O7k|ƶL=jM3!':<QRbE%{Ӌ0cd-w bò?"*F-lh,-Ө,"q;.r8sW@b<a.}aҾps`fe҈<9zu( @I䠸 rlz) ע2W[llU. c LFhܮ$l*`%q7sNZa NYc< wG_JH/=Ū,G 7 1h_^rޕ7j`0 w{I^-Fϋ" nO F}Z<t?oES{۱I<bY
2B< Ē4y6w?**)$PlQX5rPi+p<h[S)@
hfo=CS N6 ȮU`ѐ@X&[GX{eWͮ̄ Fex\D3qt tZ "|PXe|2jEL:"=|X]I
P&qH*
{AM}eiXg 9͎^r5|cZ-Ñ]9@l6 5U4`pBlXlH߹Y5GIV>SF,BJsMeqn ,BBZgY沈RM2HL*@E Ίϰ[Vȶȓ/ѹ *sqLܔmn1Wgr߲Xp`^]/qq^pb^ cM BJ~ӚU8 !Y%_aOyɂ0>lޝ5WBk{1II@#uRi^N㥲ls 05ȖEz CNJPM } u *w/~J,ZpRhU)PG$eoav*zl* Uϵ@~'jKZ A)*"*9bINRYa)1(OV lzA@Q@%?W;/6MNHJ_kP,HKfQH@L?m_6ιh7on͂]3*>+4n>K쉳=5㲜1(6Ԣ{BY(@
|3w7[[fώcrS b`#})%G ~]" j4`D,[g3|%5F8 vIh&AD Vj"MH\D]jA^vTAF =vU,Zvl':_}q Q3?& B
~0Tir'̈>)HCZX* z i40vX.CNz.4 R?Kv"C܇+<Q3~ޫ_b>|Bq
'$ 8Dž2ouD> GT>
eewh &n;+Q}&*$cxzS'Jƀc4ه<7H5uȑ,VWAme;C=$49 Y>@+i#V`#`T{^qqߔA8}-V@Koo5ag G(1lΗ;K0Do'vseKd۬U4!QPYEh P5/ViM2y2&Y1/H*fM2qzUIb&z iEUؘ[Xy$Gd8K.7LŰvȚ = 97&%{}ǚXP*U*d zK.m oA,]rլ؈!n LILoE C[15$]_;u!lT UүW?FG=p $ t
#n1ռc??CղEO]3C"4~HoceAm/uf >H1yJ=ho$w- :&ַy Ijfa
:+rzueS`p]c_J0Y'ʪ ^ &*eY3ӺKkրMML#E$U4XDZUS iS_Cv
~EO K}%6urkGY]$&7/~r2@W߂\@,־GTv=#cx7'huJqSOo>*Bɷ$?ڟ⑱PT'
QQ*9E@ji0rrq
uEEMW{ zS y|צ Pj.
j`ӆc)ػK\ r>=g ^P fNAq
-Cz7/%ؒ_=ZN,H_S {#n3 ǀa*@оӈ0CbpV:] ǥ)υS? K[LLVdȗiOwڍAWKi!K&G0 WHHJE;F$лNoT"FEA\k%P!oambaTpyfw]TcqjfБby&H)f-z {o%h-́h(-ic@OhlZ:|8255 Ѩ5 {b2 K37>0* ̭Z_ǶݗJE|v
f-*Kqc)͛$*Df Y K0mfV `Me18)F<D~q -Y.AbPC)> q|,,o╨_vS|?py x~%`4uH(ކ ,
7F8Zfmm-(@ Z
0KCM|9ɚ]Eu Ķ*yQU5$ Ԕb9# ,Zܔ]Cp}/ u
8-3fwjz`v#Үק^\K ]p)Ee{?*`G5y$O E{ֱ nJ/(ݦ"6{#>9(@@t >ՂbcoqyzdWacb?b""y1wܛf* n!R5@0!9;Yi ӡt?]>pݜْ }Ɗڝ>*U ʌ-X&]k]M$\I@aKK ڽubl* {+zk!xURmѣ(wxv. ().qg9JK<R\ q.XPXWR#RP"H23*dL,8\ B(^/
P?)-22tf9ХiSp.XДW$q>nh1KUU :]ãYcQ(~3THӊ:r,)|\}?6Zl9;i j;i}X&Qxj+-ws5I p Rc];`L>hZi_JW[lzհIHnzcI
U01L2+nIs(y+k#~[ۡM~W-Kl|RYjXbv'>:TBY> ,9& |1 m r[irN.g}"TQPhG{;kYZ]˱hc?IVB}
;j!WFuumITUK7 ܕudg {b&-cP+%cdRedd;I ~,Yp ̈MR ҜJ>tXj0[|eThᡭ.LҌDKX(@
tU2pd,~u T p\2"k
1Mb7`iW0>s%-Iu{:ͯ
<#$~wDO\lT Tecgk5RM3_LZ6aƏ13j UY#̔(Z&a$:QF'E$Gضfzdy _-Z*"bP %h(!B&}
8*6 4(HM+ĝCQ"*:afG
YoƳ
EcZ-29@2F D9~џh-u) hTp:SvF9ŕJ7)ac֣ E:+@M7*F
T}bźtΝ~3& )uU:'XC[0-OMҟ#+Ba2 i2aAA7odTдUs/.x^D BY_* #hn>; FRl#2 jl13lj4 R28Xx<mÈ#.c$ۺGOm@uVS
P&+k9ȷݜ?H d _0ސU]hJAuQV/5ձ:\If\oYGjakV\ꃃ Xj
1@EuqWoÛyuئjR<=UQ AZ5pn ukg{q.G
Pߝ@ MZKuU];+kUV;LJȗ0e[?0G EiV<=zǀpmHERے)Y%WQdzƟ'h'
a `$
EQ: 8˗X:.#DTƼ n?k?v
!Kǜ -kbۢ.m-XPm".)զO ߪb$2Tײvc 7S(J U 9sh#:$|&a\6 XG0TK!^uk]zP)o?o_PJ TU2|O/'Gk*)7Yql9 *5[K p<]7K:Չ:`$cP#<&}T|RyLUx?qJG&yoUY,-xxعϵ _n8 _md N{"=_;:K.g6ʀ0F)Eث0Tn,WH3 !~؉ŐUnA["A? D%L8V?KoWGE#im0 n>?ߣ?n2al=^PIv|WIS:?ǝUˈ-vc/? >eG/- S?kY8&pK9b`L Hf*-O}n i}'#m$_^ ~&T&H@>Җp;zRpgCKf<
+ܖ=?\"M@ \olc-9bӏ6d8 ƻ8.ǭF!V^鯮,㉗e̦@Ox+]ww d~Dk .y/o/DzL7 M+G~T;mq#p#P^]Lƨ8
զ<Y6̡[(}<ZO >a;՛TX2JGTSs1cs2B6zU ?c{ZŦ_@fPgD 1uw>(E*)T4K?3GbT3V!:D:tj;bZR%֦JV-MDd8TVUf+mJe>T̾w?~;YSE#\yǴeĹ@ U~N}wS$^/%{d ϟy_T 4f qDcd^H_<WnA1? %G'!6*kA tL5hp`C>qL9_ i i ZEgsm=|w+FK+%. >#;Q8 K xY8>כ>'g??JpLغ 3n(Ñ_g1hz)j˅(@Q; ITwxH-rxD- h`::PYR<QPO4TMH D}Q Mޱ_u r&P]"JsxLfє +NLMT9-IUe4X6,wK6]k_Q:sue {HOGhJ
|Wcv#7Qu0~:iƲWpq}\= ,3.s, &`GBmFLďRu407L
n
zy, ,QS^dkL iE2 GժJ
%~o\[f^-Ϥ? THZeN Hn1IC J-BT}
mr?S+e.Ķ]B>Öʿ_$ 7 ٔluS%},~I6mT{E[G~cH
?2 aU
UQ.aj(h&7ϖ-ѕ|ߴZEmŨ -|#b"Z}綱5$}T,>*Zԧ8߰MWZ#F4MlDO"(jV5e&.a9RkwX Ϻڹ0n
QΧQGYz\ ¬)as 2{HՉ,|kGKsbMvT 4C|hk/矦}e Ng,XO:
65?G^ UsgX'H2%.JX3[nZ\A
) &^/2@3Of1Ӭ% 26L_PU
U))}1|DI¦5pnmn \&}KhEKFE̎7ʐQVTWU9䬞b-q7Xj/>:ZIǝ}q4ǐU] ~Դ>/FZ
J 65z l2_P^T!8w̛{H/A
$G%Vux?P-#W F?p :km;t5&'45k
&\3YYґ/ŅoMy^ZVo 9ppn1)U?8}(ksXKOM?Zo^sTO bxCf
Qz9 qڭ {+m0
x KH`&ŹVl$ ?ZTIP.qT2j6҂`2$e
}9>K!(+.DdKi JJ`o~wK;JQ%Gp'Xez 5rئo)(6l Gq\jbV[ .:wh7vF5{its= s o~QEZ" i Ǝl| =
<ڪLUh*j{ +Af`|E} o8= 6!1顫}tOVco#}Twz+Y\2t\t tV|C-g 7
Tts*__T-1b^k? 6;IDAT2.Xo1jsؗ#$YH4TP-[}Em|IC}P\S>(ɳvlG9ŵqlU+#X]}1 ɰe oS08Wɨ ߈Ϲe>R ~ ^-b<6(~`T/DI:|$0HHgE\ ,? :Yw
8O$Ab ])Y s.KK4 ND
܍JmmgP[ rYݵP:tu ;㦌G sÔUO|f}xd(f&`e?nXbv)VM
,F To؉c];ԣ3Frq)w1Rn6k/ԙ$T XimިUl.HL
Y(WjǮ(tߠ\ ~>*biCHs~nTsxlxZtf8l9_qi 9m~9坬Fn&YE
{ؽGI 1vh,Wkf+|6OFP%ZF-{h{Y\h-U?FɄG)%:t@ H-*Ls)5Pl6O (._IOrk1L>; 5<im@LR#jhŀI#0 GdH9HDZ%(Q'}MGm "0[nl׆;9$0>ݚhYB$ Q^#laʤgw6 X㇉z#!RƄˤC,GP+Hӏeл%H5e (2ej"C8#Oej^WRp{磘/XP/K
g2hyVU Uik&}V l&#ܚPH*X+#4{F\ЧW|" fUHhhY\9g&FusᾜMG~vu8RPݬpōLn\IF '2c8\6l,G*q6d_F%zp^5f9+<,_1ZsZpačxb4J?
c-5e:1+%X+~(O ;&6$P!ظl9Ի ɷ솁Qk$)`;v`{6UpJ2:%6Eqhi-zg*bs=u6i|x{rN4!gZ.Ձ!̢Ĥp ȼm!'a0ҭ3M{zJ,1z l '$hU\;57ڗyX-E2x>5pce/X!h,sP*4/ʵ RAG
PTm;[L?W/#EZVHҏszCqlxi219.ܣp
)
,*) qҡVBOkoo9[WgG
{%O ˼M odW
m6gEc CܺH G#M3I6O%y>3<ܴ(@. Pyn4/|r 8&\W+&F[OJ scвpD:`(
%9*Ă\/qdE 6Ҏ?7im+Uʿ;3F 6aQe$
G.܍?SW,qJJ'm܅6d'96j=!qMΊkmцK_Wуpɸ0>FXvK }iNS)m#$!wqO6Fw
[.wTWF]W@&s+X"uhExZ2`ʝʋFHjuٟd$wFqCK1_fDDboiա*&^W|)i*yZ0D
B4q/%%mK QI' B:bUKPL<͎Ma~U|"# a#bXqྚ째XscК-^8~Iq U.2Lqs)P(}
W jg+vW>9ɗa9OqN5&Ab;W*__էKNVGW"͍ U1"$ ,}՜
7!vV
2d@onfщ>~mu?.ҎJ~<b-U :?y V* v%W$һgP[uut]W kvπ)+QF4 JO FDJΗ'Y(@
|λe# #pG ,l)oP- `H#Ϊ,1?EZp{
wy
2Aa_3橑A *KÎ:,ȷ⮁>%de٣zD4GX2=ZuocΆfV !:[0 +!d[BS~Ef //:9pPb9Wjw͒ }XegUҿNJ lde <tc~dhHE]ɼPQӦ 6)S^O)V=PUwakj:4I`G*9P+> 50pS6uw-ܾl.Sn@AZ/
KӔ]o+Bm/> Xx8|tvc?2 ;JO%A+ߩSTzM2 hdP|
O, *;h+M[?kkKE,MH$P,ߡ'aNB%3?s=\*M ~j¢ i _,h 9?/E%*\.}e<鶼'%Hy%2kYA1\VY7H搹b_7l-]YaY2=HnIjNKƤ*<f%/T6qjT#g>;*n彷uSUR%72`tsU{"U*xVFVVV3䆒kXHNVU =R(܂gRv A}AA|>b w;ڵ%$fx`BI k!V
?i"S"o[
'K,y4}3!cߗK`쥷㾩 bne>lCp_Tvx>'b-? 彭$c~HF,JLHofž,iVg|c->P&;->,^8u\*|SϤ/$i\5ն@TX
dT Mt6 ȫyMyh[\ 65 5;:*̋T'qkNoh@p~\g
,thG֙b"_RB SH r/Y/w
VG:KƤ^a6OPQdFVfTd+;nm^]aJoWȓ1qXWq`l@0{Z1H$` RM[w
Ac(N 'tWM[&kA
9iwc~jc-[)M2$( A
Uϸ @M BipwC$MZ[7QM^ yl~ _&~cG#0cdJscn <&TIʵ{w)t|_bJV uylƠOTzNG[9߹͟5 ¾4ؕE[eO\3p=s]wރ gdTZ[ HI>t0mvg.cKRiK);MF[#n,JL Hg R#Tȝ*f67Bqn !^F]k@˨PX{(/䩐!Z:{? P ȒGZYGck=K6iEZFc=H3%-͵]U\8D +vQt {Je7%cYn Ym) 8| ?CR6T:54!U+>K֙{֜s9>R言aR|
2
*)9',+GTdm^뇭Ѯ{Loq ;#XFDM
aVrzQyPZm3ؾ0⥭|\AH+@Ąi"eЧJ $kT^BjU ~ IȺwan7stWg~* aKf
F͑
g25Qms_ B?ʧ̕6zv6/s lL=ݹh/cE8G-mCE{ֆcđc0&M˫!j^7̕fA}f=k߂l'wMjި*)9 -m]% :}UKI.rJ|ҷ~ݗ| =m9-a2\|=im6.ُ;:=T Hĸiѯ۬6
fĥI=Zu;~I>G|8 E
@ Y`u5 (@
P (@
t@y3n (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW v; (@
P (@
P Q)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
PVa'S (@
P (@
}#F
P (@
P <N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ K (@
Q[kA]
0}gCP?||x[ (@
P__o5(@
P*@QP|
2z(r
PVQ п_ :#$W.|&<4
PSP^Q+X(@
Pp(:QG3P\\j cp#`2mͦⷻgvg_O7HN>VQ< nJ`|}]'Q d)(@
P
$iXv5
P^^%O#' @
u;z >B|T "S.|7W?e b n7=5TBf^%"#Cd?mFO#m] M7{Vٿ7:Q
V˪iaOD
i|aSu
ϩϻ[ ju}/ 1,&9k=~n#rQ2+<[CN Du G>0 yS (=+J
PSu8t(M Dw1#lFaA>22#-+ݣ gq <@{]c
"ѭg
Fyq<l
HJEYxkS&,:H}vlΝG~SXAfᗸ9=([W߱ŅUV/{hR 8mE,wnϧXyfXI$lpX3W/+Re Pv \H1uxg2.ʼnVX}98q%]۰!{C/|'#qt-닉?q3 v;ޏ,@vKZΥJ뮲j7af#+ D4ۻk/|B
Pw'@wg=S@:
R| p a|Bl߶kVm߅4 *2|j}E"2CP\wd?RI .ǑPnLB*"])d }_0nO
2cwl<2;ŵϜcUӓƳGEZ!Τiػ#%}\:7&z#%H z! dcи>&Ѹ(߱ =-ەbJ_>rd_t7J Eь@Yb٣^^Q; hGB q0 g.. }"{?҅ƻ#qnjQ)FY \/d c7BqM%OO5c UbP 3xգO
1;(Ps1Q^Q@L0Z{}Hi;at*( U*ˣR V.<X(@
PPW, (@
h{ _w(++\M.`.tN<iHE*=cW
bzm~r' (U8kO%Z܊ `4q:Km =OA50JY,F٢B4a+C)e)*Ѓ%{.@&у01lG8]fIxڹ
#$U3,Z Y0 K`U>Ě"iö
+M(ȩG͉Ojj"MYzQ} wzcȞq&l0fI n&L aY߈~H6i r>qftT76{P?+*whe~\w奸0%%!/*=S21BlucДVӛ-xQ#lޕKF_RZ(@
P?t*~ ?(@
hɓ 11}iI в)c| -P 3r\)O DMLУG|ḿ=
{6u-/jia
[Ȱ>YEm:T
,d_Ս#pӭ)X"C fϼ}Q6őd<z`un,־.H/4О 4
ED#!D(JdD:>gӑ'Z |/
f1ɃC;QE`@r 'BegHMkG?`0Π!ұg0af2^]r=Uf̝5J ǧ9\POdF5#2CsJ( N7?ݲcBu7 mjWw8]b m˞1Nj*P ~0?R Z
TKC]] bc\)555HIVtٳg j䥥!Nˋ)} KAQw>.
Z&!J\y~{)iN'\fD (Y
0FEPe
iҢ؏//bdCˏK ~س$ `T FdX<|Xdщ5Juً R: Y Cَ/5z֣L)Yiٰ:/}wFǠWv$ ߿Z2(?CUvQkL&
뉞=-E?>E9 GHFF&P'N&d}R'pM4n0+*keecW :}\%D5(-@3ZfKGG,Yx\Fs5gϕk~&.Y
nRt,QE(FfqFDt/\T` (@
P@`
PKքʦ8}v\uCظ
Y"#(sv̢*ºch䮰 Ȳ%"X'S%O-j#m VH4HuI jg?Zk מ%r| ehE2FJ@Ecd
KfW f7ࣅ_qZZeaZoʜZ4ұhѩ |Z]{V+RܳqAZyc밾Q% qh jl tcAS+yH:eez
g.^|n cnƝX~oCS(Eoqҹ[
\yҫGwKpAmQ)Zp //y)#H3ND/9Wb@XYȁliYZVXf ɭ7nۃX$ᴬP5kY MĄv(@
P?,*~Xo-(@
xPCS58qPˬ>*ݴ@EtFZ|86c%݂gƇj
`
0Zy}1oT%6BORx">pTI<}\HR('6.XM,^0b 7w&_eX'3ftmpRJTW-aGy<+OaV
>($Ш
}
n߰;d ߐpz|
~<˹5Pu/KDTb*F[1lD>F6uV0Xrb e)M9ݤgHŨ yfPd9ժ6١b&*BcV^>͋Ǡ{d֤d̅C-YLx#WM 'A -b 9;+C*<6btaQCBq$3$̪d (`R@;F Q?f̸_~Q[&::}'!*i8Y'K0ƋQwp9>.;nwr;NK@L6H?pM6l
H^u/\`SsxT_a
0(upD&+TGQw$֭;"va⥩ŝ6c /):Qط)vHPiΠXTשpW!fs1YUF}ʎx Sq18c)kMK5i|˯%TѺ`ε3Xiň^F7M֗
~FP BGjP eW?2pH:L@ON"P%ݵ
SDDu@yٸ (@
@y (p~ā2d6D;o㤹C||[B*84W:ڲ«ncx_ ;edceH K 47_<A`]ٱ[1~vd2qC 0BVTiQzY96 )ET U'6 EkP r JI W3N2#b_{ SyqÏ)
DDEDOEmfuQٖ˶1kDz5[ ֬ݚn.TI
VXSY'Ph\">ʕ˰i!^9:$x<k94 -Mwi|V֓?{X#oQ+j *~<K틼 L]Zs=
-;;1z^i9MjRlHJ[K^x5V-ed8a2ɖc?"3 <Uhn$^ mΞ3ۦL<~ Ṟ f}ܬDE͠s>BKѩAflG Twό pSϬhR s bAM7lt%_:|an
fRZ9ͳ O zJZ^:־uoe?Za|Po @+JEӃS xܛ ,k2 =3NՖT\bβkm%ŴkuW#p {6ecW%>:S~{:`ӢLÍc/#ZbN/Y+:re՟i`Z.O_ǻ5{Ae盯Tqfuv9&xoXN'hYf(Rm]ҧhrDbTBdj4ZpɵV;mG[^L=֒[Qf>{Y̳;KUI6
MZT,Iflt(HlBb" v_/Zy^:ogEݽfM* p @ @{]sWrs|KgI+æ{,,*ѧDpyS} }ڨ&=V[^extwUXK*{!mm Kd9qf^X>@ u=jrpWU]p16oI)
4p6 QfyC Z>Я+kzmJ|{zڨH-Tݮrr:lMنlZJtu7N鬮T}f6Ņ:xDG5Щwy4b5#R7 ؕlʉMIn%>Ͷd PՊ:F='@y }z@7F`x~U*c4uv:~:W&
kե!ZzҒzǦ$%j5^o\[myTҌԐՖuiJe@ = Rh &կ{bs?B-`nE[DM1uX@ zfVpD7>r[:F .tjjNŇuSq)J \,?E V?Fxč X lUX^k/7⥶A?|tVV N>qS0~KCQ2ӧ%;.@$rsa#36Y{{>y~X@ @ ON@'gK 0{? ղE H2g)9FP⩗j[!M7YU_ӣb{J
-E8N +0?n_ >9 |qsH}5bM ZkA6bQq(Hjecч $q4 0>Wd9KRYtR
"xiW -'ŝ3Ӈ; "*ne +pS]A4{weC싒"|G @`ǭu?@ \ѱX
@ "' Ssf@ @ @ @ \@Ek A .@"܃5@ @ @ sj@ @ @ P DP@E95 `
@ @ @ "(@"@ @ @ T{ PA|N BK IENDB` | PNG
IHDR * n G
iCCPICC Profile HT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&6 2z,@LGhh@53U hrm:Y߯Ws29 @('r39(B#es\2]6ININ;Ss"¼P @aE) ?yf6'Cl!({ᱹ(ltlOuRR3QZNL.y? դ-
q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,, ܃ӟ1 C9^7 g:3H@$ pĢ f$toӁ2P gv B@@ l@9p -, (!CT)C.d YA+AaP, @H CP T j_ = F`
L`= v=@8^< UQ ߀< 0Mq@$IFDj)E
Bn#50L)㏉p0011L36f 3bUX', M` jl2.v1p8{?.[یۋkuzq1< 7ƻCl| ߇ & +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|
.* 6͋ơ ]
qt}:J/ Gms+)JCb32N01Q1'iΦ9
s|R䮔TԨtW2SG9Myr }*U^ϥu˙[4܇j
Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uu u tyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs 8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv
v#: tPW k :~qsr:ss<yItra t2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M [RcqX U)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[# ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.I NqIّ2s^S? IHNo d$d(/]+4
%˜Z6*
UgB2[7]+?D̕v/7Zi<_V`VpVt\v*UWCWw^Sf(/f-imY+Ya}
~ e
E7 M֛lQ-^lQ\Zm3g-.ybKv[mmlm{M|I^ ;;v~صdRIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU >p_ ~V.~DpDRVs־Nnk=\/ 91c
q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅aݹqw{Ks?HaG=)}w%vs= #oCϩK_h >;;rC_Moo ޜјѡ6W~͇αб 3>*×__|+nGB=e4d#; 5 - H2 yJд"xGO u. D1i, DZPft-r jMJ'&ޣohQ qڛOJ*,,64UeES @ IDATx \T?0 ;l,&פfmm{{M7mӦݚikILMѨVŸ
" 30y, `g 239sI(@
P (@
Pa=(@
P (@
P (@
P (@
P=F s)X
P (@
P (@
P (@
P=F s)X
P (@
P (@
P (@
P=FcjP (p]455ŋj.JR^F#L&zꅈڬ':U@ԩ923
P >*Hh_dd\yb C
ڿ0X ev ~ X
P#PZZ
͆T t)(@@@=GgҮZ\v\OF
P\ jIơ>'G
t^G||<Ν;*2n7ng (@M@I vX_
PP`^qv@pïVVo<N`Wf(? GKw$&%iE[וu5j1i v ;ε(Ləs'WQ:x:(pThtR+?Au+܍LJ%tAU;?pM*=9`K3"**
F /{& `X`WN<>[)}S;ؗt\GL۷y 8%Ɂ_qxxۿUR>
Zd\C=ڮXSo~#vr;^V 2쳘`bi 8(@
P (@
\'(߉P0w!<JG6غ([i+ڃ?kw9#\/!>j2N֫ IΓ'Pq˸LSrR`, R}/؟>ap
P (@
PnN T X<ww=XS429].>ʯIv6B+m%QZIAVzgaμɋƆJb*96g?l"?.-ԑVly} Yl!VnuM?ۯtuXl 'nա?
/f)@
P (@
P^Qm,ǰd}!{V¼ga9?Sz^DI7 [k0zLTZs0t@0K`]]lF tb FԸl$D`ѺXUV n0J7OP`Eh+:8rV%3J%R:jq't!Y`UJ]R7tu l9+IyXhOO 0-+RU a67!*.:CʓuD`F>
ё ۑzX
\fǎ CII 괙H0hР:T ;v`֭Gqd2u(O vZwE(ހ-US11ȯEBPG
ild'Wx;6;'ߌ>vmŞr%Ɣ&Oǐ XA~:2"}Mm+ w!\Ʀ&VH2Mmt '$R%|:IHJ5by]=#ڃ?'pغbj, b;.i_WS ,oosգ#}ۻ= US!*XW, (@
tk:߆EVds0H,|xZϸ)M|X<<n}}qJn}IߵUHHC;jJPGx\ ='n8ol==C: lLłEvjO`({ʕ+f 9zVl^^ ͛Mڪ e62 )+Oݛ$bpNr ?x
mEXb"*syۿ""m}~t;֊Oy;XQ5f
r*
zEjTki ǣ ԇG+^z.x;^\n,ݳA PPp{.9)|X's(Et|6[ y1vyok{AlY ޓ [_oW1֠E'U._JZbJj۱s3q.Ai']?TlDXSuغ넖Qܛ00%\D=w0Mx@16臽jYܐ+ͳp ayA {vYp
Ps9y=MEbK <>{9}, 7a'aF^<{̗uؿ\p4Yd){Q]G͈K 45RE;1H(- MF< qh
viu2phM;?6̙$q2" CA
{
>W\"TꘚR\lnz썔/FӁ(Luz>J_ $x)JRo]p<0w;plF㾁zXE~.LG_kO ơ:L$N6s5UV!"ZFKԱQꪮO{>j˰潍) u}LCZ pTL$gMaY^ kc7((yf^ڷ2>> x"\.N~;\MTz3ĥXVy Ux t`R]4rsqdl_Ϩ@k~lry
~OF ۹=wjI2UUUȑ#3fLM]VUM=qɣ8_%tβ=Ιc\ ff|Ut# ?<`sGz z8eHĐ#m
C )$[8/Q<< dS<%*A
< ̇ K%`w0 ï_x
jN wÑ*q TIص(<3=۳_ۿJ4䋜{ʔ+Qņ+ =)#1R@Ԭ *yg%ۊE * waS]2d,5 [0mH#c@npfexuZ.u3v WP|IuK a⢧q=~afkyD
P^(wT- Pn֕o :.ʺF=vuu1*U%ntr' ˳^
\4KȆFbV>囍K ;QWmfd)!A
;JNêO< Άj)]}ĹjԧHdL*Pb>tղ!y
,.bAɓ TD$HQ_|
MarZtRNZD4X#: nhpI<*V Lչ$r/8$A&U8K.Tv^ ,U]Y_0DLM$p"]AO^. %JO MJ$pTZSSp 1F29t.cZ*$H2pdsU*H 4Q_B' Sp ~[ B
TTT`ݺu0,\C㪫MkAP[[x1 ςK G>_
2^숨Ixj|&<hZ ~O'^Vۤ[MU7h/ ƅJ K.{`Ɇ*𱩦U$Ғ>r_{ͪ~h./٥}")Hs6EgUUk֟ՎtaYjаeY]
Y~-0ϔ o^pl< Llnp _
>0ůWc__G2X~zy5~!MB[Q:_)cux
'6^]u)^Gy c@Qoȑx[.'Om$ܵp,Y\TUr32^EE} q`^J93 灹bARbw-ysT. TPi $[ نN$A/
TѪ?b.Q^?~HM: {ES+(@
P|r&_NHܼg`a[u_LX{gވ FZ[Z䊊IZ8Ȳz" egc1_zj2J>~ :&cldH+֞<!qhllԞj;H=E>eN@'{I<1,C *Ef c,^ct|ͷ*N>R } :yBK(L ίh& &UV-u#,q kIkIݯw{T;/+o}HZqM 1"MKZ1<wvZ:}(q\?9ٯN|1ٸ)[ ei94ވ6Bٸ-@Ɲu_ Lö| NI -!j
P#Z x[W :P1}tޟ}f͚8iER6{yDɸww q7<iQTuʽz< C=7f(OIY ZsxjwM=nA4i
6jw:!/JʠwxG ~i I msl:'~I'f&R8h~n9>5R
GcuCwU--/nZY_AeΞM|e9!x78$9Y Uュ]rShЩ(1"3Hl =2HJy
$k s:<:ol ^;Zbq jŏq:KrI Cߴ9y7 ojFU; ;/^FDJ-^uy-?Pr 6 UQA#z; zPoNRA6%
g T+ɮ.<`=vo`\,} nmߡg/]{ RTh+J ᶫFӜ-(@
P }T83 ڃB}? N DC~+bV`\nJ}iXY6{{n(=[}clAQġS\l yx!8|6L77t+U] qGvc+ب9õ%cd!:Z}J1&♂-,6I BjDEXp]|T(<<19(! "<maK7p.%` E"ͽ
~ƍ[b
w1 Z˕(~ W-J1G0[jݒetRQSt
ҺjgA, ES0,_6>M G Z"|t< ǝAtUֹ_\ PgzSyy9>CzURh H =
FK έ
Fj5w}&_zO"r.Q:nYi,."k3xQgǏ^؏/߁ｔߎ;JE 'ЏJkx _z%b)-1 &x#7S4t)2R"/^_2T'`_-A
f-6nEqE=w `j<Q nfɈ;ˏAB|_
y?3v?$H1<9ϽYoz<!7\҂'P2h]LT6y?AG_)<Qǰ/`'2ކJA<Lc2cX1 hIós[viTv"M { Y \.#=@! SQ*"_D,ϙ ٯ{~Iƀ9ykj<ʽ%m3Qslߗ^yk/ϛ'S@{hPXgCҏ%OƏ ɝM&7gW H2FM̆pϤ0XkaeRia JA]DHk/Ƞ[܄;$0wqHR6%ΡjМT덺URյ@ΧU/C
L:d0>^~8(]SKY*pP¶A hU
EC[-Q~*7}5Ip,S[6(y$n G Oʥ{Mַk.,q$z,vO˓⽥#Z܁6z땚%|ψToR
;߮>}ZnHjS8'^YCk6i5'ƙ|(*NYJk5Yoɜ0I|Fz]VqF7 vZ..5k{ ~.A
wp e<Q U2WU tg{5 |wa _%sU>PegAsG~$lĘEߕ EsLx|kzئbTj e˖yj릛n)\Lg:ńQ< eAAd96i~JK.mBQ8%*y|0۵('龖#|[L< q0 ZLlg
JZ+[ZI.K+$
` M|yd6!ʀG롓.-{fBUI<[. ,GlwVE! `dos ~[ ~mIm\* p vQO"?BBU</<:.\G
P] &tx%7 i} 8~訌+(2 ;j1 Hnd']:n~76j8c/.ӏѳ7'.{:dZuݰ? Ճ% F!O{ t)2>F~ gK
1LfFzi\/-{5
qa4W֢.sPa #Z cy!w}SUX+tɷ#o+^B
H+sTT
صkWYR[5#XSB_ڀ%X"C1&;bK!B_({6ghi {c7\`6TUA6,6r.ލc@w}>:s N`xr7p9 @);id <bpFDq8-qG`XSkPUW;}Lu/ɸ#8-{vl>P"Z邠+t/5C:SA7匯 0赗ME'{=;XnZJåghʠYqҧ+ QU$SJ_L9PmB%լȝ LGc۵Qxmwr.+DHՓZo%ԻOTrxld>w G_Gۑ?(@
PCn 8/OdIO̎h|^fqMq-ND~>GQ+SZdDb >|~uH+ݏi nUe31Qs̳Q(.B=H-kj?*2%O7ERVYӅ2
~jXEf-^Z,8S} jʤV"*kemM-jO (8t
C k)v>"K{ex/J,+T%&I7* UFqƪse)*Po>Ġ@̴?y+4"J
r_y@xE2 }?1L/,ض9JoRLI
G瞥Ir 6{5^NHHN (US'|8efBnL.97J |:UG@/NV~hߜ ^\Є)ͫzSy k-~Ӏ)-~Ƕ V\ ƕ_n=uc}K
YeK6j0܆1y/!;VsH~5*EyLU
=osyqvf
0o$w$H2&;) /dJ jY^۱wɟ]:jz0t HO +$!3'Y= t7e/cW1&P (@()O #1Bfcn21v ("5Psr:dcg_ '9{̞Uc<Ha6>
6SMsgZ0
`K8b{X$hjq_b7_-:鴹5䐁d gBopǖd0YR֪Z?JF|AN ;*0V+*5,ﮗ LٞD[Sy ۆ5-Mvʠi{=P W&ׯR~2[Ck ظ 8UiAɸ%#^ltel-M, R@L2 >E s}Aumx7q!_6&6NU0׆?! r~*ƴ9IԀ+<*}C?3e&Jظd8:àYrzʂ ,$Z{ _6n܈̙3G4rGN xllocf$J\x YqXߗId)+/m@S<
?`γw9 eh,ȑa1|hO r bгy V×Eq1ȗEw3@ŁU=7F=6Bc?Y9j`(ۀ 2f$:^AOX,21_vU=BC&r|OZlQӱmru>WCY); mrC֎={EogV̀#oBjx/`m{ .\>!xSznw
SI<qFT5H&WXw (@?)q@ )^^;݉҈L=0 g`7 \
"*62EJF* p2C 5bCX% OL# =%!H}0H_.dx
kߴ|q6 r܄S2pCOT 2Xg3YuIMZ:1MF^~ ̪Nꑕ sz<ڶbezN &T,
C yf,v*.4o4jR),Jm2g%'{=͇#sȬxs mI% \x6_Qelu+>PepmU* Fp#O,E$ԛT)_z yXݿݳZ2"o")wQ 5rW$}uԑ-Vs.ru]Xzou;ܹs}UAsG!O i aKvn8ۼIM8(YXߗvs +~2۞_ܺw]] VXiYĉ{1j(ƿ̬oϮE 6## E2Qd~`ŁޏA!c ~Iwb_nj_~DE ķ0Jn 02+H >O<EL?"vnU+ڕ?._嘌t62 ̙ Oq[ 'Wqg|Yv.YQO-;[v|F̌GGVbCE+5b~յQ d P܍JrqS:t.RZi)MJ*Hh2*0Z1j[2DIQF5pgL'sO~_/u̚NX*0`)7e#J:0dFaMCsnARmgʭ (py8m숲2@ӳx ȽUa'bѢ8z%vX5.,߄#K aƬ9Hꛦ%!<a "7[O`㻟h721[1I'娶<̽MƱs`\lEΣDɓx.12w L*F ؉sV@ wr3<a'` V$IӬ6K@es
iPZVB}+
xŝLYpݓԂd,)<u) q2H "1PdU CSXd?axL Rk@yY5d`wI@z;\B벇q
P@MnucʕXoFK^^6M?NvAD 7vgH{7aƨaA?S* \$[iA-lemvsCg/WVVjcR/T gҥ8{718 9+]ݣ=&5c[dpF?{| 51e+J[/:*/4& 滗 6 =k_ ~`t 5O'(>rHhʐQ籿_=lQ};1iΔ 7R n8Z'@;ү)i {`yF̄ &m%@:~xR+%"]X0==vʔ;vQ k5% 78L;v9)MeEqU1'M0l2@dI6''wPy +MTS L5atrmLeȐxiw c?}w=6wF
P|.ZڎҳؿWNOlq } LUzjvl>\(7I0-_u:sw xA>ÚT>T1 g?"
e8C`9!] 6c:Dd`hbs!cT ;1ȴ i#pe
2^F ƢՕ2xY#rzDDc;∌aJGVS㒖#xw ~ #a>:m?a@Q 9AX d|; U,M5(9yubcn<K7 MȐ< %xl2+tzQOц%xeSˮ-2h>tYHe
Pm4=77ǎ Ӧ U
ҐA9؈[oQ f FgcQy9z8uѷ0/pH|Ȕ ,1eV{~v:)+fJ%㦉~o74o1( m11s(&7o 0kc} p\.|zƒG*Tջ$"-ahӨ9ӱ?p}>F^!;ߌ7]!7Xg'XSV59̹cџk=~ NiꨪM+GodE =rhRx6Z8^aT6e4RvT ##qqjW M #\GX!x2αO"uv
0:de&2
o`'X5j\U16ܻ $S.,i]ql 5=T
Df%& sx (@I
wDn$'$錖+" '$"c v ތyBL-> RN, #xe6 s!"1,wJ[^WpE=vU9XZo$[BE<XiØ?4?rW: "ӥ̂yH+{o_Nez<s 4i= M!Ӹ9 w6 ([~WܗR!Z)z_v!qntٽ`ǡÎrBƺx;Emҽ'o
oHW 됶%=12X5T_
YZ &5@i8Y{m;s@[_97(J@?1~x_}ק, <)j0kZ܄#=}o6 4y@_mU`.>.]@vv=v[Y{2 dN̾kJuVo̜r¯"sכ2k- ܌ɿɐ3 &' #waKHYKeb?Քt~U
͢ :zok{hQV/F` f[4.
?_[&[LvN3_(6ұekIFCV^u SMh45x
l{yէ)7?;k3Kn (@
2nݷBSt-ϐd~ ~')AGڀ2֥H0awcp%ǢoFvzГפ1[ fx; u
$z yr^Ξ-?c1z|ȣ5z`R]X - T' B\a%R=A
ud^s\4dߍ)_j
1k>b%P_aR# dk@?+ 1=%x O> {:r}ns i[2$3A}D RJ)m ˜&)
U°Uʄ 2q8KsSJ֣&>] <
+oC~| Iwĭ}sZrȂp'/'7)w`Z_G^"!'ݷ):Ƙiދ#;pByd@/is1" mn ruyey/ؙһ5oD7i
ʹka'7LՁY;Zv@fj0M pl/ =c?͢<{ܨffեgB{R [x7(@
t@tkC$~eDؖ!FHK"h2-=;DNA*e~}F߉/Q얇x^ O ~!{^ߑ ^>ڤyAQ-Л7ܼyZnJ ExTxH?/B
P=S ݼ:ȍ,wU)5
z @aڔ3 E;`3M _ګ}Uev~|`B]SM lNZuwxoU ~jL)HYN*/+EYF UCXRFL:Fݗ$,'z
Xp?j !vmsB (@
P (pmm,MPT~үϝ76Ls+̇/
,M2Yӣgԥer4>OtߌJetWeŨ. RpqҒÓ͒-+( 3da-B|p!,.ُUGCo#3<zŃ^au;(@
P (@
t@uP+De4ע_* e^g'q5oÀ8 RҐ F f\;d 0Ȍ Q2ǸA5m6ΦsHy
lQ2h+R'u&gTg1e1E 1KPnzkL55HV)@
P (@
P \}xc݅ _~Ӎ%*> @Ѝ¢e䒹I,L&КYS*{bԨQZ` ( ]e&ЙΈO>a(dA
%v(D8o
P (@
Pn
T )9yHSf (@
\hU^m< !k{.nDy (@
\ICy(@
[=7 7U9S RW^ڌSXښb* a npުc2zze(Miވ<g
PC /^DUU
qV<
P=C@uP-)T"""gT5`8
P (@
P B Ghn (@
P (@
P 0PqY (@
P (@
Pm- (@
P (@
\c*18 (@
P (@
P m (@
P (@k,@5gq (@
P (@
`"
P (@
P (p f5.Q (@
P (@lQ܅k)@
P (@
P*ER (@
P (\.\K
P (@
P@70P
, (@
P (@ TwZ
P (@
P An@g (@
P (@
`" R (@
P (
Tt: (@
P (@
P ] (@
P (@n`Y$(@
P (@
Pµ (@
P (@
t ݀")@
P (@
P.@Ep (@
P (@
PtI
P (@
P@p*p-(@
P (@
P @E7H
P (@
P 0P܅k)@
P (@
P*ER (@
P (\.\K
P (@
P@7>*A7"V`AP G
P (@
PlQ/+H
P (@
Pqq5ϔ (@
P ( (@
P (@
8 T8ךgJ
P (@
P TK
R (@
P n *nk3 (@
P (@
x*z%b)@
P (@
P7 7εR (@
P z = (@
P (@GZL)@
P (@
P=^ XA
P (@
P#@ōsy (@
P (@ /@ED (@
P (@
P`ƹ<S
P (@
P@0*`QQUz tN͛LgX#bbbbJ{Ub(@
P (@ Z7o8]|̇7YHD/
a VO (@
P TӹS-)TĹs3fn=Z@5wDdr (@
P-1*n___N'PʇE0Q (@
P Tu sFG'^O٩:gTe֕ (@
P/:O (@
P (S8FEO2W
1ENTqr7vǰ (@
P :. 7d=\opLsSFMkQ (@
P1آƼ7YgEO%[!>D;Ԉm"H ^4P<Y
P (@
P=]-*zb:,u |\UC[
P (@
P TZP (@
P ( Tπ (@
P (@ #@E(@
P (@
P To (@
P (@ #Y?z̥`E:"`G;7e @ IDAT3ĠYAҹZmk沶Z (@
P ( Tt1KB.#) Yems9yu .T5že3`HW (@
P X.f]+0 v"qC9.,Q ,a=bI?qh횐yr(@
P (@
t o @ZR+*l; rZ[)zEBJ`هP@
P (@
P ?R%B <,ӳ8 )@
P (@
\^-*.o=z@aV cMVe#ktȊz1qH/>>
+)@
P (@
P:[|
J-e <LD>%hX$8qܼN -} :V8\M8f^gq(@
P (@
t ]ܯ@e,irgnRǪzWR (@
P@
p.e (@
P (@
\ W})@
P (@
PR*S (@
P (p% T\ (@
P (@
PKR^fN
P (@
P0Pq%Zp8ch4:,Q< V (@
PYӓ~.M(~aqsqsB49 95M, (@
P (@ &@E N kدP +DBN1G
P (@
P &d׃9~L (@
P (г8FEϾ> (@
P (@
P`↺<Y
P (@
P@`g_ ֎ (@
P (pC 0PqC]n,(@
P (@
Pg t`ț0.S@l8NⷐCyL"H&2
VT|5xLMYVi#ZL(TjhH^q
(@
P (@
P=BS`Dr h9IC+ (ŎB5g_2F">" fomN`шt S .dcj|ĺhrI>:HPeJНO_c3Gpڂ &sAs%(@
P (@
P+ЩYWC MY@?8lG$D4LȞw}]胬,Ćr6DH֢bCzBTN.쫍C6La༄OQe+5|"&$fڰ{k!&"zj#aZy6i}Q% Laa&d
|E
P (@
P@ tjj
9K_{,
; Y&i2+3?GVI9farש5Yn(d|QB dkhXw[-RVS;X~S"8mg!
B*?έY o{x4w\A
P (@
P@ tjb|/]7á Q ?xhgXw7 }1'}ɪh5 L}qEi8"%`QQg-cT+ i1M:{ F Y h
TVX|ڑa)C)?>,^6.?)@
P (@
PlNl7lpSƏ:^n-N;"2.Ìƪ7mC~&T9T =ބ7!f/hx;`Q
8r8iu Zv!uH.;- (@
P (@
t@;(xB
y=]4@g1o Ji r(%6~"3.Źe
/ȨȊ ]:H~w]?"V\۳gٰw-ipgdS 8 ʉq;f]%^̌ ,-v1'YYjZʗ (@
P ( H).LHuM
I̵$q\mFԡ0hF}FdbrLFiOCC
;!iR Q7 B~ܓViZ8/:[ T#F܋] 'ј%VH~pFvAZF8Qӄ!ɃQ6*SqODymA┿{\Z-
Rf m0yS;]L9`db-tT].x/`Jg1?
P (@
P}}GOHM:B$u&Q~7*d߂d8JAΦXSUױB>f\{rС!,3bcc+V r@rz=~ںp%Wwa{X;\Ѫ(r+7L*8LMCtl Yaz7@` Y_j,I+\ TI j!c5_zk|7#*^FG˸(!_"qi0}GN5Po X^
Z ځ+(@
P (@
PMN THH+@A MC` HAjHO BJXk[Ut250`G>±0XWVɳl L 4/z /9 u?]"V R{:HY?lQ$u7CQ2@d&}kd,C@̃u_S|(Z#G
F :$ -[wO {?LMH?ZT̨L?"#GvFlx \iߋ
?l~FH&
P (@
P:N T?-~o'IB hK73{MCpO8!%i KSOkW"?wjvq|*ɳERhB_ n&ܛ|%OCܼVTol=H~Lg'0K W'}g"Yu~dBJ:,
c M@5. Hå/ GX*ci=&CCq\dsDlthHL$r U0 h 3L9Ze!硵i+(@
P (@
P=PHC9z0 =_a LKm rs*K.OfGiS-b ɯCVo`Bjݠ rMS0 fQE,8c7 &ŧ#% CouS@?Xj.+V븀Kq_/EƂѾLkϬ[.2ԥ g5j8
6\|dI69;vEL4Ο@0a7S^;$ ?ݐq(@
P (@
@Eiã~ O#ñ=&?c4W7s
ȗٽj̖c{E>KCl<Eo҂
|2ܒ @YbRk)rpl+ʎ)3HSa#Ω@P" =T(ނ(?qYm
ׁhg$Up KȆͲ j@%8%a κetwb9~bz
P (@
PW-遊` {˟pƯz%;2DBkM+_ƻ~ ?{u
̥_>ÓHSD꜃ EhĥN8vq
eOQEA2[L8Ū4rѲ;1h1n\Ukb 51Ue :\0{jǨ8UR9$x/ f9ޗѪq4v.P (@
P@ h8V5D~M{l<-\:~!w)*6n9Ҿ)ō
55
/)?eyefh]"2ęcDZa
ØlX`I2iuT $#^gad ^óW 53/(@
P (@
t@*:s)` E
T7nRaWZɝM=Zk3b\b QxM8e65{ ,r\j,1bX(fFiG|;>Ż^{Fˬ Cr7(@
P (@+`x@ Pz? x<<d6t8=UPÐ $ٌjKj#&bj@4mvb(֪ ָ %
.Bjwʑ ň<Q3}rf$q KD!3dɨmPi_S (@
P@h*Bp5HŌ/ C Uq:wf|q$Tk5 ,YGDD*Դf;ܳDGa4npdŚ^'ߙ Cz@Nl$Yl=r2l ~+B&, CLa@ϗ (@
P T+]"r3L%L[P]۪d ̨xRV0ֳL1J8ҥ#j<&'OBb F
! eZwad2KHi]i\(2~ܨ$'AvzjQlڃw
. FL2Kc] (@
P нun
iAJeU ߝOY_NR֩P-*&ߎW?ȴCR|'ZS &n*R (@
P [T\ވ{ 35j%)(@
P (@
P xFv$
P (@
P (JP2\O
P (@
P5`⚓@
P (@
P B 0PJ)@
P (@
P T\srH
P (@
P@(*Bp=(@
P (@
P\kN)@
P (@
P%@E( (@
P (@
P 0PqY (@
P (@
P% (@
P (@
\s*99 (@
P (@
P d>a0"sxf<k
kjϮ܇ (@
P@ 0Pm
p f=B Y7 Q1Q=.(@
P (@PP'bJCu] \.ҕ+?'3j%ZR Eo (@
P z =jtq] e@BUՏ%2 DDkA
7D
P (@
P' '_.QMKR sfI
P (@
P Ǩ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ (@
P (@
P<KD
P (@
P@ gN࣪ο&:BH ePQAkVmV+֥Ֆ*U " $@IHB @dd;3,c| >df~C
P (@
P<*:ϒ[ (@
P (@
P[
0P-:(@
P (@
P'@EYrK (@
P (@
|K*% W (@
P (@
P<Kn (@
P (@o)@ŷ (@
P (@
t g-Q (@
P (-\ (@
P (@`,%
P (@
P S (@
P (y Tt%D
P (@
P`[ru
P (@
P :Oγ(@
P (@
P T|K@N
P (@
P@ 0Py(@
P (@
PRP^Qk (@
P (@
PSQ)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
t ȍP (@
P ( Tt"A
P (@
P@0P)(@
P (@
P!@Eg(r (@
P (@
ttKl!F
P (@
P 3*]P (@
P (1*:ĥ(@
P (@
P ^@.(@
P (@
P sR (@
P (@
xA
/ s (@
P (@
tL9q)
P (@
P @
P (@
P :&@Eǜ(@
P (@
P^` (@
P (@
P `cN\ (@
P (@/0Pd (@
P (@ 0P1'.E
P (@
P2wA
P (@
P@ (@
P (@
P Tx (@
P (@
Pc Tt̉KQ (@
P (*]P (@
P (1*:ĥ(@
P (@
P ^@.(@
P (@
P sR (@
P (@
xA
/ s (@
P (@
tL9q)
P (@
P @
P (@
P :&@Eǜ(@｀*Ϡ|^Z ==j:)ϿKi1p ikm 2vֳSvK:&`{cP\萀oCKr.%>]xx0@|yom/n|?\4/|9T|Rl,A݁2Fu}=lbi\AUUϞ¹z\[?]@RTcGƦCAvv?C_ u]iIѕxy& qIX!N+>SX10w[9m<U@H313<?8jL~lZO^v?. b/-xџjn5&RZM9.FD7$i+;*mi>xi,ݲ I8ࣵ GQ^[jX,};(--S'p C;N^6svnߊ%=q l]\Xu( U#Ui@cZ ?3RcmgG?YYJ
pG>?.oi=Qx橗i 3 ΄(@
tX% (@
|O#rvGu.0h`4XLMS
Up m85sūKvȣ>fڲ 6l:~9g P}wM O7k|ƶL=jM3!':<QRbE%{Ӌ0cd-w bò?"*F-lh,-Ө,"q;.r8sW@b<a.}aҾps`fe҈<9zu( @I䠸 rlz) ע2W[llU. c LFhܮ$l*`%q7sNZa NYc< wG_JH/=Ū,G 7 1h_^rޕ7j`0 w{I^-Fϋ" nO F}Z<t?oES{۱I<bY
2B< Ē4y6w?**)$PlQX5rPi+p<h[S)@
hfo=CS N6 ȮU`ѐ@X&[GX{eWͮ̄ Fex\D3qt tZ "|PXe|2jEL:"=|X]I
P&qH*
{AM}eiXg 9͎^r5|cZ-Ñ]9@l6 5U4`pBlXlH߹Y5GIV>SF,BJsMeqn ,BBZgY沈RM2HL*@E Ίϰ[Vȶȓ/ѹ *sqLܔmn1Wgr߲Xp`^]/qq^pb^ cM BJ~ӚU8 !Y%_aOyɂ0>lޝ5WBk{1II@#uRi^N㥲ls 05ȖEz CNJPM } u *w/~J,ZpRhU)PG$eoav*zl* Uϵ@~'jKZ A)*"*9bINRYa)1(OV lzA@Q@%?W;/6MNHJ_kP,HKfQH@L?m_6ιh7on͂]3*>+4n>K쉳=5㲜1(6Ԣ{BY(@
|3w7[[fώcrS b`#})%G ~]" j4`D,[g3|%5F8 vIh&AD Vj"MH\D]jA^vTAF =vU,Zvl':_}q Q3?& B
~0Tir'̈>)HCZX* z i40vX.CNz.4 R?Kv"C܇+<Q3~ޫ_b>|Bq
'$ 8Dž2ouD> GT>
eewh &n;+Q}&*$cxzS'Jƀc4ه<7H5uȑ,VWAme;C=$49 Y>@+i#V`#`T{^qqߔA8}-V@Koo5ag G(1lΗ;K0Do'vseKd۬U4!QPYEh P5/ViM2y2&Y1/H*fM2qzUIb&z iEUؘ[Xy$Gd8K.7LŰvȚ = 97&%{}ǚXP*U*d zK.m oA,]rլ؈!n LILoE C[15$]_;u!lT UүW?FG=p $ t
#n1ռc??CղEO]3C"4~HoceAm/uf >H1yJ=ho$w- :&ַy Ijfa
:+rzueS`p]c_J0Y'ʪ ^ &*eY3ӺKkրMML#E$U4XDZUS iS_Cv
~EO K}%6urkGY]$&7/~r2@W߂\@,־GTv=#cx7'huJqSOo>*Bɷ$?ڟ⑱PT'
QQ*9E@ji0rrq
uEEMW{ zS y|צ Pj.
j`ӆc)ػK\ r>=g ^P fNAq
-Cz7/%ؒ_=ZN,H_S {#n3 ǀa*@оӈ0CbpV:] ǥ)υS? K[LLVdȗiOwڍAWKi!K&G0 WHHJE;F$лNoT"FEA\k%P!oambaTpyfw]TcqjfБby&H)f-z {o%h-́h(-ic@OhlZ:|8255 Ѩ5 {b2 K37>0* ̭Z_ǶݗJE|v
f-*Kqc)͛$*Df Y K0mfV `Me18)F<D~q -Y.AbPC)> q|,,o╨_vS|?py x~%`4uH(ކ ,
7F8Zfmm-(@ Z
0KCM|9ɚ]Eu Ķ*yQU5$ Ԕb9# ,Zܔ]Cp}/ u
8-3fwjz`v#Үק^\K ]p)Ee{?*`G5y$O E{ֱ nJ/(ݦ"6{#>9(@@t >ՂbcoqyzdWacb?b""y1wܛf* n!R5@0!9;Yi ӡt?]>pݜْ }Ɗڝ>*U ʌ-X&]k]M$\I@aKK ڽubl* {+zk!xURmѣ(wxv. ().qg9JK<R\ q.XPXWR#RP"H23*dL,8\ B(^/
P?)-22tf9ХiSp.XДW$q>nh1KUU :]ãYcQ(~3THӊ:r,)|\}?6Zl9;i j;i}X&Qxj+-ws5I p Rc];`L>hZi_JW[lzհIHnzcI
U01L2+nIs(y+k#~[ۡM~W-Kl|RYjXbv'>:TBY> ,9& |1 m r[irN.g}"TQPhG{;kYZ]˱hc?IVB}
;j!WFuumITUK7 ܕudg {b&-cP+%cdRedd;I ~,Yp ̈MR ҜJ>tXj0[|eThᡭ.LҌDKX(@
tU2pd,~u T p\2"k
1Mb7`iW0>s%-Iu{:ͯ
<#$~wDO\lT Tecgk5RM3_LZ6aƏ13j UY#̔(Z&a$:QF'E$Gضfzdy _-Z*"bP %h(!B&}
8*6 4(HM+ĝCQ"*:afG
YoƳ
EcZ-29@2F D9~џh-u) hTp:SvF9ŕJ7)ac֣ E:+@M7*F
T}bźtΝ~3& )uU:'XC[0-OMҟ#+Ba2 i2aAA7odTдUs/.x^D BY_* #hn>; FRl#2 jl13lj4 R28Xx<mÈ#.c$ۺGOm@uVS
P&+k9ȷݜ?H d _0ސU]hJAuQV/5ձ:\If\oYGjakV\ꃃ Xj
1@EuqWoÛyuئjR<=UQ AZ5pn ukg{q.G
Pߝ@ MZKuU];+kUV;LJȗ0e[?0G EiV<=zǀpmHERے)Y%WQdzƟ'h'
a `$
EQ: 8˗X:.#DTƼ n?k?v
!Kǜ -kbۢ.m-XPm".)զO ߪb$2Tײvc 7S(J U 9sh#:$|&a\6 XG0TK!^uk]zP)o?o_PJ TU2|O/'Gk*)7Yql9 *5[K p<]7K:Չ:`$cP#<&}T|RyLUx?qJG&yoUY,-xxعϵ _n8 _md N{"=_;:K.g6ʀ0F)Eث0Tn,WH3 !~؉ŐUnA["A? D%L8V?KoWGE#im0 n>?ߣ?n2al=^PIv|WIS:?ǝUˈ-vc/? >eG/- S?kY8&pK9b`L Hf*-O}n i}'#m$_^ ~&T&H@>Җp;zRpgCKf<
+ܖ=?\"M@ \olc-9bӏ6d8 ƻ8.ǭF!V^鯮,㉗e̦@Ox+]ww d~Dk .y/o/DzL7 M+G~T;mq#p#P^]Lƨ8
զ<Y6̡[(}<ZO >a;՛TX2JGTSs1cs2B6zU ?c{ZŦ_@fPgD 1uw>(E*)T4K?3GbT3V!:D:tj;bZR%֦JV-MDd8TVUf+mJe>T̾w?~;YSE#\yǴeĹ@ U~N}wS$^/%{d ϟy_T 4f qDcd^H_<WnA1? %G'!6*kA tL5hp`C>qL9_ i i ZEgsm=|w+FK+%. >#;Q8 K xY8>כ>'g??JpLغ 3n(Ñ_g1hz)j˅(@Q; ITwxH-rxD- h`::PYR<QPO4TMH D}Q Mޱ_u r&P]"JsxLfє +NLMT9-IUe4X6,wK6]k_Q:sue {HOGhJ
|Wcv#7Qu0~:iƲWpq}\= ,3.s, &`GBmFLďRu407L
n
zy, ,QS^dkL iE2 GժJ
%~o\[f^-Ϥ? THZeN Hn1IC J-BT}
mr?S+e.Ķ]B>Öʿ_$ 7 ٔluS%},~I6mT{E[G~cH
?2 aU
UQ.aj(h&7ϖ-ѕ|ߴZEmŨ -|#b"Z}綱5$}T,>*Zԧ8߰MWZ#F4MlDO"(jV5e&.a9RkwX Ϻڹ0n
QΧQGYz\ ¬)as 2{HՉ,|kGKsbMvT 4C|hk/矦}e Ng,XO:
65?G^ UsgX'H2%.JX3[nZ\A
) &^/2@3Of1Ӭ% 26L_PU
U))}1|DI¦5pnmn \&}KhEKFE̎7ʐQVTWU9䬞b-q7Xj/>:ZIǝ}q4ǐU] ~Դ>/FZ
J 65z l2_P^T!8w̛{H/A
$G%Vux?P-#W F?p :km;t5&'45k
&\3YYґ/ŅoMy^ZVo 9ppn1)U?8}(ksXKOM?Zo^sTO bxCf
Qz9 qڭ {+m0
x KH`&ŹVl$ ?ZTIP.qT2j6҂`2$e
}9>K!(+.DdKi JJ`o~wK;JQ%Gp'Xez 5rئo)(6l Gq\jbV[ .:wh7vF5{its= s o~QEZ" i Ǝl| =
<ڪLUh*j{ +Af`|E} o8= 6!1顫}tOVco#}Twz+Y\2t\t tV|C-g 7
Tts*__T-1b^k? 6;IDAT2.Xo1jsؗ#$YH4TP-[}Em|IC}P\S>(ɳvlG9ŵqlU+#X]}1 ɰe oS08Wɨ ߈Ϲe>R ~ ^-b<6(~`T/DI:|$0HHgE\ ,? :Yw
8O$Ab ])Y s.KK4 ND
܍JmmgP[ rYݵP:tu ;㦌G sÔUO|f}xd(f&`e?nXbv)VM
,F To؉c];ԣ3Frq)w1Rn6k/ԙ$T XimިUl.HL
Y(WjǮ(tߠ\ ~>*biCHs~nTsxlxZtf8l9_qi 9m~9坬Fn&YE
{ؽGI 1vh,Wkf+|6OFP%ZF-{h{Y\h-U?FɄG)%:t@ H-*Ls)5Pl6O (._IOrk1L>; 5<im@LR#jhŀI#0 GdH9HDZ%(Q'}MGm "0[nl׆;9$0>ݚhYB$ Q^#laʤgw6 X㇉z#!RƄˤC,GP+Hӏeл%H5e (2ej"C8#Oej^WRp{磘/XP/K
g2hyVU Uik&}V l&#ܚPH*X+#4{F\ЧW|" fUHhhY\9g&FusᾜMG~vu8RPݬpōLn\IF '2c8\6l,G*q6d_F%zp^5f9+<,_1ZsZpačxb4J?
c-5e:1+%X+~(O ;&6$P!ظl9Ի ɷ솁Qk$)`;v`{6UpJ2:%6Eqhi-zg*bs=u6i|x{rN4!gZ.Ձ!̢Ĥp ȼm!'a0ҭ3M{zJ,1z l '$hU\;57ڗyX-E2x>5pce/X!h,sP*4/ʵ RAG
PTm;[L?W/#EZVHҏszCqlxi219.ܣp
)
,*) qҡVBOkoo9[WgG
{%O ˼M odW
m6gEc CܺH G#M3I6O%y>3<ܴ(@. Pyn4/|r 8&\W+&F[OJ scвpD:`(
%9*Ă\/qdE 6Ҏ?7im+Uʿ;3F 6aQe$
G.܍?SW,qJJ'm܅6d'96j=!qMΊkmцK_Wуpɸ0>FXvK }iNS)m#$!wqO6Fw
[.wTWF]W@&s+X"uhExZ2`ʝʋFHjuٟd$wFqCK1_fDDboiա*&^W|)i*yZ0D
B4q/%%mK QI' B:bUKPL<͎Ma~U|"# a#bXqྚ째XscК-^8~Iq U.2Lqs)P(}
W jg+vW>9ɗa9OqN5&Ab;W*__էKNVGW"͍ U1"$ ,}՜
7!vV
2d@onfщ>~mu?.ҎJ~<b-U :?y V* v%W$һgP[uut]W kvπ)+QF4 JO FDJΗ'Y(@
|λe# #pG ,l)oP- `H#Ϊ,1?EZp{
wy
2Aa_3橑A *KÎ:,ȷ⮁>%de٣zD4GX2=ZuocΆfV !:[0 +!d[BS~Ef //:9pPb9Wjw͒ }XegUҿNJ lde <tc~dhHE]ɼPQӦ 6)S^O)V=PUwakj:4I`G*9P+> 50pS6uw-ܾl.Sn@AZ/
KӔ]o+Bm/> Xx8|tvc?2 ;JO%A+ߩSTzM2 hdP|
O, *;h+M[?kkKE,MH$P,ߡ'aNB%3?s=\*M ~j¢ i _,h 9?/E%*\.}e<鶼'%Hy%2kYA1\VY7H搹b_7l-]YaY2=HnIjNKƤ*<f%/T6qjT#g>;*n彷uSUR%72`tsU{"U*xVFVVV3䆒kXHNVU =R(܂gRv A}AA|>b w;ڵ%$fx`BI k!V
?i"S"o[
'K,y4}3!cߗK`쥷㾩 bne>lCp_Tvx>'b-? 彭$c~HF,JLHofž,iVg|c->P&;->,^8u\*|SϤ/$i\5ն@TX
dT Mt6 ȫyMyh[\ 65 5;:*̋T'qkNoh@p~\g
,thG֙b"_RB SH r/Y/w
VG:KƤ^a6OPQdFVfTd+;nm^]aJoWȓ1qXWq`l@0{Z1H$` RM[w
Ac(N 'tWM[&kA
9iwc~jc-[)M2$( A
Uϸ @M BipwC$MZ[7QM^ yl~ _&~cG#0cdJscn <&TIʵ{w)t|_bJV uylƠOTzNG[9߹͟5 ¾4ؕE[eO\3p=s]wރ gdTZ[ HI>t0mvg.cKRiK);MF[#n,JL Hg R#Tȝ*f67Bqn !^F]k@˨PX{(/䩐!Z:{? P ȒGZYGck=K6iEZFc=H3%-͵]U\8D +vQt {Je7%cYn Ym) 8| ?CR6T:54!U+>K֙{֜s9>R言aR|
2
*)9',+GTdm^뇭Ѯ{Loq ;#XFDM
aVrzQyPZm3ؾ0⥭|\AH+@Ąi"eЧJ $kT^BjU ~ IȺwan7stWg~* aKf
F͑
g25Qms_ B?ʧ̕6zv6/s lL=ݹh/cE8G-mCE{ֆcđc0&M˫!j^7̕fA}f=k߂l'wMjި*)9 -m]% :}UKI.rJ|ҷ~ݗ| =m9-a2\|=im6.ُ;:=T Hĸiѯ۬6
fĥI=Zu;~I>G|8 E
@ Y`u5 (@
P (@
t@y3n (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW*7wF
P (@
P@{ Ty (@
P (@
xU
rsg (@
P (@
'@E{:G
P (@
PW v; (@
P (@
P Q)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
PVa'S (@
P (@
}#F
P (@
P <N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ 0P}s (@
P (@ Txd
P (@
P /@G
P (@
P <0P)@
P (@
P 7 )@
P (@
P @N (@
P (@
P Txߜ{ (@
P (@
P `8 (@
P (@ K (@
Q[kA]
0}gCP?||x[ (@
P__o5(@
P*@QP|
2z(r
PVQ п_ :#$W.|&<4
PSP^Q+X(@
Pp(:QG3P\\j cp#`2mͦⷻgvg_O7HN>VQ< nJ`|}]'Q d)(@
P
$iXv5
P^^%O#' @
u;z >B|T "S.|7W?e b n7=5TBf^%"#Cd?mFO#m] M7{Vٿ7:Q
V˪iaOD
i|aSu
ϩϻ[ ju}/ 1,&9k=~n#rQ2+<[CN Du G>0 yS (=+J
PSu8t(M Dw1#lFaA>22#-+ݣ gq <@{]c
"ѭg
Fyq<l
HJEYxkS&,:H}vlΝG~SXAfᗸ9=([W߱ŅUV/{hR 8mE,wnϧXyfXI$lpX3W/+Re Pv \H1uxg2.ʼnVX}98q%]۰!{C/|'#qt-닉?q3 v;ޏ,@vKZΥJ뮲j7af#+ D4ۻk/|B
Pw'@wg=S@:
R| p a|Bl߶kVm߅4 *2|j}E"2CP\wd?RI .ǑPnLB*"])d }_0nO
2cwl<2;ŵϜcUӓƳGEZ!Τiػ#%}\:7&z#%H z! dcи>&Ѹ(߱ =-ەbJ_>rd_t7J Eь@Yb٣^^Q; hGB q0 g.. }"{?҅ƻ#qnjQ)FY \/d c7BqM%OO5c UbP 3xգO
1;(Ps1Q^Q@L0Z{}Hi;at*( U*ˣR V.<X(@
PPW, (@
h{ _w(++\M.`.tN<iHE*=cW
bzm~r' (U8kO%Z܊ `4q:Km =OA50JY,F٢B4a+C)e)*Ѓ%{.@&у01lG8]fIxڹ
#$U3,Z Y0 K`U>Ě"iö
+M(ȩG͉Ojj"MYzQ} wzcȞq&l0fI n&L aY߈~H6i r>qftT76{P?+*whe~\w奸0%%!/*=S21BlucДVӛ-xQ#lޕKF_RZ(@
P?t*~ ?(@
hɓ 11}iI в)c| -P 3r\)O DMLУG|ḿ=
{6u-/jia
[Ȱ>YEm:T
,d_Ս#pӭ)X"C fϼ}Q6őd<z`un,־.H/4О 4
ED#!D(JdD:>gӑ'Z |/
f1ɃC;QE`@r 'BegHMkG?`0Π!ұg0af2^]r=Uf̝5J ǧ9\POdF5#2CsJ( N7?ݲcBu7 mjWw8]b m˞1Nj*P ~0?R Z
TKC]] bc\)555HIVtٳg j䥥!Nˋ)} KAQw>.
Z&!J\y~{)iN'\fD (Y
0FEPe
iҢ؏//bdCˏK ~س$ `T FdX<|Xdщ5Juً R: Y Cَ/5z֣L)Yiٰ:/}wFǠWv$ ߿Z2(?CUvQkL&
뉞=-E?>E9 GHFF&P'N&d}R'pM4n0+*keecW :}\%D5(-@3ZfKGG,Yx\Fs5gϕk~&.Y
nRt,QE(FfqFDt/\T` (@
P@`
PKքʦ8}v\uCظ
Y"#(sv̢*ºch䮰 Ȳ%"X'S%O-j#m VH4HuI jg?Zk מ%r| ehE2FJ@Ecd
KfW f7ࣅ_qZZeaZoʜZ4ұhѩ |Z]{V+RܳqAZyc밾Q% qh jl tcAS+yH:eez
g.^|n cnƝX~oCS(Eoqҹ[
\yҫGwKpAmQ)Zp //y)#H3ND/9Wb@XYȁliYZVXf ɭ7nۃX$ᴬP5kY MĄv(@
P?,*~Xo-(@
xPCS58qPˬ>*ݴ@EtFZ|86c%݂gƇj
`
0Zy}1oT%6BORx">pTI<}\HR('6.XM,^0b 7w&_eX'3ftmpRJTW-aGy<+OaV
>($Ш
}
n߰;d ߐpz|
~<˹5Pu/KDTb*F[1lD>F6uV0Xrb e)M9ݤgHŨ yfPd9ժ6١b&*BcV^>͋Ǡ{d֤d̅C-YLx#WM 'A -b 9;+C*<6btaQCBq$3$̪d (`R@;F Q?f̸_~Q[&::}'!*i8Y'K0ƋQwp9>.;nwr;NK@L6H?pM6l
H^u/\`SsxT_a
0(upD&+TGQw$֭;"va⥩ŝ6c /):Qط)vHPiΠXTשpW!fs1YUF}ʎx Sq18c)kMK5i|˯%TѺ`ε3Xiň^F7M֗
~FP BGjP eW?2pH:L@ON"P%ݵ
SDDu@yٸ (@
@y (p~ā2d6D;o㤹C||[B*84W:ڲ«ncx_ ;edceH K 47_<A`]ٱ[1~vd2qC 0BVTiQzY96 )ET U'6 EkP r JI W3N2#b_{ SyqÏ)
DDEDOEmfuQٖ˶1kDz5[ ֬ݚn.TI
VXSY'Ph\">ʕ˰i!^9:$x<k94 -Mwi|V֓?{X#oQ+j *~<K틼 L]Zs=
-;;1z^i9MjRlHJ[K^x5V-ed8a2ɖc?"3 <Uhn$^ mΞ3ۦL<~ Ṟ f}ܬDE͠s>BKѩAflG Twό pSϬhR s bAM7lt%_:|an
fRZ9ͳ O zJZ^:־uoe?Za|Po @+JEӃS xܛ ,k2 =3NՖT\bβkm%ŴkuW#p {6ecW%>:S~{:`ӢLÍc/#ZbN/Y+:re՟i`Z.O_ǻ5{Ae盯Tqfuv9&xoXN'hYf(Rm]ҧhrDbTBdj4ZpɵV;mG[^L=֒[Qf>{Y̳;KUI6
MZT,Iflt(HlBb" v_/Zy^:ogEݽfM* p @ @{]sWrs|KgI+æ{,,*ѧDpyS} }ڨ&=V[^extwUXK*{!mm Kd9qf^X>@ u=jrpWU]p16oI)
4p6 QfyC Z>Я+kzmJ|{zڨH-Tݮrr:lMنlZJtu7N鬮T}f6Ņ:xDG5Щwy4b5#R7 ؕlʉMIn%>Ͷd PՊ:F='@y }z@7F`x~U*c4uv:~:W&
kե!ZzҒzǦ$%j5^o\[myTҌԐՖuiJe@ = Rh &կ{bs?B-`nE[DM1uX@ zfVpD7>r[:F .tjjNŇuSq)J \,?E V?Fxč X lUX^k/7⥶A?|tVV N>qS0~KCQ2ӧ%;.@$rsa#36Y{{>y~X@ @ ON@'gK 0{? ղE H2g)9FP⩗j[!M7YU_ӣb{J
-E8N +0?n_ >9 |qsH}5bM ZkA6bQq(Hjecч $q4 0>Wd9KRYtR
"xiW -'ŝ3Ӈ; "*ne +pS]A4{weC싒"|G @`ǭu?@ \ѱX
@ "' Ssf@ @ @ @ \@Ek A .@"܃5@ @ @ sj@ @ @ P DP@E95 `
@ @ @ "(@"@ @ @ T{ PA|N BK IENDB` | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenEnvClusterDTO.java | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clusters;
}
public void setClusters(Set<String> clusters) {
this.clusters = clusters;
}
@Override
public String toString() {
return "OpenEnvClusterDTO{" +
"env='" + env + '\'' +
", clusters=" + clusters +
'}';
}
}
| package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clusters;
}
public void setClusters(Set<String> clusters) {
this.clusters = clusters;
}
@Override
public String toString() {
return "OpenEnvClusterDTO{" +
"env='" + env + '\'' +
", clusters=" + clusters +
'}';
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XmlConfigPlaceholderAutoUpdateTest.java | package com.ctrip.framework.apollo.spring;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.primitives.Ints;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class XmlConfigPlaceholderAutoUpdateTest extends AbstractSpringIntegrationTest {
private static final String TIMEOUT_PROPERTY = "timeout";
private static final int DEFAULT_TIMEOUT = 100;
private static final String BATCH_PROPERTY = "batch";
private static final int DEFAULT_BATCH = 200;
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
@Test
public void testAutoUpdateWithOneNamespace() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateDisabled() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
MockConfigUtil mockConfigUtil = new MockConfigUtil();
mockConfigUtil.setAutoUpdateInjectedSpringProperties(false);
MockInjector.setInstance(ConfigUtil.class, mockConfigUtil);
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespaces() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout));
Properties fxApolloProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(initialBatch));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
SimpleConfig fxApolloConfig = prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(newTimeout));
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newFxApolloProperties = assembleProperties(BATCH_PROPERTY, String.valueOf(newBatch));
fxApolloConfig.onRepositoryChange(FX_APOLLO_NAMESPACE, newFxApolloProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespacesWithSameProperties() throws Exception {
int someTimeout = 1000;
int someBatch = 2000;
int anotherBatch = 3000;
int someNewTimeout = 1001;
int someNewBatch = 2001;
Properties applicationProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(someBatch));
Properties fxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someTimeout), BATCH_PROPERTY, String.valueOf(anotherBatch));
prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationProperties);
SimpleConfig fxApolloConfig = prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
Properties newFxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someNewTimeout), BATCH_PROPERTY, String.valueOf(someNewBatch));
fxApolloConfig.onRepositoryChange(FX_APOLLO_NAMESPACE, newFxApolloProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someNewTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithNewProperties() throws Exception {
int initialTimeout = 1000;
int newTimeout = 1001;
int newBatch = 2001;
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(newTimeout), BATCH_PROPERTY, String.valueOf(newBatch));
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithIrrelevantProperties() throws Exception {
int initialTimeout = 1000;
String someIrrelevantKey = "someIrrelevantKey";
String someIrrelevantValue = "someIrrelevantValue";
String anotherIrrelevantKey = "anotherIrrelevantKey";
String anotherIrrelevantValue = "anotherIrrelevantValue";
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout), someIrrelevantKey, someIrrelevantValue);
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout), anotherIrrelevantKey, anotherIrrelevantValue);
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
}
@Test
public void testAutoUpdateWithDeletedProperties() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = new Properties();
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(DEFAULT_TIMEOUT, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespacesWithSamePropertiesDeleted() throws Exception {
int someTimeout = 1000;
int someBatch = 2000;
int anotherBatch = 3000;
Properties applicationProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(someBatch));
Properties fxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someTimeout), BATCH_PROPERTY, String.valueOf(anotherBatch));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
Properties newProperties = new Properties();
applicationConfig.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(anotherBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithDeletedPropertiesWithNoDefaultValue() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest7.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(300);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithTypeMismatch() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
String newBatch = "newBatch";
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, newBatch);
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(300);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithValueInjectedAsConstructorArgs() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest8.xml");
TestXmlBeanWithConstructorArgs bean = context.getBean(TestXmlBeanWithConstructorArgs.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
// Does not support this scenario
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithValueAndProperty() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest9.xml");
TestXmlBeanWithInjectedValue bean = context.getBean(TestXmlBeanWithInjectedValue.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithAllKindsOfDataTypes() throws Exception {
int someInt = 1000;
int someNewInt = 1001;
int[] someIntArray = {1, 2, 3, 4};
int[] someNewIntArray = {5, 6, 7, 8};
long someLong = 2000L;
long someNewLong = 2001L;
short someShort = 3000;
short someNewShort = 3001;
float someFloat = 1.2F;
float someNewFloat = 2.2F;
double someDouble = 3.10D;
double someNewDouble = 4.10D;
byte someByte = 123;
byte someNewByte = 124;
boolean someBoolean = true;
boolean someNewBoolean = !someBoolean;
String someString = "someString";
String someNewString = "someNewString";
String someDateFormat = "yyyy-MM-dd HH:mm:ss.SSS";
Date someDate = assembleDate(2018, 2, 23, 20, 1, 2, 123);
Date someNewDate = assembleDate(2018, 2, 23, 21, 2, 3, 345);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(someDateFormat, Locale.US);
Properties properties = new Properties();
properties.setProperty("intProperty", String.valueOf(someInt));
properties.setProperty("intArrayProperty", Ints.join(", ", someIntArray));
properties.setProperty("longProperty", String.valueOf(someLong));
properties.setProperty("shortProperty", String.valueOf(someShort));
properties.setProperty("floatProperty", String.valueOf(someFloat));
properties.setProperty("doubleProperty", String.valueOf(someDouble));
properties.setProperty("byteProperty", String.valueOf(someByte));
properties.setProperty("booleanProperty", String.valueOf(someBoolean));
properties.setProperty("stringProperty", someString);
properties.setProperty("dateFormat", someDateFormat);
properties.setProperty("dateProperty", simpleDateFormat.format(someDate));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest10.xml");
TestAllKindsOfDataTypesBean bean = context.getBean(TestAllKindsOfDataTypesBean.class);
assertEquals(someInt, bean.getIntProperty());
assertArrayEquals(someIntArray, bean.getIntArrayProperty());
assertEquals(someLong, bean.getLongProperty());
assertEquals(someShort, bean.getShortProperty());
assertEquals(someFloat, bean.getFloatProperty(), 0.001F);
assertEquals(someDouble, bean.getDoubleProperty(), 0.001D);
assertEquals(someByte, bean.getByteProperty());
assertEquals(someBoolean, bean.getBooleanProperty());
assertEquals(someString, bean.getStringProperty());
assertEquals(someDate, bean.getDateProperty());
Properties newProperties = new Properties();
newProperties.setProperty("intProperty", String.valueOf(someNewInt));
newProperties.setProperty("intArrayProperty", Ints.join(", ", someNewIntArray));
newProperties.setProperty("longProperty", String.valueOf(someNewLong));
newProperties.setProperty("shortProperty", String.valueOf(someNewShort));
newProperties.setProperty("floatProperty", String.valueOf(someNewFloat));
newProperties.setProperty("doubleProperty", String.valueOf(someNewDouble));
newProperties.setProperty("byteProperty", String.valueOf(someNewByte));
newProperties.setProperty("booleanProperty", String.valueOf(someNewBoolean));
newProperties.setProperty("stringProperty", someNewString);
newProperties.setProperty("dateFormat", someDateFormat);
newProperties.setProperty("dateProperty", simpleDateFormat.format(someNewDate));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someNewInt, bean.getIntProperty());
assertArrayEquals(someNewIntArray, bean.getIntArrayProperty());
assertEquals(someNewLong, bean.getLongProperty());
assertEquals(someNewShort, bean.getShortProperty());
assertEquals(someNewFloat, bean.getFloatProperty(), 0.001F);
assertEquals(someNewDouble, bean.getDoubleProperty(), 0.001D);
assertEquals(someNewByte, bean.getByteProperty());
assertEquals(someNewBoolean, bean.getBooleanProperty());
assertEquals(someNewString, bean.getStringProperty());
assertEquals(someNewDate, bean.getDateProperty());
}
public static class TestXmlBeanWithConstructorArgs {
private final int timeout;
private final int batch;
public TestXmlBeanWithConstructorArgs(int timeout, int batch) {
this.timeout = timeout;
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
public static class TestXmlBeanWithInjectedValue {
@Value("${timeout}")
private int timeout;
private int batch;
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
static class TestAllKindsOfDataTypesBean {
private int intProperty;
private int[] intArrayProperty;
private long longProperty;
private short shortProperty;
private float floatProperty;
private double doubleProperty;
private byte byteProperty;
private boolean booleanProperty;
private String stringProperty;
private Date dateProperty;
public void setDateProperty(Date dateProperty) {
this.dateProperty = dateProperty;
}
public void setIntProperty(int intProperty) {
this.intProperty = intProperty;
}
public void setIntArrayProperty(int[] intArrayProperty) {
this.intArrayProperty = intArrayProperty;
}
public void setLongProperty(long longProperty) {
this.longProperty = longProperty;
}
public void setShortProperty(short shortProperty) {
this.shortProperty = shortProperty;
}
public void setFloatProperty(float floatProperty) {
this.floatProperty = floatProperty;
}
public void setDoubleProperty(double doubleProperty) {
this.doubleProperty = doubleProperty;
}
public void setByteProperty(byte byteProperty) {
this.byteProperty = byteProperty;
}
public void setBooleanProperty(boolean booleanProperty) {
this.booleanProperty = booleanProperty;
}
public void setStringProperty(String stringProperty) {
this.stringProperty = stringProperty;
}
public int getIntProperty() {
return intProperty;
}
public int[] getIntArrayProperty() {
return intArrayProperty;
}
public long getLongProperty() {
return longProperty;
}
public short getShortProperty() {
return shortProperty;
}
public float getFloatProperty() {
return floatProperty;
}
public double getDoubleProperty() {
return doubleProperty;
}
public byte getByteProperty() {
return byteProperty;
}
public boolean getBooleanProperty() {
return booleanProperty;
}
public String getStringProperty() {
return stringProperty;
}
public Date getDateProperty() {
return dateProperty;
}
}
}
| package com.ctrip.framework.apollo.spring;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.primitives.Ints;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class XmlConfigPlaceholderAutoUpdateTest extends AbstractSpringIntegrationTest {
private static final String TIMEOUT_PROPERTY = "timeout";
private static final int DEFAULT_TIMEOUT = 100;
private static final String BATCH_PROPERTY = "batch";
private static final int DEFAULT_BATCH = 200;
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
@Test
public void testAutoUpdateWithOneNamespace() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateDisabled() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
MockConfigUtil mockConfigUtil = new MockConfigUtil();
mockConfigUtil.setAutoUpdateInjectedSpringProperties(false);
MockInjector.setInstance(ConfigUtil.class, mockConfigUtil);
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespaces() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout));
Properties fxApolloProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(initialBatch));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
SimpleConfig fxApolloConfig = prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(newTimeout));
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newFxApolloProperties = assembleProperties(BATCH_PROPERTY, String.valueOf(newBatch));
fxApolloConfig.onRepositoryChange(FX_APOLLO_NAMESPACE, newFxApolloProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespacesWithSameProperties() throws Exception {
int someTimeout = 1000;
int someBatch = 2000;
int anotherBatch = 3000;
int someNewTimeout = 1001;
int someNewBatch = 2001;
Properties applicationProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(someBatch));
Properties fxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someTimeout), BATCH_PROPERTY, String.valueOf(anotherBatch));
prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationProperties);
SimpleConfig fxApolloConfig = prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
Properties newFxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someNewTimeout), BATCH_PROPERTY, String.valueOf(someNewBatch));
fxApolloConfig.onRepositoryChange(FX_APOLLO_NAMESPACE, newFxApolloProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someNewTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithNewProperties() throws Exception {
int initialTimeout = 1000;
int newTimeout = 1001;
int newBatch = 2001;
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(newTimeout), BATCH_PROPERTY, String.valueOf(newBatch));
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithIrrelevantProperties() throws Exception {
int initialTimeout = 1000;
String someIrrelevantKey = "someIrrelevantKey";
String someIrrelevantValue = "someIrrelevantValue";
String anotherIrrelevantKey = "anotherIrrelevantKey";
String anotherIrrelevantValue = "anotherIrrelevantValue";
Properties applicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout), someIrrelevantKey, someIrrelevantValue);
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
Properties newApplicationProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(initialTimeout), anotherIrrelevantKey, anotherIrrelevantValue);
applicationConfig
.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newApplicationProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
}
@Test
public void testAutoUpdateWithDeletedProperties() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = new Properties();
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(DEFAULT_TIMEOUT, bean.getTimeout());
assertEquals(DEFAULT_BATCH, bean.getBatch());
}
@Test
public void testAutoUpdateWithMultipleNamespacesWithSamePropertiesDeleted() throws Exception {
int someTimeout = 1000;
int someBatch = 2000;
int anotherBatch = 3000;
Properties applicationProperties = assembleProperties(BATCH_PROPERTY,
String.valueOf(someBatch));
Properties fxApolloProperties = assembleProperties(TIMEOUT_PROPERTY,
String.valueOf(someTimeout), BATCH_PROPERTY, String.valueOf(anotherBatch));
SimpleConfig applicationConfig = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION,
applicationProperties);
prepareConfig(FX_APOLLO_NAMESPACE, fxApolloProperties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest3.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(someBatch, bean.getBatch());
Properties newProperties = new Properties();
applicationConfig.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someTimeout, bean.getTimeout());
assertEquals(anotherBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithDeletedPropertiesWithNoDefaultValue() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest7.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(300);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithTypeMismatch() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
String newBatch = "newBatch";
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest1.xml");
TestXmlBean bean = context.getBean(TestXmlBean.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, newBatch);
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(300);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithValueInjectedAsConstructorArgs() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest8.xml");
TestXmlBeanWithConstructorArgs bean = context.getBean(TestXmlBeanWithConstructorArgs.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
// Does not support this scenario
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithValueAndProperty() throws Exception {
int initialTimeout = 1000;
int initialBatch = 2000;
int newTimeout = 1001;
int newBatch = 2001;
Properties properties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(initialTimeout),
BATCH_PROPERTY, String.valueOf(initialBatch));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest9.xml");
TestXmlBeanWithInjectedValue bean = context.getBean(TestXmlBeanWithInjectedValue.class);
assertEquals(initialTimeout, bean.getTimeout());
assertEquals(initialBatch, bean.getBatch());
Properties newProperties = assembleProperties(TIMEOUT_PROPERTY, String.valueOf(newTimeout),
BATCH_PROPERTY, String.valueOf(newBatch));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(newTimeout, bean.getTimeout());
assertEquals(newBatch, bean.getBatch());
}
@Test
public void testAutoUpdateWithAllKindsOfDataTypes() throws Exception {
int someInt = 1000;
int someNewInt = 1001;
int[] someIntArray = {1, 2, 3, 4};
int[] someNewIntArray = {5, 6, 7, 8};
long someLong = 2000L;
long someNewLong = 2001L;
short someShort = 3000;
short someNewShort = 3001;
float someFloat = 1.2F;
float someNewFloat = 2.2F;
double someDouble = 3.10D;
double someNewDouble = 4.10D;
byte someByte = 123;
byte someNewByte = 124;
boolean someBoolean = true;
boolean someNewBoolean = !someBoolean;
String someString = "someString";
String someNewString = "someNewString";
String someDateFormat = "yyyy-MM-dd HH:mm:ss.SSS";
Date someDate = assembleDate(2018, 2, 23, 20, 1, 2, 123);
Date someNewDate = assembleDate(2018, 2, 23, 21, 2, 3, 345);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(someDateFormat, Locale.US);
Properties properties = new Properties();
properties.setProperty("intProperty", String.valueOf(someInt));
properties.setProperty("intArrayProperty", Ints.join(", ", someIntArray));
properties.setProperty("longProperty", String.valueOf(someLong));
properties.setProperty("shortProperty", String.valueOf(someShort));
properties.setProperty("floatProperty", String.valueOf(someFloat));
properties.setProperty("doubleProperty", String.valueOf(someDouble));
properties.setProperty("byteProperty", String.valueOf(someByte));
properties.setProperty("booleanProperty", String.valueOf(someBoolean));
properties.setProperty("stringProperty", someString);
properties.setProperty("dateFormat", someDateFormat);
properties.setProperty("dateProperty", simpleDateFormat.format(someDate));
SimpleConfig config = prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/XmlConfigPlaceholderTest10.xml");
TestAllKindsOfDataTypesBean bean = context.getBean(TestAllKindsOfDataTypesBean.class);
assertEquals(someInt, bean.getIntProperty());
assertArrayEquals(someIntArray, bean.getIntArrayProperty());
assertEquals(someLong, bean.getLongProperty());
assertEquals(someShort, bean.getShortProperty());
assertEquals(someFloat, bean.getFloatProperty(), 0.001F);
assertEquals(someDouble, bean.getDoubleProperty(), 0.001D);
assertEquals(someByte, bean.getByteProperty());
assertEquals(someBoolean, bean.getBooleanProperty());
assertEquals(someString, bean.getStringProperty());
assertEquals(someDate, bean.getDateProperty());
Properties newProperties = new Properties();
newProperties.setProperty("intProperty", String.valueOf(someNewInt));
newProperties.setProperty("intArrayProperty", Ints.join(", ", someNewIntArray));
newProperties.setProperty("longProperty", String.valueOf(someNewLong));
newProperties.setProperty("shortProperty", String.valueOf(someNewShort));
newProperties.setProperty("floatProperty", String.valueOf(someNewFloat));
newProperties.setProperty("doubleProperty", String.valueOf(someNewDouble));
newProperties.setProperty("byteProperty", String.valueOf(someNewByte));
newProperties.setProperty("booleanProperty", String.valueOf(someNewBoolean));
newProperties.setProperty("stringProperty", someNewString);
newProperties.setProperty("dateFormat", someDateFormat);
newProperties.setProperty("dateProperty", simpleDateFormat.format(someNewDate));
config.onRepositoryChange(ConfigConsts.NAMESPACE_APPLICATION, newProperties);
TimeUnit.MILLISECONDS.sleep(100);
assertEquals(someNewInt, bean.getIntProperty());
assertArrayEquals(someNewIntArray, bean.getIntArrayProperty());
assertEquals(someNewLong, bean.getLongProperty());
assertEquals(someNewShort, bean.getShortProperty());
assertEquals(someNewFloat, bean.getFloatProperty(), 0.001F);
assertEquals(someNewDouble, bean.getDoubleProperty(), 0.001D);
assertEquals(someNewByte, bean.getByteProperty());
assertEquals(someNewBoolean, bean.getBooleanProperty());
assertEquals(someNewString, bean.getStringProperty());
assertEquals(someNewDate, bean.getDateProperty());
}
public static class TestXmlBeanWithConstructorArgs {
private final int timeout;
private final int batch;
public TestXmlBeanWithConstructorArgs(int timeout, int batch) {
this.timeout = timeout;
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
public static class TestXmlBeanWithInjectedValue {
@Value("${timeout}")
private int timeout;
private int batch;
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
static class TestAllKindsOfDataTypesBean {
private int intProperty;
private int[] intArrayProperty;
private long longProperty;
private short shortProperty;
private float floatProperty;
private double doubleProperty;
private byte byteProperty;
private boolean booleanProperty;
private String stringProperty;
private Date dateProperty;
public void setDateProperty(Date dateProperty) {
this.dateProperty = dateProperty;
}
public void setIntProperty(int intProperty) {
this.intProperty = intProperty;
}
public void setIntArrayProperty(int[] intArrayProperty) {
this.intArrayProperty = intArrayProperty;
}
public void setLongProperty(long longProperty) {
this.longProperty = longProperty;
}
public void setShortProperty(short shortProperty) {
this.shortProperty = shortProperty;
}
public void setFloatProperty(float floatProperty) {
this.floatProperty = floatProperty;
}
public void setDoubleProperty(double doubleProperty) {
this.doubleProperty = doubleProperty;
}
public void setByteProperty(byte byteProperty) {
this.byteProperty = byteProperty;
}
public void setBooleanProperty(boolean booleanProperty) {
this.booleanProperty = booleanProperty;
}
public void setStringProperty(String stringProperty) {
this.stringProperty = stringProperty;
}
public int getIntProperty() {
return intProperty;
}
public int[] getIntArrayProperty() {
return intArrayProperty;
}
public long getLongProperty() {
return longProperty;
}
public short getShortProperty() {
return shortProperty;
}
public float getFloatProperty() {
return floatProperty;
}
public double getDoubleProperty() {
return doubleProperty;
}
public byte getByteProperty() {
return byteProperty;
}
public boolean getBooleanProperty() {
return booleanProperty;
}
public String getStringProperty() {
return stringProperty;
}
public Date getDateProperty() {
return dateProperty;
}
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/service/AbstractOpenApiService.java | package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.openapi.client.exception.ApolloOpenApiException;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.gson.Gson;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
abstract class AbstractOpenApiService {
private static final Escaper pathEscaper = UrlEscapers.urlPathSegmentEscaper();
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
private final String baseUrl;
protected final CloseableHttpClient client;
protected final Gson gson;
AbstractOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
this.client = client;
this.baseUrl = baseUrl;
this.gson = gson;
}
protected CloseableHttpResponse get(String path) throws IOException {
HttpGet get = new HttpGet(String.format("%s/%s", baseUrl, path));
return execute(get);
}
protected CloseableHttpResponse post(String path, Object entity) throws IOException {
HttpPost post = new HttpPost(String.format("%s/%s", baseUrl, path));
return execute(post, entity);
}
protected CloseableHttpResponse put(String path, Object entity) throws IOException {
HttpPut put = new HttpPut(String.format("%s/%s", baseUrl, path));
return execute(put, entity);
}
protected CloseableHttpResponse delete(String path) throws IOException {
HttpDelete delete = new HttpDelete(String.format("%s/%s", baseUrl, path));
return execute(delete);
}
protected String escapePath(String path) {
return pathEscaper.escape(path);
}
protected String escapeParam(String param) {
return queryParamEscaper.escape(param);
}
private CloseableHttpResponse execute(HttpEntityEnclosingRequestBase requestBase, Object entity) throws IOException {
requestBase.setEntity(new StringEntity(gson.toJson(entity), ContentType.APPLICATION_JSON));
return execute(requestBase);
}
private CloseableHttpResponse execute(HttpUriRequest request) throws IOException {
CloseableHttpResponse response = client.execute(request);
checkHttpResponseStatus(response);
return response;
}
private void checkHttpResponseStatus(HttpResponse response) {
if (response.getStatusLine().getStatusCode() == 200) {
return;
}
StatusLine status = response.getStatusLine();
String message = "";
try {
message = EntityUtils.toString(response.getEntity());
} catch (IOException e) {
//ignore
}
throw new ApolloOpenApiException(status.getStatusCode(), status.getReasonPhrase(), message);
}
protected void checkNotEmpty(String value, String name) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(value), name + " should not be null or empty");
}
}
| package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.openapi.client.exception.ApolloOpenApiException;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.gson.Gson;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
abstract class AbstractOpenApiService {
private static final Escaper pathEscaper = UrlEscapers.urlPathSegmentEscaper();
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
private final String baseUrl;
protected final CloseableHttpClient client;
protected final Gson gson;
AbstractOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
this.client = client;
this.baseUrl = baseUrl;
this.gson = gson;
}
protected CloseableHttpResponse get(String path) throws IOException {
HttpGet get = new HttpGet(String.format("%s/%s", baseUrl, path));
return execute(get);
}
protected CloseableHttpResponse post(String path, Object entity) throws IOException {
HttpPost post = new HttpPost(String.format("%s/%s", baseUrl, path));
return execute(post, entity);
}
protected CloseableHttpResponse put(String path, Object entity) throws IOException {
HttpPut put = new HttpPut(String.format("%s/%s", baseUrl, path));
return execute(put, entity);
}
protected CloseableHttpResponse delete(String path) throws IOException {
HttpDelete delete = new HttpDelete(String.format("%s/%s", baseUrl, path));
return execute(delete);
}
protected String escapePath(String path) {
return pathEscaper.escape(path);
}
protected String escapeParam(String param) {
return queryParamEscaper.escape(param);
}
private CloseableHttpResponse execute(HttpEntityEnclosingRequestBase requestBase, Object entity) throws IOException {
requestBase.setEntity(new StringEntity(gson.toJson(entity), ContentType.APPLICATION_JSON));
return execute(requestBase);
}
private CloseableHttpResponse execute(HttpUriRequest request) throws IOException {
CloseableHttpResponse response = client.execute(request);
checkHttpResponseStatus(response);
return response;
}
private void checkHttpResponseStatus(HttpResponse response) {
if (response.getStatusLine().getStatusCode() == 200) {
return;
}
StatusLine status = response.getStatusLine();
String message = "";
try {
message = EntityUtils.toString(response.getEntity());
} catch (IOException e) {
//ignore
}
throw new ApolloOpenApiException(status.getStatusCode(), status.getReasonPhrase(), message);
}
protected void checkNotEmpty(String value, String name) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(value), name + " should not be null or empty");
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-portal</artifactId>
<name>Apollo Portal</name>
<properties>
<github.path>${project.artifactId}</github.path>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<!-- yml processing -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!-- end of yml processing -->
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
<!-- test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${project.build.directory}</basedir>
<includes>
<include>classes/static/*.html</include>
<include>classes/static/**/*.html</include>
</includes>
<replacements>
<replacement>
<token>\.css\"</token>
<value>.css?v=${maven.build.timestamp}\"</value>
</replacement>
<replacement>
<token>\.js\"</token>
<value>.js?v=${maven.build.timestamp}\"</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ctrip</id>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-portal</artifactId>
<name>Apollo Portal</name>
<properties>
<github.path>${project.artifactId}</github.path>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<!-- yml processing -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!-- end of yml processing -->
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
<!-- test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${project.build.directory}</basedir>
<includes>
<include>classes/static/*.html</include>
<include>classes/static/**/*.html</include>
</includes>
<replacements>
<replacement>
<token>\.css\"</token>
<value>.css?v=${maven.build.timestamp}\"</value>
</replacement>
<replacement>
<token>\.js\"</token>
<value>.js?v=${maven.build.timestamp}\"</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ctrip</id>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java | package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
*
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
*
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = LoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
*
* <br />
*
* In production environment, we still suggest using one single domain like http://config.xxx.com(backed by software
* load balancers like nginx) instead of multiple ip addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn("Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
*
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
*
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = LoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
*
* <br />
*
* In production environment, we still suggest using one single domain like http://config.xxx.com(backed by software
* load balancers like nginx) instead of multiple ip addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn("Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/development/apollo-development-guide.md | 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#一、准备工作)
2. [2.1 创建数据库](zh/deployment/distributed-deployment-guide#_21-创建数据库)
## 1.2 Apollo总体设计
具体请参考[Apollo配置中心设计](zh/design/apollo-design)
# 二、本地启动
## 2.1 Apollo Config Service和Apollo Admin Service
我们在本地开发时，一般会在IDE中同时启动`apollo-configservice`和`apollo-adminservice`。
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-configservice`和`apollo-adminservice`。
### 2.1.1 新建运行配置
### 2.1.2 Main class配置
`com.ctrip.framework.apollo.assembly.ApolloApplication`
> 注：如果希望独立启动`apollo-configservice`和`apollo-adminservice`，可以把Main Class分别换成
> `com.ctrip.framework.apollo.configservice.ConfigServiceApplication`和
> `com.ctrip.framework.apollo.adminservice.AdminServiceApplication`
### 2.1.3 VM options配置
-Dapollo_profile=github
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloConfigDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloConfigDB`
>
>注2：程序默认日志输出为/opt/logs/100003171/apollo-assembly.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-assembly.log
### 2.1.4 Program arguments配置
`--configservice --adminservice`
### 2.1.5 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。
> 注：除了在Eureka确认服务状态外，还可以通过健康检查接口确认服务健康状况：
>
> apollo-adminservice： [http://localhost:8090/health](http://localhost:8090/health)
> apollo-configservice： [http://localhost:8080/health](http://localhost:8080/health)
>
> 如果服务健康，返回内容中的status.code应当为`UP`：
>
> {
> "status": {
> "code": "UP",
> ...
> },
> ...
> }
## 2.2 Apollo-Portal
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-portal`。
### 2.2.1 新建运行配置
### 2.2.2 Main class配置
`com.ctrip.framework.apollo.portal.PortalApplication`
### 2.2.3 VM options配置
-Dapollo_profile=github,auth
-Ddev_meta=http://localhost:8080/
-Dserver.port=8070
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloPortalDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：这里指定了apollo_profile是`github`和`auth`，其中`github`是Apollo必须的一个profile，用于数据库的配置，`auth`是从0.9.0新增的，用来支持使用apollo提供的Spring Security简单认证，更多信息可以参考[Portal-实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
>
>注2：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloPortalDB `。
>
>注3：默认ApolloPortalDB中导入的配置只会展示DEV环境的配置，所以这里配置了dev\_meta属性，如果你希望在本地展示其它环境的配置，需要在这里增加其它环境的meta服务器地址，如fat\_meta。
>
>注4：这里指定了server.port=8070是因为`apollo-configservice`启动在8080端口，所以这里配置`apollo-portal`启动在8070端口。
>
>注5：程序默认日志输出为/opt/logs/100003173/apollo-portal.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-portal.log
### 2.2.4 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。
>注：如果启用了`auth` profile的话，默认的用户名是apollo，密码是admin
### 2.2.5 Demo应用接入
为了更好的开发和调试，一般我们都会自己创建一个demo项目给自己使用。
可以参考[一、普通应用接入指南](zh/usage/apollo-user-guide#一、普通应用接入指南)创建自己的demo项目。
## 2.3 Java样例客户端启动
项目中有一个样例客户端的项目：`apollo-demo`，下面以Intellij Community 2016.2版本为例来说明如何在本地启动。
### 2.3.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`apollo-demo`项目的app.properties文件中：`apollo-demo/src/main/resources/META-INF/app.properties`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
app.id=100004458
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
> 更多配置AppId的方式可以参考[1.2.1 AppId](zh/usage/java-sdk-user-guide#_121-appid)
### 2.3.2 新建运行配置
### 2.3.3 Main class配置
`SimpleApolloConfigDemo`
### 2.3.4 VM options配置
-Dapollo.meta=http://localhost:8080
> 注：这里当前环境的meta server地址为`http://localhost:8080`，也就是`apollo-configservice`的地址。
> 更多配置Apollo Meta Server的方式可以参考[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)
### 2.3.5 概览
### 2.3.6 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> [SimpleApolloConfigDemo] Loading key : timeout with value: 100
> 客户端日志级别默认是`DEBUG`，如果需要调整，可以通过修改`apollo-demo/src/main/resources/log4j2.xml`中的level配置
> ```xml
> <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
> <AppenderRef ref="Async" level="DEBUG"/>
> </logger>
> ```
## 2.4 .Net样例客户端启动
[apollo.net](https://github.com/ctripcorp/apollo.net)项目中有一个样例客户端的项目：`ApolloDemo`，下面就以VS 2010为例来说明如何在本地启动。
### 2.4.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`ApolloDemo`项目的APP.config文件中：`apollo.net\ApolloDemo\App.config`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
```xml
<add key="AppID" value="100004458"/>
```
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
### 2.4.2 配置服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以我们需要在app.config或web.config配置服务器地址(Apollo.{ENV}.Meta)。假设DEV环境的配置服务(apollo-configservice)地址是11.22.33.44，那么我们就做如下配置：
### 2.4.3 运行
运行`ApolloConfigDemo.cs`即可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> Loading key: timeout with value: 100
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 三、开发
## 模块依赖图
## 3.1 Portal 实现用户登录功能
请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
## 3.2 Portal 接入邮件服务
请参考[Portal 接入邮件服务](zh/development/portal-how-to-enable-email-service)
| 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#一、准备工作)
2. [2.1 创建数据库](zh/deployment/distributed-deployment-guide#_21-创建数据库)
## 1.2 Apollo总体设计
具体请参考[Apollo配置中心设计](zh/design/apollo-design)
# 二、本地启动
## 2.1 Apollo Config Service和Apollo Admin Service
我们在本地开发时，一般会在IDE中同时启动`apollo-configservice`和`apollo-adminservice`。
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-configservice`和`apollo-adminservice`。
### 2.1.1 新建运行配置
### 2.1.2 Main class配置
`com.ctrip.framework.apollo.assembly.ApolloApplication`
> 注：如果希望独立启动`apollo-configservice`和`apollo-adminservice`，可以把Main Class分别换成
> `com.ctrip.framework.apollo.configservice.ConfigServiceApplication`和
> `com.ctrip.framework.apollo.adminservice.AdminServiceApplication`
### 2.1.3 VM options配置
-Dapollo_profile=github
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloConfigDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloConfigDB`
>
>注2：程序默认日志输出为/opt/logs/100003171/apollo-assembly.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-assembly.log
### 2.1.4 Program arguments配置
`--configservice --adminservice`
### 2.1.5 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。
> 注：除了在Eureka确认服务状态外，还可以通过健康检查接口确认服务健康状况：
>
> apollo-adminservice： [http://localhost:8090/health](http://localhost:8090/health)
> apollo-configservice： [http://localhost:8080/health](http://localhost:8080/health)
>
> 如果服务健康，返回内容中的status.code应当为`UP`：
>
> {
> "status": {
> "code": "UP",
> ...
> },
> ...
> }
## 2.2 Apollo-Portal
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-portal`。
### 2.2.1 新建运行配置
### 2.2.2 Main class配置
`com.ctrip.framework.apollo.portal.PortalApplication`
### 2.2.3 VM options配置
-Dapollo_profile=github,auth
-Ddev_meta=http://localhost:8080/
-Dserver.port=8070
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloPortalDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：这里指定了apollo_profile是`github`和`auth`，其中`github`是Apollo必须的一个profile，用于数据库的配置，`auth`是从0.9.0新增的，用来支持使用apollo提供的Spring Security简单认证，更多信息可以参考[Portal-实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
>
>注2：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloPortalDB `。
>
>注3：默认ApolloPortalDB中导入的配置只会展示DEV环境的配置，所以这里配置了dev\_meta属性，如果你希望在本地展示其它环境的配置，需要在这里增加其它环境的meta服务器地址，如fat\_meta。
>
>注4：这里指定了server.port=8070是因为`apollo-configservice`启动在8080端口，所以这里配置`apollo-portal`启动在8070端口。
>
>注5：程序默认日志输出为/opt/logs/100003173/apollo-portal.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-portal.log
### 2.2.4 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。
>注：如果启用了`auth` profile的话，默认的用户名是apollo，密码是admin
### 2.2.5 Demo应用接入
为了更好的开发和调试，一般我们都会自己创建一个demo项目给自己使用。
可以参考[一、普通应用接入指南](zh/usage/apollo-user-guide#一、普通应用接入指南)创建自己的demo项目。
## 2.3 Java样例客户端启动
项目中有一个样例客户端的项目：`apollo-demo`，下面以Intellij Community 2016.2版本为例来说明如何在本地启动。
### 2.3.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`apollo-demo`项目的app.properties文件中：`apollo-demo/src/main/resources/META-INF/app.properties`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
app.id=100004458
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
> 更多配置AppId的方式可以参考[1.2.1 AppId](zh/usage/java-sdk-user-guide#_121-appid)
### 2.3.2 新建运行配置
### 2.3.3 Main class配置
`SimpleApolloConfigDemo`
### 2.3.4 VM options配置
-Dapollo.meta=http://localhost:8080
> 注：这里当前环境的meta server地址为`http://localhost:8080`，也就是`apollo-configservice`的地址。
> 更多配置Apollo Meta Server的方式可以参考[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)
### 2.3.5 概览
### 2.3.6 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> [SimpleApolloConfigDemo] Loading key : timeout with value: 100
> 客户端日志级别默认是`DEBUG`，如果需要调整，可以通过修改`apollo-demo/src/main/resources/log4j2.xml`中的level配置
> ```xml
> <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
> <AppenderRef ref="Async" level="DEBUG"/>
> </logger>
> ```
## 2.4 .Net样例客户端启动
[apollo.net](https://github.com/ctripcorp/apollo.net)项目中有一个样例客户端的项目：`ApolloDemo`，下面就以VS 2010为例来说明如何在本地启动。
### 2.4.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`ApolloDemo`项目的APP.config文件中：`apollo.net\ApolloDemo\App.config`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
```xml
<add key="AppID" value="100004458"/>
```
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
### 2.4.2 配置服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以我们需要在app.config或web.config配置服务器地址(Apollo.{ENV}.Meta)。假设DEV环境的配置服务(apollo-configservice)地址是11.22.33.44，那么我们就做如下配置：
### 2.4.3 运行
运行`ApolloConfigDemo.cs`即可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> Loading key: timeout with value: 100
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 三、开发
## 模块依赖图
## 3.1 Portal 实现用户登录功能
请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
## 3.2 Portal 接入邮件服务
请参考[Portal 接入邮件服务](zh/development/portal-how-to-enable-email-service)
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js | directive_module.directive('apollodiff',
function ($compile, $window, AppUtil) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/diff.html',
transclude: true,
replace: true,
scope: {
oldStr: '=',
newStr: '=',
apolloId: '='
},
link: function (scope, element, attrs) {
scope.$watch('oldStr', makeDiff);
scope.$watch('newStr', makeDiff);
function makeDiff() {
var displayArea = document.getElementById(scope.apolloId);
if (!displayArea) {
return;
}
//clear
displayArea.innerHTML = '';
var color = '',
span = null,
pre = '';
var oldStr = scope.oldStr == undefined ? '' : scope.oldStr;
var newStr = scope.newStr == undefined ? '' : scope.newStr;
var diff = JsDiff.diffLines(oldStr, newStr),
fragment = document.createDocumentFragment();
diff.forEach(function (part) {
// green for additions, red for deletions
// grey for common parts
color = part.added ? 'green' :
part.removed ? 'red' : 'grey';
span = document.createElement('span');
span.style.color = color;
pre = part.added ? '+' :
part.removed ? '-' : '';
span.appendChild(document.createTextNode(pre + part.value));
fragment.appendChild(span);
});
displayArea.appendChild(fragment);
}
}
}
});
| directive_module.directive('apollodiff',
function ($compile, $window, AppUtil) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/diff.html',
transclude: true,
replace: true,
scope: {
oldStr: '=',
newStr: '=',
apolloId: '='
},
link: function (scope, element, attrs) {
scope.$watch('oldStr', makeDiff);
scope.$watch('newStr', makeDiff);
function makeDiff() {
var displayArea = document.getElementById(scope.apolloId);
if (!displayArea) {
return;
}
//clear
displayArea.innerHTML = '';
var color = '',
span = null,
pre = '';
var oldStr = scope.oldStr == undefined ? '' : scope.oldStr;
var newStr = scope.newStr == undefined ? '' : scope.newStr;
var diff = JsDiff.diffLines(oldStr, newStr),
fragment = document.createDocumentFragment();
diff.forEach(function (part) {
// green for additions, red for deletions
// grey for common parts
color = part.added ? 'green' :
part.removed ? 'red' : 'grey';
span = document.createElement('span');
span.style.color = color;
pre = part.added ? '+' :
part.removed ? '-' : '';
span.appendChild(document.createTextNode(pre + part.value));
fragment.appendChild(span);
});
displayArea.appendChild(fragment);
}
}
}
});
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/apollo-portal-server/Dockerfile | # Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash tzdata && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
mkdir -p /apollo-portal-server
ADD . /apollo-portal-server/
ENV APOLLO_PORTAL_SERVICE_NAME="service-apollo-portal-server.sre"
EXPOSE 8070
CMD ["/apollo-portal-server/scripts/startup-kubernetes.sh"]
| # Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash tzdata && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
mkdir -p /apollo-portal-server
ADD . /apollo-portal-server/
ENV APOLLO_PORTAL_SERVICE_NAME="service-apollo-portal-server.sre"
EXPOSE 8070
CMD ["/apollo-portal-server/scripts/startup-kubernetes.sh"]
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/resources/static/scripts/services/FavoriteService.js | appService.service('FavoriteService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_favorites: {
method: 'GET',
url: AppUtil.prefixPath() + '/favorites',
isArray: true
},
add_favorite: {
method: 'POST',
url: AppUtil.prefixPath() + '/favorites'
},
delete_favorite: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/favorites/:favoriteId'
},
to_top: {
method: 'PUT',
url: AppUtil.prefixPath() + '/favorites/:favoriteId'
}
});
return {
findFavorites: function (userId, appId, page, size) {
var d = $q.defer();
resource.find_favorites({
userId: userId,
appId: appId,
page: page,
size: size
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
addFavorite: function (favorite) {
var d = $q.defer();
resource.add_favorite({}, favorite, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
deleteFavorite: function (favoriteId) {
var d = $q.defer();
resource.delete_favorite({
favoriteId: favoriteId
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
toTop: function (favoriteId) {
var d = $q.defer();
resource.to_top({
favoriteId: favoriteId
}, {}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| appService.service('FavoriteService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_favorites: {
method: 'GET',
url: AppUtil.prefixPath() + '/favorites',
isArray: true
},
add_favorite: {
method: 'POST',
url: AppUtil.prefixPath() + '/favorites'
},
delete_favorite: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/favorites/:favoriteId'
},
to_top: {
method: 'PUT',
url: AppUtil.prefixPath() + '/favorites/:favoriteId'
}
});
return {
findFavorites: function (userId, appId, page, size) {
var d = $q.defer();
resource.find_favorites({
userId: userId,
appId: appId,
page: page,
size: size
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
addFavorite: function (favorite) {
var d = $q.defer();
resource.add_favorite({}, favorite, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
deleteFavorite: function (favoriteId) {
var d = $q.defer();
resource.delete_favorite({
favoriteId: favoriteId
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
toTop: function (favoriteId) {
var d = $q.defer();
resource.to_top({
favoriteId: favoriteId
}, {}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/SpringSecurityUserInfoHolder.java | package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.security.Principal;
public class SpringSecurityUserInfoHolder implements UserInfoHolder {
@Override
public UserInfo getUser() {
UserInfo userInfo = new UserInfo();
userInfo.setUserId(getCurrentUsername());
return userInfo;
}
private String getCurrentUsername() {
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
if (principal instanceof UserDetails) {
return ((UserDetails) principal).getUsername();
}
if (principal instanceof Principal) {
return ((Principal) principal).getName();
}
return String.valueOf(principal);
}
}
| package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.security.Principal;
public class SpringSecurityUserInfoHolder implements UserInfoHolder {
@Override
public UserInfo getUser() {
UserInfo userInfo = new UserInfo();
userInfo.setUserId(getCurrentUsername());
return userInfo;
}
private String getCurrentUsername() {
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
if (principal instanceof UserDetails) {
return ((UserDetails) principal).getUsername();
}
if (principal instanceof Principal) {
return ((Principal) principal).getName();
}
return String.valueOf(principal);
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java | package com.ctrip.framework.apollo.internals;
import java.util.Map;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.spi.ConfigFactory;
import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
import com.google.common.collect.Maps;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigManager implements ConfigManager {
private ConfigFactoryManager m_factoryManager;
private Map<String, Config> m_configs = Maps.newConcurrentMap();
private Map<String, ConfigFile> m_configFiles = Maps.newConcurrentMap();
public DefaultConfigManager() {
m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class);
}
@Override
public Config getConfig(String namespace) {
Config config = m_configs.get(namespace);
if (config == null) {
synchronized (this) {
config = m_configs.get(namespace);
if (config == null) {
ConfigFactory factory = m_factoryManager.getFactory(namespace);
config = factory.create(namespace);
m_configs.put(namespace, config);
}
}
}
return config;
}
@Override
public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
String namespaceFileName = String.format("%s.%s", namespace, configFileFormat.getValue());
ConfigFile configFile = m_configFiles.get(namespaceFileName);
if (configFile == null) {
synchronized (this) {
configFile = m_configFiles.get(namespaceFileName);
if (configFile == null) {
ConfigFactory factory = m_factoryManager.getFactory(namespaceFileName);
configFile = factory.createConfigFile(namespaceFileName, configFileFormat);
m_configFiles.put(namespaceFileName, configFile);
}
}
}
return configFile;
}
}
| package com.ctrip.framework.apollo.internals;
import java.util.Map;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.spi.ConfigFactory;
import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
import com.google.common.collect.Maps;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigManager implements ConfigManager {
private ConfigFactoryManager m_factoryManager;
private Map<String, Config> m_configs = Maps.newConcurrentMap();
private Map<String, ConfigFile> m_configFiles = Maps.newConcurrentMap();
public DefaultConfigManager() {
m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class);
}
@Override
public Config getConfig(String namespace) {
Config config = m_configs.get(namespace);
if (config == null) {
synchronized (this) {
config = m_configs.get(namespace);
if (config == null) {
ConfigFactory factory = m_factoryManager.getFactory(namespace);
config = factory.create(namespace);
m_configs.put(namespace, config);
}
}
}
return config;
}
@Override
public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
String namespaceFileName = String.format("%s.%s", namespace, configFileFormat.getValue());
ConfigFile configFile = m_configFiles.get(namespaceFileName);
if (configFile == null) {
synchronized (this) {
configFile = m_configFiles.get(namespaceFileName);
if (configFile == null) {
ConfigFactory factory = m_factoryManager.getFactory(namespaceFileName);
configFile = factory.createConfigFile(namespaceFileName, configFileFormat);
m_configFiles.put(namespaceFileName, configFile);
}
}
}
return configFile;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/NamespaceIdentifier.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.model.Verifiable;
public class NamespaceIdentifier implements Verifiable {
private String appId;
private String env;
private String clusterName;
private String namespaceName;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(String env) {
this.env = env;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
@Override
public boolean isInvalid() {
return StringUtils.isContainEmpty(env, clusterName, namespaceName);
}
@Override
public String toString() {
return "NamespaceIdentifer{" +
"appId='" + appId + '\'' +
", env='" + env + '\'' +
", clusterName='" + clusterName + '\'' +
", namespaceName='" + namespaceName + '\'' +
'}';
}
}
| package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.model.Verifiable;
public class NamespaceIdentifier implements Verifiable {
private String appId;
private String env;
private String clusterName;
private String namespaceName;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(String env) {
this.env = env;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
@Override
public boolean isInvalid() {
return StringUtils.isContainEmpty(env, clusterName, namespaceName);
}
@Override
public String toString() {
return "NamespaceIdentifer{" +
"appId='" + appId + '\'' +
", env='" + env + '\'' +
", clusterName='" + clusterName + '\'' +
", namespaceName='" + namespaceName + '\'' +
'}';
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/condition/ConditionalOnMissingProfile.java | package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are inactive.
*
* @author Jason Song([email protected])
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnMissingProfile {
/**
* The profiles that should be inactive
* @return
*/
String[] value() default {};
}
| package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are inactive.
*
* @author Jason Song([email protected])
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnMissingProfile {
/**
* The profiles that should be inactive
* @return
*/
String[] value() default {};
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/alpine-bash-3.8-image/Dockerfile | # Build with:
# docker build -t alpine-bash:3.8 .
FROM alpine:3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone
CMD ["bash"]
| # Build with:
# docker build -t alpine-bash:3.8 .
FROM alpine:3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone
CMD ["bash"]
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/NamespaceReleaseDTO.java | package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String releaseTitle) {
this.releaseTitle = releaseTitle;
}
public String getReleaseComment() {
return releaseComment;
}
public void setReleaseComment(String releaseComment) {
this.releaseComment = releaseComment;
}
public String getReleasedBy() {
return releasedBy;
}
public void setReleasedBy(String releasedBy) {
this.releasedBy = releasedBy;
}
public boolean isEmergencyPublish() {
return isEmergencyPublish;
}
public void setEmergencyPublish(boolean emergencyPublish) {
isEmergencyPublish = emergencyPublish;
}
}
| package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String releaseTitle) {
this.releaseTitle = releaseTitle;
}
public String getReleaseComment() {
return releaseComment;
}
public void setReleaseComment(String releaseComment) {
this.releaseComment = releaseComment;
}
public String getReleasedBy() {
return releasedBy;
}
public void setReleasedBy(String releasedBy) {
this.releasedBy = releasedBy;
}
public boolean isEmergencyPublish() {
return isEmergencyPublish;
}
public void setEmergencyPublish(boolean emergencyPublish) {
isEmergencyPublish = emergencyPublish;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./doc/images/publish-items.png | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`?:VϘ U=qİK.J_Y}_(UUylX]ve۱)S!=[~ E0 FYf##B B B```VW5}ΗR8C.C[Oմq!!p>@{>'X#Љ 1Fؿ_(ą@@!P >kul
f%N0V 80d !bh/@@ǩ #mmwO\@@@@8~`5!k!!!\:+gee ;+g}w'gN ۻUC 6'h7gl9@w>_8:.JYw}!W\]uUKoǯTZRN]t]!!!!!Sx3ٝR)g@@L'Ps9I\gwj:i,RG ~m+o;WS8>ot47T q (GY aotPFr`= (Fa0p
#J*6qC B B B B` j2v#*B B B` yimJ^UAKva(w gyfd
_ FCuo+}8s=5\B/ =zt8.~
8yK'X _^|譼}6P_ #B B B B B B B B B H2@`
VMvxX%֖sRw *41ΕfhDRV^/ϯ6aSSa|yK7͕~V}nV4XuUW^~⦛nڑF)ه@@@@@@@@@@@,je(Y{ ܮ.[2R|+)##ՆpՖO~\qj7+ciSk|'$ q66 W<i߿'| dFs~"ُUO~/߃<^z%<U>Um5s\@@@@@@@@@@@ lQQ^~adk`b$cai
__Ty(/# D[o߾/?ȑ#;Ｓg)#6Wk =DוW^yљҪWFK/tXeˏSvfuEOiN~iq֫j{nxy1vP҃!R+7x駟 ÿt[ٳd S c:VgKX@@@@@@@@@@@$fqرcfl`av۱"Zոmyצ9 Ρ>L VSA[o 1aWYQ>q,~0^W~+); tM';gl$:ɰW>``3o|:epkjRj }|P8xXY%ꫯa%t!!!!!!!!!!!= s曩VΟ.feбrv֪G0}˸C`yl'c]9~s\jiN،%ZIZ[S ><pF璧]WynVN?C凙$I˘~M'U~HFZ2 cU 3.B B B B B B B B B B`j⣚5kO-+gmC8W'l!.Z>9lTcbȚf@06GW 9uu~}ao
xf$jV\z̫_+c|ۗWٌo#\f]Y0:^jOO峍͒CߣG.=]Soat1_ Vu\@@@@"0 d|H|^kcC7Q[ksGE>HћwG 6i-|ZΕ<3lT>˕wÕ-7xc X,mvΧP5iFFbex+.֭UX^^ܒ4](}aX à J?o0VEKW_=WeySUbcXrΒR#rɒ /Pу S\3Zˈg+iᅋZyg !!!!!9 yI˶+yژj)f_(1ymytRyxMC3ޜH o+__|u]7'|An-L&9s\ɫ8.}Wr qJ{̓MՏUni~v۶-VuC x7.L1/_jjB'æ3ɳ ]g?%Oy<e`Mںr6nttotU 8qgƬ+ '
^<c[B9B9sK'-#8\=Zcrܰg @:IxfRr~xk_;t1ae'[o5|?N]w2!0B B B B B 6 }ߗrV s87&UZq8{cvrjfֹ];[~Ui[9߸+x=lVxQuQ<iX?Z][YoEicn mIz9yxjX?|GVL&a=->[Cmi]^B:鼌'/
?/UFٗ~W|+bזy͏W!6<eOW_ omWmPZu7jdn n MQQu3e|BŪM7h}n՛kpD<g`" v3q6*ʗ\y$Vi2˟T~^Ɓnq^&OQ _#{n0$zj3ŌnXjG[;&7q7OeA1'6mƺ` 7x7yMY1o;h7hipC}%u3K@@@@@,qáĤ~;?}}a0ag 9"\c\i_ yj*?z'-9\1)y W'ɦ+_ۉ[yϘjc -9mZzKC B B`^sƳ̳|-WjNל82U 퀡Prs(t
?x)OСCC?\~ֿ`kI/L!=4)~/F>ɩ#96@˰jm"M)L#u&oE|7
w 9<
ܼMs bn
YW.~54q&j&
*r,3L|Mvg冠Nsk2I.c"A\z9u|'oum+q.{M[7a1Cu n YdN!tҞqў-r\OoNHp$1O!!!!!8!Tӌ
^ 03 ǘ _kNZcv:쭕Am<bNnm^% C OX[J#iR0yr ?堃1qvb;Io3W@gCV;Whtr !!0樟pP/1y6 3n
O xnk~ ]
5j.݂ Eݨ{]FzK WqȴhK_O]gYWBsӧIͷ;dMK
n?B_lVY8a}1j5
't<rSv#vspvsӐfѐl -4I
_|7/ơ
L7U~3DX\amE +AV<Z]K*w9ܸ+ҮfOF
a K?7{aAVVݸYΉĖ'\i 9˥-}*/y҉n%ݗq/6) :PĄB=+/3rk5?I:/B B B B B`o̸`"Ǐ,j26,V\~5Rv /%˜cd;PyHo,نϏ,aR $Gst0mGpG~;*\1Wag;v<@[y+?#1ҷ&X+\y8qs !!xnxF>ݯ~%#nixɳsɳ!sb|&?Z gsS8p/TXi+M]0~+_2ֲ?W'W <.[< z4wmz_| 9;1/̭Wi&cmb+,7o!r2+"'#Eeh\ @eq%h5H3(jRA7 LN[2cl 0oL9h0y7 gxn`n]t5 - Փ?>_"\Y9C~t.g^Z
2q
ܶ-mC,{yҷ$Ϭtp'wu]Wz{~&jrCK>Q2<ߍ kc_I1J'l;vȰ78T>31`UH0hLi|ERƏ&/+^`ϘHzpVp,?*O8k*$GV/M+_sa%U2meϙT2ָͿulN@ʣX9qY_ׇ>gz{'㠟JsuI\gWo' a;} }5F_a_bӗViK ۈ~Z$9Wl3U}
' r z
c &My*AASǬx?k p^ԩt#v!^-s_l_}Tʛld ɴU{<yjUA.:xUFk\m ߸A.}9J¹0ԵqH$
Go7ǥ0q4h7U)g [QaӇAQ^t-\tQ X8]E:Lq{^z@ K <1 WΖUMI\2j f n~9K Q:hu}rI mCU;ƻ Ä@@@@f&`c>qCMOrԤbjƨT c:z* c6z{YEMjy ߖ% AWX͍LU2%:'Xu^䌳|rKu`CZaz0s̟dU/B B <S<3}\Տ7[oux||tZ(ae8%dz<<;;oy]T8͓(n'io"~p
MU#ԍtWN|}C:vf('/ ?%w'qSUXW Q;'>S*c//`}OK8h y]6}TyL˼Zu5к]fP 7oBi@tnMg05$.NV}ȍ05zHaԪފ'?aZ>8W6q=LXiXh' 4W{_ΟEo >QцX^8ӫm zۤj?N;n۸t(G7 MJ+iW ͩ+l+zQt6@wN*{řg/va \ڣss2!!!![>}k?oԘӄ8&%[W}J߆cs&ǵ9&O+E(q5}5f&mzR&Lj*9W 3*V%^ cѕ E֍52.2:6I9= ʯL`g\@@9r \?<<e={ŭggO$?3 繿կs+m; eOK 稯b8oԇza3O S<9}v6OY:7FWuUdwa H0̱ϐ] X
s I?2J*cun0w]b.u)aM7a[?d~C5S?yp|r'_?-*<^yG";JZd`4[qTx;*EO0R㍋[rS&J|fïkD!ñʡAY@!XY4V8xvtǷn|-P7)*g9\МIK-L{̵ \9avZ W^'ҵMJ7Ozds&
'~ũ~9Eyڶ 8Mɛ_tkچvTie8B B B B B,K~\j,AcrMu]^t\N?đqiVy$ g|nONe-y~|<> 34'x8ccmqڹ
t&LVZaѷƚƿ߸\Ţ2gܭ1?+85kRK^5brTYS=V8ą@@l?sJ깴yzN{x+g'A# } ={6yyz~=óg$i7q]ui_ F߅}Ϩf?v ][8䥍3 61vԗEȠѯr8w\Dz9澕] U ˣ V}VM{s S=ᩞ\JfuW1s}Ց d߲nlȘK~ O Jѓ};-`d~YNtru:_j
@.z s1sȝtmegj(tɪ|&47m &mZ] 0]\mlWƊqҍ>.:o
]-q] kqJk nɕMu+ uo8%ݻ9j/n+qR>oi?kqdaF1?qkvk?)kH[tʒ^FhӴr ]\2+\J`?!!!!!K~*2.kۼ`ihk3 0.5^ i+ZWryYx&ȬIY?3 ݏC /nDQNy*l*]_(&jkle9J%bo+=M;.eZ)וXڤ\Zd !! mQ6l5Ǟ! (C029C~z#{w@kozV2*vyθ ׳tyUv}3| ;r>:bdXɨ~"?e!C跔Q 'vr0Ť:S_5\>QLN qҚׇ 3䚇
w,_/2qPpYR,UFm}CyسMR gJ'CTm7~] i,*`WaUFq*l0 f56akAH]9ɮV\2Soiᥧ<aRj|*pl
c\=dk]$'W<U_\ XXF/>r]:amLӯtppX.29r k[iyKݴ<0UGMW[eYzNv8.ҹ\ϮeQ7}Xج,R
M@X¦nh<mrOݸXO?X¹qtm5;*9&+x?.MwܞW\~d8؛*x5I*YGٜa~Gq۱gGcr>5kyUڗ_ɒt37|eN[Wu8B B`kki?~nZ%We%"7u: O 3c0.8Ye / /(@[zRq{~t5n8 WX
W5:8`Aef}N W /.*'~U2*V+ 6f^ھ2XZ*~Kuö.̳8ԥ'%˱ؒ-8sqԅO% J]rd*S]dg%y|ߑlm*, .ZpYUi 3U؉q:'O&GG
־ҭKCi:ПlqZGL .+] AW=mXvci 5.q#P\{C&`'?N8-i#r eoV4ԿZlqjK}MZ9m g,'!!!!! T~N]_me&m&uLW86X<c
Z3֘<9>Ƭѥ_þM
+?*c-LDj[qoA2 *9DU_2lcc:mtS'ŵW9mqNm4q!![@=J=d?N9G`$qYD7As۞G^Ϸl/Pakq~_NͳZ Ĝ)>Nu\[n^]K zҧ| \}҇+I\9aϢ,ʤ ضV媲Wc1;c^ DX aVzq}C*ڏhҙ|i~ I
] ،lI& 8ܿPS\=}o}$hgA9ICqs*
0Fŭ0`
&lTXFGTx8r8Ϳ4wV+غ!xx:wcY6FΗS/VΫLu8M7-ެ62Mi<JvcqQ| 7JF0 r4=MD8&!a2 W|ci`,mdg28ݘ?\s{57I'ZgF~G iv"=ʯcxR!aG<FΚ|1)[Ms&L d+#&Jΐ?Øȩ2c>\+)/& Y&GۉJS8Mzn f !!uj]~oVs\ ~ =<|Fﵗ{yCYTaaɬp
_uOO!C1c{Щ[% , :R֊v o}# }Vz2k3dSVZ%U>Wm.Z,m]_O>W,C8Cb%#{lOSl,6q :tmgo[U呞Lei+\}gJU.mĵ^}YrYfF=}Seft 7*d{
WNCsQV'O~c*i2AO ߖ7.S Pε他T`Lvv!r>Jۖ'&XWZ&iԎN0qݶma*0zZXVc n XNC B B B B 'Pc. øưǑ_}yFL~
&M7ǿ !@<a&Jo{0䘴5Trtu^==LZ+c>P6~@*?<Se3ޕN1W\,:3Ί;օli9q1ae4)욈2VteWT ] !!+!`3Gs<0Vz{ٜN\zVz~ɒ}^2Vr+o-qǺzhYpkV͋*4XZu(_}_OˠWOױHcNݱ>
sZז*Uneč
d\GUq]3?[sǮ \p _o2hrM;/Ղ9O5Z^ AKO~sע>JI|L @/}KCY
זIg\ķGZziWtx#c[-n O$~ 0+0yrn *u*ōKxWo_c+8ȞO=ͯd/
qZ2P =198snO6V&<[u^u=o:$8n!pYxڕmL r/.Q)W,u^͔pOp/ ~C , >ød !!!!!0@k?;|=e#qqpA&U+lhƣgZ &5yH#qkv]\c[v\B*
4t1~1AWO2;)t&013Ftאñ:I9G6^]Y"q2?e752֡dV6]C B 6 jɯz`c(R8<֩ggh[sg0#8 m-ؐyke5iV碋Yx韴a0`NVSDA" گS}}&SꜿǤ7O\}JOj/C! sʥ|"\<j#3kQS_?:\VSuLSʢNE8I?\bG%ڢ6Aҟh]lqt7O
4Bg#
G|ڼ d&NՀ
W M+s7 #d,ɷmcՐ뭆iyYS<.cřgO-B[~L^[/Njuxe2>:/ :{q6oN;SVߟ'zK!K\d#?u-v/4Nrwő^^F2' t*<IfB B B B B >ÄٜI4c|M;O#Iظ\XF7 |B6No6OV:BA'c" #SX73nȘPYY R6# d* 1^^:9_aWݷc9K&yg+nWه@@l~u_oo{;B<HwzyZO RU|}23ɟQȳY
V)9Ted8ơ~NY?q+ _U0鯔:8
;D}#ǥ~chcx,Ւ◁l)V#Gش c/uFuƞNC5珑tLIyO~'3j# ƺ^ ꇑNM2Pq* m^VNmb^G6OO7'ymTUj``Qf+B$ 3͉V;TrrTBRa4WnhmpcqSq1hD%^ C_{C**
j`Nk]t q\ hm*tQPzU oVfsse<c8+6Ʃ x[ҥX8~nɹZY7mds
R~dT cWV ezUOƅ@@@@@@ｲ_/εVo喥ossm [QOl[2QlWN< 3Y:+98iocc*3c:y cx8xބUWe*s?D,N ˿ + s !!qVA1γJL9!zv,e3J_jxfy>{6R,E<۬{~@h" }} s#rŦ80wGHx~ Sz6lsޕ^ꃕ]E? ttw9,yʻR v7VbQ >VoN uxm+y裖㯾kל>7]dKִ<k+VW:+͋tg5[YuVr*We4͉.
FUi24,ci Yz7w7FŹp+M@a!
P4N{nYn.&@,z ,2pG+>tn9Y_# wr&6?۲9)i z䁥GVSmhZ~cy[oYֿҸ^:mLDCiߜvDmwt'f%Wz\]%? c {953 5V/DXy&b7!$^]ĭ㚨11*s2t. ķN|:ONEU(Q¦vdtx qS 8Y
W~uRs$Wq!![{y='='*ܳsq I<0ǠE'|rxn{Сa AgG }tiZUdѽq^Eկhh/g #L?A\ :ƙ ,f }sڕ c?뮻WSJomEzGyl:)6# zؚG/N-"}ֺE}82] l?9s i; -Zf|<Sn33& \@We
c24i&r[
W<4:8ݰ< 9
}zk,PiS7Ye.٫EfH'aUΒsev* 2 -_q(ٓfSy 2{̭-2Tz 巜 mtri[yy|Ksi@N6<[yIÐ<7b" K :$]wJ'm"CaRX/Oyx}lc<GՏ7֎،=M76m 3o,alVyn7/| 7&1&6&QC\c~_L:;w<UA/ GI\q|
.dׄfӒÏ\!Cҫּͧ4g\@$P~}ssfQ9@gNs=g=h}
q\{ ={V'/ۺU} <rU kw'cMK >A-j_P~ zʳlJҖ
M'fwV:^^{ C6:Ǧ?m8a` _ d,G'Xk9a,-lZ746U
daӜpn";v6 J&xˣsM5v~;c% ٖDZW
Ҍe˃ ƶ^N104nu'=k漌b sob&Jv5N BN9{+< cZ7o^cF=qevctSspڋ+`T~@[!YפzLOK횪'`zȓ=M欲$,B B B B v25}:c }y{cZc [ӷd1O+.q|mÔ+{kܸckצ!o F76&RgS&(< m,fdkZKWθK]S^m m<0֦dr !!9 {ksOo5٬R{)z8V+57X~d{0yWY0EġC[ͳ믹bfXMgR~Tu8MiN~d颾;+MQ?MfW E'~Z 3-m믮Pe{Q/^nPO^m)S#\ 7>t}0-n
-L_mW%36h|%K(Ti%ҋ?n tFAJhhѹ1ATziZtmuV Өebtiu\ɥ7 aQN[s=PrXʶ|q8N:䔓3v&]iUcW"▌ڷu&Nk&݇ z?LhVS|K*'@@@@@v"PcYexl@@@YsfVVM'ۅ/o~Pkw6nϱq^ߕ$"N+s</>IfSs[ݩsv:+y{?X1,;ؘE[㰝vJa d@u&[c<pfJv-guGvL> } :4|c`<[/'M߭:+~U
g˶ b!w4%W]dv|Jjmt {Yus>p|d1J{Xڕ8[_j_Ίx/~ꯆHVV>.N[ =B B B B B "ǶbE:VYmCf,?pdXMNڛov<ޗ_)kQ:E ;0IJi7`:"y|Vf"*Q\]Vk S*ul%ol쥕ƒx7&AW^!3Um"Cm5<I$[Y}r 8uc
7,Ri&0F/˃Q
UGdҷ8/)Se*!iS=K* m ŠO2]lO;. +9>58/^$7fcUo7Pߓd/B B B B B B B B B B`0 .gg<˿ @jv^=9RY 6 }ch, N`!Zpt{dsʐ0Z_<
/׀kt lndVJ2^ds,M:ҙn\ u_ҊXgP]IW]ZJ oPp- z ˒ԓ=9d[lI?#mg+[w=qmڞճ7˿ c>!!!!!!!!!!;?? {fa @ IDATѺ<sғ[999ƶS-B ʥyp}㕋R\eʤSM|#]Pi5ooYA<͉x:pǿeiՅZ<.4y<+ ISY\gܸ(-dw=+gyҾde !,γ/c<q7C2m.nDr-S
|͡|À =zt/åÌdpoIyУ6)\ }:0 i<:W cY9X?@~"yLaAՍ*8s7^HF
YV}ַ dC̒-Ã'?**Ny cc.VE@[h 02ڎ 92/go|sͻdq+?!!b8h)n>1_ ¦94νc,W;g _7r_~w׆Evl֓OGDž@@@@@@@@@@4via9fsˌ5\i lɋ l-Ö
Wi08cYP9NZr7V qC B B B B B B B B B v&_/c,ιoڪ!b@,6ԫOܖcW7>6#zuӎevϠ=-XFC B B B B B B B B B v.sɵHl''*"$~l+E#X[7?Fᓯ>[F+{ٝtsYh "ж]ǵ_f;bB B B B B B B B B B`(㬽mN9hl-!hR[2ζ4GK#Ǜ^=4Pۦه@@@@@@@@@@4LZ㬹2JW6&+!#e
n u}lF+1q8ko2FC_/dY`6O}FE`*NJ@ ; xs,څ@@@@@@@@@@l5\u^sе/}k/v<#-%0~<.B B B B B B B B B B #`v =&s|\> X hW-B`!ڇx㰜@@@@@@@@@@y嚃n㱌@-%RC` C hjWVk C B B B B B B B B B
cyf%[C o*=+ݮ5rmj+yէ'VfS>ʅ@@@@@@@@@@;s5\1NsF&!x1.i$\aW{s JhLcW[Ex/C ֗@ 7C`&zMz(N )0!!!!!!!!!!!vIW6<!K !D`5<$ B B B B B B B B B B`j~yt>w &킁F\,@l%?rB B B B B B B B B B v2Ҧ! @( AvUz!!!!!!!!! &0iy<<)Ո)b&!j!:@@@@@@@@@%y[w|vmJԛK[H!!!!!!!!!!E dNzV\6b6Ule` C B B B B B B B B B ֗YaU@ 3!!!!!!!!!!!!!!魳gW2I7 m$g/pxΞoofw_ڵkP?N<]vek_^z_8D0 w{.袙@̟~ݾ}3#/ sיk5g[yJܙ]C4\g{O:ڴX79v}`? Ob=? =Nw'N秝'p~ h#ѣ+߿w=\tw/裏AfwM7u\pR |??u5\ I!!!!!!!!!0t{ݑ#G˃N5Қs |_?,~a]/wԙ䩓\zoMÂ]u肽ߙb<`
Ycwuvn{`NZ/M#7v ·lG%Jq? yٹ!?no?co>yw]w
otyË^AO# aov~;t&je~7{zv$.B B B B B B B B B`Zd XPݻw`| =qD˄6sW8f_#V6sgzgW_y;ݛ_w322"qB ILo ^z{뭷l{Ӌߵ^;t8$+:+\_t?ڻ{WGdcO<}'3-X΅^JC B B B B B B B B F|9T_4nXZI+E/6_N{:B_( ybyuLV݄;ＳD:
: ~U ?_~cr=|įR]-3 FbxJW^yeH>keWx!!!!!!!!!!VFL RH3(oϪ8[s☵![@ [m;àsc-cǎ
Y2
Q'?`d[n鮺1 {aKm2:02u
yIGa!VΖ5\3|5{~RYbE'a! <\}^'8t 8+[}~'u ݽ2,#UVZ [] [kkc>-֕k*Mkr !!!!!!!!!"PFZikҼ9W_#4:E9![@ [elO?tϏ2ZXU:e-3z{K. }ѡq}
Z?W/rG?` f!
yV2,'2ϊX sBs̅rPiҠyӬ-Bه%0ʱs!# X3_rOq{ ~x)l|P +݁nWLF_Xo}[VxG ?l .!!!!!!!!!畀j*4 ;sRn /!;@ ;SX W^Yʵc;3Oalbg &UdZ| go~ z{ '}oo oM5K@@@@@@@@@z--yʋ_me !s @s>%/Z:V?`X}Fx%/h;O<D_bM[6 do ;vlH#3 {u:8
- @@@@@@@@@7hlgk_[?%' <9-@ -PIQ16 /<t0t*ns#˪ٱ!a~Ý<сyì?뭘ا_X _|뭷G.5i1 waw}w75&
-H -XiQ96OC~WVGbcPe,?? 2>ݿ 2 9rdR#.nEVGȧ}@@@@@@@@@s2hQrTxWWwVUOoWB v&hwf!07XD8Wu8Ƃt.>noBfm cߔO~ҽê]qUW]5|
r }Q / o߳j[rꭴJ}@@@@@@@@@c9Js_q͛4; 7|s !@*)*"Pgu4 <x{ >Es!3<3|':YG ?{c V+u?9`Yco}{ :Թ!7 !!!!!!!!!MBvNV^wuKWUF-.,rpą@<1:OC`nV>CGaVg/Xc+]u0!o߾/{u=gnя~4&_vm ё.L8 .oɚ3e@kkYbEx3k%||Z C S$6oY
kƃ>8re7fo%Cհ; gC~{_jꫯ}m'7(!!!!!!!!!= ILk6,Vg 'VrQ _~僌}"Ϊ6&S w^zq?i `xg
.&<0Udc8g@V0C B B B B B B B B B<`=p0Bi VЊ !s @s>%> >S7b/aUl}ا ? Q7|' /ζH"iFV@@@@@@@@<KNIii hB !_{ꩧ:9K_ҏV?{ѣV :t}^>iB B B B B B B B B B B B`vP
$ j5OY(}ìLm6-Ro<yʗQX^}^9.B B B B B B B B B B B 63h7sD@~c?q[o
4[~֧7E?W^~_
qDoO81|G ~gtq ͊/OY4oƠ1Sdz%,B B B B B B B B B B B||@M@JT^~G~oX)+ >ecu<`ex[~ݱcdžߡ=ryg};oKߤe%~ Ljk
fɕO)yd$N@@@@@@@@@@@l4,!U P qӟtlE]=ݷO?~ +C,#ձ <xp0O>9jypP{7kfg~m}&y!/ ~떑֊Yjo
8@@@@@@@@@@@gbMS V{jUO۷o02w}
zwF{g0̾ ۧz=۫jIc܇ zh MG MW%Q(6_<<e$ˆVZI{a>%,$7`'x{AwRi~ V
i !!!!!!!!!!!@ _l,?X}&sǏ >GwWzNH1n$[O1 8pWV1I !!!!!!!!!!!A B R)f@@@@@@@@@@@@'.8&Μ !AO~7n]{3NN۟vԩx 9I!!!!!!!!!!]]kn vt{!ytY
L5{N6 ].UhNbX:kdAi5dۆ ,P[[0lO??e;q?uNt 1؞N8O!!!!!!!!!!!02wOo
H{ ΅hs^ o&sxox0j J'F%^0(VL }9ދ w|
{ . [ C g
epV7Hd`
TZ 3O J]J ۋ@dTulo-cmfa袋d*9ه@@@@@@@@@@@@l<~ jr_˴7$YWKB ήš u<Wx/^\@@@@@@@@@@@%pЮkrYFy[vX$kl@@@@@@@@@@@@@@K`!Z"OKY@@@@@@@@@@@@#F~kdUMJ!!!!!!!!!!!!!Yʷ]
*! 9,@;Gn!!!!!!!!!!!!!;@ ;S%Nn!!!!!!!!!!!!!;@ ;S%wcKn!!!!!!!!!!!!3g]v:DX蟸 ]L~!1Ю H
'pĉɓ';{'O:5a{ ۷[)
_tR<N٫u<OZM.gb=w@@@@@@@@@@@, '| ;v{kkb,l16nF-E]۷SYFO?th = h^xaw/.7٭|kC B B B B B B B B B B B &hYLF+f_2+63~Y m饗e# <aC9ŏ%=03_r%s> %nu>~>*=y@@@@@@@@@@@l_V2F2J2 Qi7cc}20NsǏ X2ζ囖.[@ ggݬnhϜ>ugNw|W ݝξ!Y+$z@@@@@@@@@@@ZN3P
*'
c\0fU6Z{C檼LimY/'e+imF >Q}~w3 9jv.3.ߤ`>6_DW5&7
scȷZopt G Jҍ4B B B B B B B B B B B`({rd q7fC`SS]۴ j'Mmbҝ~p;ݙzgzvw']nϕݗܝ5Uά0WT_ˇowc綾^~^z7>vckR~8|5 o+S^{m0tMk䙸!!!!!!!!!!!ۛ${.qJUl N };ֳwgFJY{ w݉O }{ݞ뺋v |}QwǚW\q9+QQ^o{uCwku^UZJ7>z9qЍn6JaO?w}rtȑ#ÒkvqY⒗}@@@@@@@@@@@@lf[@{㷺7>ݝ9Yֻ/vgF3>7O'_Uo{Ӄ]H{V fe@m
W^y`,tRaRqny!
#hk_{Wlŕ/0+n[yw]v`dϷ1k>}7C/j|۸m0PO 'xW:7>q!!!!!!!!!!!!!U li`d}7ξ`|Tnץ
1u7 ^x0b? {;]Fqwxo<hwfw]1u縂4YV-& C W]uհ5PJ/oqXuZg[~6PYo}!:YJ e>_|qHs72z(#/ YC4'=>oR m\VߖUGϝlŀ1~gd !!!!!!!!!!E|z\%0ݺyu>٩݉O+g鍳O{K+b(^ߛh{K`|xGw7vGN _u{;}Ծxݙ we 1 <8jDFm
><ShKF#on@ʸJ; <:;VMjZ \#:Isɮ
OҳeI,<̐ﭷ%K~8Irk7 xD.)s@@@@@@@@@%[HS?ؼ;o>ѯWg~g
鍷1koo(ev'յg^O _]{;y7ݞo^y6ߧܬZΜ32$2tN2c7tj[2}B1^ &ߊʓLwy{7 ׆ 3 #~Scǎ
ci]Z=[~'/ǎ3c13]'9eNuUwVH[
!!!!!!!!!!i6I!vWok{b~랫%㬰Su ~v_v.k/LS.m۵ n7;>kt:9j/ cO26ZY )1 9rþ UUVJX[UmeɠX:W2ܜKoLt>:2nȭ<d3ξKؑ ._xA߱\2 flFD<Pn֯˟
cm,aq@ߤ:\ m_iz؏'5kޫn8ۇٓ;ǃ_kH{io=;/M{Go
߮7)ju3r~RC߅usdo?Lչnd 0ڷyNS YVJǿ ={a4nzӆRG&cձG6-Viq !!!!!!!!!!;9w,b7J[, cS|6_lUW*rrnE9m-RxrXWV֬Q͊ ¶/ʞ
~[bϾ{5ݮz`too?ߝ:w:r|anw|1edO&mvwCz}}!ѣQ̧5J
W_ nb dZ*M]`Ӝ`-#hӃ
JU9a~V9_$>CMK! zc.= B B B B B B B B B B B N0 Xg}ԜW> <x{衇QG 瞥j8l𪫮ZI#l+)[J ~]K9eÇ[_K٫CIkUֱ]MH|mM̾flkj-TԶq[|hvbkw`Hv~5=Clׇ|G=~gvw=ro9Qu{c{}K,o`-o uc1j=c*-']h {Ĺzsmd[V|^ya!ˣ ^'UowAHGKfKRaxV3SM ͼ;;wy{' vFZA׳ X%\Zƾ {l0I?o}ko
x5\F=Κ<D nơ +EyO=`(g#wNUHg}v0Ou_v )i-T,],ZА<6 {n8fHfbgўB) ~3ɳI&n7l gv:9
L 7\17m?;<v_7
Ecٻ7=<g $ը8X-$ =?s%$ǒM˪XD[s~xw ^3̩<i9gjֈk<P KA)-cԌD(c.s]{Π<CMX4*\y >C<-quͿ)]^Ϝ=gI m&~gn&@A @A @A 0>oL 0N @" O}Sø^giz{饗gb0nsBG}39q' 4`ztZ[v}LGn쮺<x0?Ļ<?dQ ^spwZ*
/˃.l,,{a=SKc
57txr3g^>';е"@n|G^; + 6a;CmPx dm_5^[%մQ4XVU?3JJ
jU-2
_|+њ]bҟH/_Ң `]"'41iR <Z" ^rsA @A @A 9ڍg?H5c R֊L}R.ؾz[@Yu[8s=8#- blD /]mNtJE N ;|=#un [%jm1{p8yqAx¯x
SUpG%Ip$A?wr]Ĭ< Jքe{[ [ξ N^0|;vf3smOsmmmi9p͞~͞|zJַ<n7.$oצ6s-vbCիկ
Z^JH\lm7|ٻ*(=4 HR{HO)
X)~3t9-q<S@[V
+tU0aVaPa@A @A @A ;#`|݁p3UYil W
׀EX=͘?醠xcܺ7M p'lH+}+յvđvpvX'x]rkr_]{ۑNnG`cU퉽I)[I'? lq,zqFV:N?G Z]|g>>˵=s=Cwq|ۅm_Mp }]|3/V[F9t zoçշ] :fX ؾvR~w|; v~l4uP ,BV!`JcQ4 J*NqQh?t *` *ZiR36F+"]pA*m] !n3$
{$?FHp"A @A @A Cq[Z˰6䭀EځpEҺg>!ó xC>5ޏwxg,/|yrZsBKn O< :ea|mx*khJhKo]L#h
VD* ;s]罌E" ', ]q s5~O
N
ob} nH> +DAg }%C}uO
Ovu͜x ߂][m ҵ^^OW;Wq { .Q"JXdPEVN=76pRY
])r){ X*l 1H'h¯0l?iBZF[9H㺶n'θ A @A @A 6G / @![xU^z4*GU s5K5w 6ݽ"o,_7Cz?ܙv/ޯ//ǎ:^}v?p'"^MVVnY'|H['__ N{ϰFz'&X;EW~q7/RYL%oHc~qϵtYH/w9m_WΝD[voo Wk}Ne}+Y wkKmm6t%fN}Ok!)(M)xN
!KJ_! b֊\/
/J>bW8V\6QT烇;nq38 Seܕͼ3d!C$ @A @A @pS0FoE+<C(w??$l?.NDxVY5.NcˍkZ#܅틟}:q|m3dO>h{ 헯X^jO?X;05!_|qX -v>=\{gg3!E"j
=bow|:E
V|^Sc&J ~Ivh}E>f/woU-h?--Kqi'_|lԟٹg6?{,G8RRĢH)`VR; HP|q،S|%`Q*J*2m'lV?2y3 (`8 sΌV-
~&ӻYܹ @A @A @A LG<CX Vc\
|P3No j ?au/<řةS?j\vZ _gk'V/^N ? CJZ 6Eկl+K퉾v;E涉vޗ[`'1
L Tp?ZQ q)nS03Ix"qy3 .pq[>n|//zHwpCewJ|]o};Ŷ|6sSoWj_~(v^<V*FL,/%NxVX[3Bī0m' !ϭ.(BHNd+aVH?F1)fZ LwaXB
R[uZ /r?\_A @A @A 0>O~2l o!Ƭ1}c1GS qAzfu&![;f6p G"3g rnWH* = Z[ ؔ=Rr0cxXwh'g7r0w@#{+' ;A" u)BRYD^=}y+MJ)
o^{ ^-ڇm|v/۲'g{-ʶWv*~7ٷ3;?|sW N6JWPD
U8SXn>(܄cBv\ C֖\ܮ-a{fHTJP㙂R~*<08CNU%HjX
3'@$+Lac)#m @A @A @A#`<ؾ1wc:c_җn}_{0f̳듟@ ?wb--9Z+˿pJZsQ쫆W*ؾSLxJ;Wn-ȡO>N: }DZlSJ"ӈ.7pV~2ޥV{*wI{Ỹ24:yE_F7?ũM> k D'j|-_l?2ֿծU'r7nn3 i lJࢤQ1q0rcB
Jy+lʊDZ`(M3ⶔ
D^ԭ 3FyftUsV#ZX텷HV aV+ܜ@A @A @A !`8nqv s?ϵ+EV>he WA(..8 xvϴwϝo?ًP'M{v b"=?0vhyN[= | ,ӟ<M @ IDATO!\ )?r Ɏ44
pd`*]$;>g[&[k0R%f$xRyw])l_Йv:_y* 8<3'N+5
I'ݏsS0?y-l(Ha
09ÊPp@|*</-HҚfY/e~KV
l w^d.CuOZYk^3g= @A @A @G 1 ta, 1d[c~#p E6t Wۤc;)CX=k #_2GZ xyGSt6wη??=ΛzS(MȻC>sC:aY~_ xɰ"~@鯴x\i[i- > ?4)_:w L{ |[[Vǵj}t}kپßj3 Gb7(פ2nǯ f0d2lZJNQ0CN~/(^X B+n0m-# ܛw2+ jbiQ`<+bҟ
jDC:=-LHZ,Y#A @A @A tֆ1k
t'EMvS00n_+)[=ks\ ӶRW^i/; ~ݱ0se=|tgζW~z[YX% \[loN;uX;|}XPϊOX ]=SXN/gyfX:
{T:og<a'i3]yZWdDcǿVn\n_dP㏷'f<#|b#4nq>KFFa'Zg²HTn0jYd8ƿwgt֊k?,8Бv"
͍_rsA @A @A ]~ؽk:-BW6=CYeL,1"ЊYC>t+_J;{@}_ oZ_ c ރᩓ:Ю~v؉'6Mֵ띜=,~- |q Ȥ ϝ;wsw=9aeЈY<E}HPaY
SnTx7^+qV<ccit;d)
7nτimvg/\
63vkkKW L̑Sm/tB>EU8n'R]8
9Mʏ0jo3 wMg|!_
˹乞+X3F~ @A @A @/1cǎNqv/@!泈 F쾉C!\r_V_ׇg+C^:3grV܈7i}ol'nQ lC O<~O_|}bNҞj:v(啵vڻv> $|L
;{ 0 +Bb:\w s+XL u܌]WkmysD¢yF_žS+ 8"+vtˏ"zM
'Y:GAˏ_0 m`s=Vq bHN,}smg;a턱 7[[naN /@A @A @A EjudLm au)f%]8nE!jpVq"GӟZUYkdUgN<3O_y7.<]JgjnXV~O?WnAʧw +$f#AzgRi~s7â;ҭ~ W\V8
YnറR3anz1RiC^Cn6sd;ʍ=IWvsC/;߫/:
A @A @A _V"ju?뺐*ЪI䜕3&H"EU}97NŻևOw N~Rؙd#O :3eVpjw? sv^^+P̟ww[:QτxpifeoTW=O|-/]k^ mt6_n@ =>uIAA @A @J9Ty+BHq0Hz^a ~O< g;7N ?ֿC{tX1{_k@>0S;c\& Qq s0'OƵ=G;{6xI|m{/u7I Go>V$
v;H +n@A vP ǽ@3aoR?oB"Ϭ F`f}nݿ=rP;zHэ ?.wrwAl060=V }vvo2͞D[x?@A>"xݍH o<%A u|kiqqqHA~"ݶH wJvl
A}D:O> {c1[gA fYBf_$ AwygJmsg_q@rڵ? F$(wN>< oAGL{뭷.@w%h$:1;w3HA $f/,,OtA`KKK-ʽ 5䬲'@_(k껁)o ^!PcU 'kpQMxA @`=!fA 0P A`g PX睑"@ʝ @.T ^E`vf,
A @A @A @A 4B7 @A @A @A gAg_m2@A @A @A -,gN<A @A @A @DcvvkknnnpvOM ; z$Z1N
@A @A @A 6A`*⪈{ $~{yynXXX߸qcSwy7@ ^s74 @A @A @A |0ɥ:2uiuM\)[V 8 >e$CpW"PzA:!h HA @A @A @GXEE"%E);&i苤NǑ#GTG mW^ H]8"{K wҋA. @A @A @A l"_m@TY[lEz| ~F+ck;:ߢb
atݩcIuA @A @A "`_ZIWNeENUAv=Ńp~A T@@\L@A @A @`Uu\ddY)w{nOo#6
A zΟ?~[o
ߙ; z# 3Īauҥ6[z]F2@A @A @A`"pO Z3Xq7V'IA#Mbgqͣ\Y]~loȤnC K/^x
28qD'>Ѿ/G }t+}{myy}ӟn?l{ @A A`uujڷ> +{yqq]reOL6כSO=Վ ;v+J}_WN>}^H;Ν;7L6&RMX]laO~rn܍xG {_7zhُ}cK]3' vE+GW^ ;ȑ#k
`¾JyeGg'$ ^f u3% <lZ]k3ȧ)r+7elb gRwJzŽ Y]YmkeK++նݭkFo&7/پ 7n }
/7xnN<.\^~塓zԩab@
A 0cV 9 @"g+A!Ϳ7ѣq*K!B mEo
$8@;_eԧ>վo܊SLZ/ L:-$QO/~wwoSÅ0ofHp^h7 9 p !1/ｖU8c=,Ѥ ~ - 5я~Ծ~Cáp草%X653M`~i"_cS:mAoy [ FƨؔpoC<?OOeggo @؍3V3}6Q/pj`v#:Is'l,!g
[I>aF_}6 laD S@Ʊղ< >ly##|̙q\]5u$5
8m΅:UTXt_IʋIXʽ:NiV8)
VGt6
3|K ;Թzs Pduz U!={vz0c`GÞjUzIerS_7~r7mu¤+i
NUu_69 ؛ fJ&cX
ګk>(UU[ #nI];X8i~7xer@ Q"/[+Bi2
t[~sP߃rv E.i*q/~1/ #A6yƎvZ}`P~+I wU8!pKWaigX A8-i~rok-݁[m+е Ժ_:(lG =c5#\}IPoa#-} W: YʇIwc63w%ZXC ծ. ŃTuL|˝PBiWgx/{>))7>I @
39; Zވy<#ly7v0voY!}Z#f{muy~rt}e~1yj븚ed2 N>;VfFv>3̭ƴƺƻtan0ӑ04vuD/6+u5uDE ' n+-AJN%-:m@\u"*
ҜA)}_&2 ?#Eбۿ п}s
mQ%AC CPΗ=+"PwߪV__9_r7u
s>̥21ggC5vLQk%?mp, ڀ>ڢl&tKm 6DnѶ5Q.ݮ''"h h Ļ?&ǣ~O
Wg{N{LՏ]9q:6"ĆIѶzO >䕕*pؠCƽU&x3}1
ۖ?? C)la_}J~+ד[iz R;nC j")=w£?꠫O?S51_/!D1Qsy{D8W ^Aqi, y.."^v,d_8V_0 Ía!j+p*z A VA[ ئܕv}W m
A[&ſ2N2m4|z#Nn|yIݫ!u"cGm]kFFƳF7"W#V'`, 2k+ Z W|V#Z<ͺX:!pЩ-? i\h9tD4[ g~W2 KNE(s_ |;"~qUDtr L+!D Ju rV!gϞ tjo&N>=N
#=
&2]]?WAI?pEag?sCr2n="
UG܉ p`U [x-vr)E.)'Y~d`kG* [] :nD]yF
b
ZYsLΖ[ cgC}h'HÏdO^xa o]&MҨcqp6߰NyيFٌ4 +wF;紶wYB$suN o뱰og|?K={fq_uKߵ'V/;J glԦEt? Qgi
d>N6m./Jo O} A %)A2xRۋV +zd/A %!17rcloTzukh;I۴3l/F 9B@GBXkFuF-g<Ө xmvCnt 4mu\tt&u.u|}|ar,\::^Z9>
rữ! 9Ӏ::3V8(h ['[b g@K ɫ3Qw`:txIVS D{{uGzst̥gc0[y$
ؔX@؎A% ;5` ;5;=1c&r[KPO2JH[SHoҫR x4A9A`<"=O<:^Z\\#A F@>؎C[WL
A=nؙ;66QRmUæu_4iվՎ /+OڱD@T**O'L"met18ES9L"cStp?v6ئ X9^" z N&{C{ }y
if7y%
Õ%5QD iJ .=#Pe~'Qywd2Mi UBӘM F]`{WԄB+YMb\~#l?{&Av(m;z%MIoPkK:dpR~
})d:XdPskB,OBR 0_{{F*:⻋} _ܺ{9}/nH5 n74}v}~ O+[ 4kfn
!҈A=P:Vj4kdkkX;h[ͪӈp!\Gvqxw|π4<7t&tx7\ :5Ӡϸc65T! V6}_ O:t~*bp(\raAXcoBۢΔ<P[js@:gϞ )%:#a/0::7:] #&E^ D `lUc6 * J-oɪLTbw61uzG K6pE[V ת^d,3%_cBg< G%*) * l~X?\nG]ٛ6:]9sfHE}]m^~ܯɒ ګl:[W>E١ OMNaڽ*5g( +W^?U$8.^mp͝w" ALN&OWp2s(3tUNM!n&l;x,OWĥߋPr0z-LS(Ү]&cBuVu2Voۢ\Z3/BlAa7ilzS?8n7UzMP{X
w5闾Vkg'e(Ss$iL2V7Wz* &7:*}c/mtMM8UmmL~pqGA3Tbz&0ԃuX<[? A AtmiV{! ljޭh@m3hw4.\v
c
g @i1ut6 P;:E:[Ytr</y A0T
|QљF
O@G@W[缷7 t 1/0;V ,sg' \jk,H'wA`{X2H'43EfuF qur ɺ[ĥ~Q$#V+&n5q˓_7a`s-Vye lA(| J䱈$$f~BM*7!lN[I,[]0gڭܱSj?a#hюe*Qv7F? keU.h+͕Y?iEJfewUdPZyTi&X
$>i)bC4o`_ P"6՟ D;db[^>:.- ?v]qk/6 QlVؕ6~ܯճve69A] !m[س{' svVn VQH{dspDy(/sC0כlgyڡq˥˄Qpp]Cw^/M&H/#ک 6]&%H?zH=5sMa8?^i^,ĪɟTZII&[0@{h>Dfz}}g9! 6EB
jOz`aݸ[zqϯN1?v;LZz :
%5HfGǴ iVG', T
|ԁ)f8a&]
=0 J7muoE|[:tTތc-f/#x+LD
N& Cuz cЅ)tZa7 `cXط I٢{RgΜlYS
1[b0MP.Hˀ4 ip1ʉC:3u18ƽ5zN "mcs`Gh"@\e rR-)w.2}jwYer",m٧Akme47!CDl[H2CdIbg\8&4GA_"f[A< ΛX#h?L zJEW>XIgNݧ @,lD8< qxcwĎؽv=XY
1偰2JJωxCވ}[ .Ҹ NG_Lfv^PN)3wBJƘ5w6AN=o~=Pro Nٹ);MeϔŞ 5_[ZLQ(wM^:[+ _|l,<(5.3N7⠫O N0Oȗ++[h?qiK+3qA A+kkޏ
0$A ݉ GYUWQ@M5b555u
s90͝45u15ἕl؟8 w© H!]pƾU::=Sc 3VXt$ى{_٥Mٺ <RC::V"j e+:&lhѵg0`؞șKج2}|3 E^[f)b](}c;0'ܨC K}aJ k@6*=6Gc` IkPL ed+^Q\G&([G/7!h Ŝ@Am+}2v{Q^T@9M`HO~Legΐ5mLkrp1aP~lV+گZ$UFů4e2{mQV{T2kiѷ(l|<w;` A;
y=C2u)Tg bCȝ1Rkzaܪ_Ƶdw{}rW.G;ȏx*sLP wQʖ"?%ȽtHC[Y ܔoѻ~gtPYL#(ܙ]ǟ0w]v =OzEou,7> ]:t=JgrCwwgvJ{YR[m#Li#R[]-| A V)A[AH@
W1CLg 6t
\h pvg"
yR
JK' Q
U:ĵ8 tw"
ɿn N0"{ FGwNf:(#%@Atƹcl
GuPD pvXGo?~5 a)*152 6VǘăB]97ELSOs qW[<9Ýp)MJ;j#A 7bl'?Wok/j'\eIٮ^ȿUG OH
`נvg+QmlNhH 9d^[<ƕe8[u7ϔ7JVDv|sgg8E [ҏ4
RDMlk{&z5)fN]tF"l7N4)&~vln,dlOܸ.bMzE*}rm{P$)CEH5|N"0f+f!l{ ;ߞ_ًF(jOq$n)# 4h Te(azl]P'\8>zBrV ݑ>mQzSRmՒ"haBzK/"<hM:.A: ;z,pu۷w^F@QH i uJKdv͛"A tY|TB~5 "VCld7GvjY H ^:En' Wch'L䬸ƽ(϶+xבVV:I|po/"L^uZtt.~`<9ת_HUxV{&F_
A߬^3"Lq tf$Jm}FGuf A6oz7ojvgIϤg0X4taq~vD:L(Ea L ʂ*Ge @vQK2G2~Wޤ{w
NFlR~܆eKl 360,E*'Q٣vos J!^xa(Ӥנl (>GNJ3FCz
7 C 7u%]Vwk:M]"Yw BoJ~]:O
H9k;npO0GyvMT [;C:v ]~YY(le.-]~a xm~|LsN(`Ko/~,~1 w^Y< ~A:Kz0)]%~C%! X&'
*Ml6bcqyڝ"i݈O)_MqokzSى67NjVv"} 5{G@/Eݘ1A1LA FA& Y) ƻYN
ߍƬ::
u8u64u>o :1xfPHcoIn :-il K:9zzuH5.9(y2@ UsOIG 3kZgTbئt:tkAHMR\f
szIZqzr6G 06h ̮5ZحAGgvٱi6ZoamWͬv_ >8+ P ( )F+gqOyzW9_ k #)}&2N٠AsDk=gkUx7 5PT Sh|+I& jK6-{WBy'" _ZEF*K[,rT"΅rr 8\_J'+bgէ?h ߞ#x2kxN>sPOsSZ{C<~&Ni flO<l]JgW:W9 e2<ؓl&k}[q#
ڤ-e6e wx` :tlT[zß;:M wd[~[.> 4:m8ȏ0.֤79*<hwE䬱(lf
OkYȇE7č h'wNg.>l?͐ x A 4
29#tհ6 A7!t\r_Z'Sͯ: ::)g8XԠNl5{::CHV
6iUXOX^ ᙎ \ .7:B~mkU&O
{3{aԚ͏W[H<WH\&KKE@x/&b|RV+ԏ~.asIwu/e_ )|o
h-rDWF}F @=V vX.R~ [CB>s5Njww<Vq+
#|R(S } 7y$.ev5, gzAev2G١.>GφNS{VBYf\ȟvҬ=鷾Ml6r6qZaSm $ 'kcmA` }WtlZ;l ik"<}_v@U_ª3cGڴٗ:ڪY0[`=s_8u'U>CH2lYY#/)77MomcS7} ;-z\\̻F^WH9NȏrXt.t٘xJx_=v.lDit9J:>enh+ r'D~qڷQ"l+| =W?=ΕNI El?϶F֮罼>ܠ+M=*
k] 6b;++IZ vfkXpPס4VbAd
^
j@!65LZ@=S1
s
~Mu2e Y i^NNgV"EX:K:jLHΓ9I1ؔ;&:]:v G6l8h16A?E:: zdBA'&;:p蛁Y6];&?_P )M`k l'}3ˮ-{v60{68 0PzSUi.nG+o
M_D [oDKVʨӕI&q`SG@ /b۲3KrJ9ew'2D,C(2ABbpRci?@CٷO<u35Q{{:6*τ]}ohժ"E'[9W*L42&O:w./
P]JՑtL?6~"1) ~&#܊YlX],^6&
dH[D|"q >66-8M!c!`a{_ՇW5~wQrd60+egΜޟ1proǽr^3C~Eu1aCaӽSQ/RzZڕ&;iT?'dN[MGg¤l-ƘQ~Kv(nu#~G><w&(͟9
J\ vtFNb
h6:-έ<OaL
h-iƺD:4MYiLｃNO `LntHu*~on DA'ـN<=_0)fW: rwPMNG] t#崲 F@d` (4 f Op / uٸ,F9@G9W=C WZ+=
mظU/ʿD{RfHU2VIJ){"A lkmGL2hȄCm v
`-;+C϶ٴ8vxƆ & qh)la*?)AZǽJr@4)ln`^^ a D!<yV1Θ@OWHvhO{d$czOE;& J龸\IAY"6^WLf<qNL<O6 :v
Wq'^{&rlQ W|&9\gbĉHS~I2c3L|wk"N@ͭ -Qz3mDzGLVfn;'78ц+ڠiՆ gVʒ;̝V>1}CcC5_4=bq><6rχ@c7S iw A 5B7 FC'AC^Nƻ
t K nt64'IUnGseANx4`RJN Fu$
"A L
zk`șygwh҉$v3DA` &0fpIY eju:`@$h@{ F6lp!
Ԗ!N$xQ7o ?ʋ Toʩ10(c-ln^"l+M<\}S97Yl 6cv'S. "F
fTF-AhS# [ۥkO ;ޮhs(;]ҥ< D9 1!_[DVe3 ԅoy{#N؈HM:H$;[hg7:i".rZ^_BwH]*cc+oG;u9Q#ؕٶ zNZ? @ IDATQ:4J l! uln"˕ V/ 2m>w3`4n'{эr̈́ G#r5*1^kW읚[
g;lRKV7<Va*g# SgE]LUl w&<#ڐe'mƎ A0 ݮ&Jڧlt; `cҭ{/ޛTytA ݊{5IwA ht:}S@NƷU
PHlq3=0tu(ulu"9P#J c
"yβ{ 2SWA $% "Gg:!1 2@GGo fO9Z` HevD<҆%pP|g N>3D)G4ܨ^Si&MEԪq} X&bDe?Qՠ vnj<Mkc #m݈!SI8 7[ܓ ~V)'[+/E(A٦a+W<s~GtMG@!vmO7D:Iozo/.đ Cr?¡t! mI-Wa5kŮ{ bP Q3?n؊"l֮&?h"H&F 3yѧjy wO?G gm; `e0Hx2klA\y t:(jG'3>vO`0A,e-
:,ӄGcp',~S=cʿ&lB[>[WyO 3
A`7"n|kIsA`!ã3oƷFh "A"3Z%q&F)a%W,ot#
"MvHOA FU(^ w\O
;~XC6i퇱C[Qw mi"A
XiI M`7wZU lWli):[# uʵIfǃ~Ɏ"AN˙N:&Tq4-n8F&:7G~_1[ l8FdiK5}?[6MB@R"v Hȗ;q[mxaiwUd=ϬEҍIUnUYZ[*J\4)l`E&^0K [.3L~uĕg=R' '|ҽ 0I2pꞲn m;MճVr_~L>ϐFm>ﻈo5e7=tSzMJn1*/{iַ5 q/ I;C蛸=xƝ< f8J )7aY%~Wl w ^> B @uVc^FC\uJ :[u ͨ˿ˡ3#iPI?ܥAR&>HFT6MXqtI'ѧ|wE}7oe$`QH;;K?oc~EX-A0rAFF8M5C E@
DX*ߖVK"Qe+Jk\OtS } ϥX#Mg
_a!
q54.A*g
'z
GAaּ~sCwIcF[xovo J;tJV;+_y?HX+ C<=d1aLCXcFzGG 0<_s/
ܛxm/[}?A @ڝ >B@ u(+nW @A zH dXQȦ7^ݍ챲N>M'rc2 adVVV>~կ0AEn#LCv ܛ|7|jZVBwM 9mWmQ72- KVBow+[IhvE ;z].݆!h%;iWec{f~fz @A !df5ٷy>` %Y A @wD`x =AD1 . D`H5C iw>z[/+7 fowV`Hޕѽ v@A =jfTG@A @A @}v g[{B;uo;跦\Yno_ZN~<q <0.-/hחֆհ "Zavw뜃@A ݆ B6n{kIoA @A @-*O<|}~5ȿxzpu-[$~Ǐ# 3ն\^ >>1vv /];=ktu4 @A @A @A 'h( i]YZm}ir}ye PmI|}B;~h@ :箮 zjDtvu}y]z@Z['"9@A @A @A E`_^ge6ūo^:"N-;zБ
پmak<^}F[n^zgCZD O i':{e+r'hs-*}QFA @A @A 8qYﺿw,Ws!Iэ-7- f{~ON, tlc'sjWʞ> Nڞ
rxmyxZUzxZgtb'Dt[<
A @A @A !`څiRޏǹ6; LBJe ߮p|;wBNd 7W.\뻣.Ew; Fb ;~<zq_i}Ez
;> #}c9,-7X:A .ho_ю<>_\{āf 0ֻ?X+/(n߮9 @A @A @A#`w: b7ff;/2;7?_5 ځEh$5nr =O"=?9C]~sեncxyvxܓ'ӏ sIEv<rp$6uyщ['Xx7.t?{oo|c{8ե-~ x@A @A @A c9!}fo ^*#IVXfwuk++miZ[xh;Wn&o,~_j+]қy]br?; }z;UAWηg z
{<L;wkSe/m {c- 9~<2No^|vM;Uג @A @A @A#@W<c(VDg[$} (fJk+7ک6>?9-n7/ly#_.{o 0VNxP_p9?gݾ"h7{3ϊ^*]dZ|{^@k&`ya~a}va]7@A @A @A xژ;l?6I)ʷ<T߷/ <oTzsl[^[$b:
!;K A{?}jԍq>emk8؎ uoiǎ ^w"wcJ9Y* @A @A @{ y7: Aމ 9UVZ˶ԉtf*Akf\XbQȱ}l7vma3
>hU8ߗϯt @A @A @A |to_{`wܻ}^W>#h7fS[}_}u}&a [ڋo]kK7C6d_5'ݍ>cXu;*A @A @A @A i;v;1~B;`껋W^ -''N l Н Vf> @A @A @A ֊پ&vgf7ɃЁvr{r[fggoɍ;'ډsÙ~{{v3+A _P ,--/W `˽ͶEpG: A`7#27W\i9+I{ m ;]pa6I Տׯ_P$; 5] >|J;./-']kWWo7./}cn]/xt ~_<@ מ P XK.&YA E @ A ouBoD A ; ;
%}A`w" ZXW;!˷kڍvuiecGיNo 嶴~ז /wbvuui+@Z{?<@ $0$A`G!z IL9 ;9;U$!w@ z8y %QǷ9-Em^Yjk}Bt~xR}+hom\p㦻mliu~9 /sss< -Ԏ =-w{IR^FN]k mHA~"1AT ;N~ID?SpV۰ 9Hkz溤t7Ӝz.%gzg>>J<p㳛]_pq^B sW rD ˭qn)[ GJ F7復fݩ+<)FA Y4ɓ'ذڳ $cA`!cWǎ @z/IJܸ?s@hD@ aQAj;q&{6 'a& p?P$ݎ i'憅dâ>F9s3\bp` @8o2< n%"f~DvJ9^zps{I ȱةK09wೝ}W$ÑCsv/Z:}Gہ|RygSI0z ol|&9nWֻa}Cn]A {7Du /
ƶ8>A q=ۧ`3 ,s/NG`RWS?7G?w N- hO >fϵmѹ~̶ {
f[ummc kf:669ɷ"SG X< RߕkKCyn nHrX;||k;}`{ڹ}guO@n">ul'O=|`;qd]\\j/t-vu}S k?Ql'>ګ^iG j_ۅo cN rfa'f l<bu;b> zЁOtb67[n-lSI
f/C< @A @A @A& ;މt؛k;zo3~lO J VuV"Woܚ%E4ז~<2 94IjW:sC~~J{VގbnD壝<cz'//l+`=/t`@?Nt t"vyt_IWvsZ;Nկ ֖|}{<vpÝb'op d#'bhOj Wڣ'>u|x5ty7 7mi]#h sO ןϋZ+Y~ >uJ_Ri|ĞvOd. @A @A @o V:vfV +,;ox@]dKWn;O ?Է]갪
W\'lC3Xm ?z` e S!i;on'+<Po/@"鿹E:fjA3 ;Ԯ\_mW;%huP=1 fr':z7V++D~tvڍn'Bt2xAz+>o>vcz;W؞[ |'w]W/7_ 9~p~{G=?+rK?6"Dw8zv}eNvz;Ws +u A ?ԉ=h~µpGTf!hM@A @A @A } stH0DXh흥vmjΠvn3m=R?m]g|zs}Bx?Ƃ to0;{{ba:=d",f@fEfr'@3J㇯^+L' 9Ҟk0}bڳm߷(z}iXqj[c/6ބuXCGr_|Z_6E^N<y@\n:y;+t7: Vǽx*}}fu YjlɃAq&Jթɧx+\MRm9!eG5Y%8 1i.n
n$ƚz|WcU-y"- 3.i 2r`G!\f2wlh0 eFJ@$ H@$ H@$sbd裣!
8VNČ́P[(v`l$kirLI YގW~V_8Q"㣨q}6f2XFv*aĹ?p.9B%Czc'1{ə`5 L {:ߣE4E^
, <2x ;LXƃcƫ!2p*~dYb2kՙj"f.T&2h,cR,?AfVlXyWu9 E"coXzǶa,sP(XΘr;^L=-̹n5
ݚK$ H@$ H@$ %]Lz,BH`
o`F˷L:
`bf$x,87'O*RѰsl"ߍo O=>Hy,ˬr1km뫦C@en { L QC;lRf~ ;GvDzM
Xs*LJ0cYs,#K,ٽ<Wb-f:o{5?hW؋=D\7f\ _pLyo""GTr0wC;bfR 01qfReu S>Hpo'ho*@Uib$ H@$ H@$ H@6KDzr쥘8 "Cfc 6ؿ\Mh6 \X* خD(3dWg"-ǟ|{u`3#GcdqC12Qjf*Ĺk! څrfBdg4}t_v
Vg]Fm&-{b8U<9 ߔ .NW9}:߮71Rf P̨-yCLۡXz|d%_{<bps:߾ 3uB ٯlWq^luwp[r8P:,3E5>aΦp2A#EVEHK$B2zqz#ƭm7i$ H@$ H@$ Hg
֘86 Z!1ru>k]+~
DoF[7@$./f6y/ =PfS·G|FmteLy7gZ9f6MwZԛ*נŵUj
V\A< ѽcG!22+!` aj[|C! _>W}K%?[9{:w\+
TG2#7yBd/_%v!Nlٚ!x,V'KAB?z{4XD2z)kRH {;3g_( |+9i{7xPm7i$ H@$ H@$ H' p_|61o)4f` am,χ"I ˪dONϭrE\!*-1k%9 nh;s
!@GpuG"̈́Ȳ#$: 3L'bX۱W/qDEDeaTDڕ0b}ԕkbpXuJ7fY"CDdGoGlU?a(S؛ D>!Ά+f"_٭ċsWW݄_oT(n9LRn$F %ܙH' k7n]& H@$ H@$ H@@O@B$E3: Y!}:K 8VTb2a ǵf"D68XŊV,YK Qk "B,lfP ͭ;O_5 (3oS$}Q)#ݓ{WZ7A3aclX.:`O<g:ߡ]
lXgb Bz9? vKD-aq%쐇/LU;đsuSDD?>?lnãb1+w%8߅ B- 33g>\T$ !?\r K!q݄j%j{h'/M$ H@$ H@$ H@=N !n6C SfŞoNŬL9WLqRbZżǁ8eGBD9T ?aC}MyZ&DHLYvs i3>Jo ɏ䏛?8;U=~`"f~w@|㕥ɥj:f>4moƦ .q 8 Ď wc43T/\ 5@1s/G~'ϙbp̂=q
k>qI>j);82j,V[j8HU|tk)攚6 H@$ H@$ H@$&b6'%c8م`,;4 "ľtt|$fpecܥ)Pl:Z]62Cq!,7ƒfSo# -*ތ-#fn Ƌ^
X~uògB}"Z& _@{}n j,T 3P"cDf(fn
z4e
%7_3
?ZWKc>ߚYfV4]}9-RnXO K>WoZ?PL|3xÄ{5]@uYj$ H@$ H@$ H@U`|Ct6> z1ĽFcR'fS|Yrȡ
DPYC0{3.HȜ!Ex ;b#[)hkqW;lT@=6_=ux{heX8ι(C<M90q|,|1[绰G㱴k!.e6@廴',Wf/
?/̇X!9m .3b< YՈX
"ޮ吆KY#÷)ituijZ `̬ĵ1& 7Q5s)n,4$ H@$ H@$ HV !<P,o\ ^kg)".UCٌ7 :Y| u5>CZV[MwX o
E&NS&Ì<pAHdmK!vf6nH'o, OLZ P^ٮۮTC] KA 1[y9ȕl>ɍ|L!
5Vb]<8Y1tv=(&Ǣl6~gf ̀e|?8Vp ^Nr1Lq/
ri˶
]&G$ K`5[ H`(ZʞeDarUa?_MJ@M eFZvv<zIbکcVvL?Twf[ìS[nl?WiKv͒{/eEqbR O,p81_v,Ya#c(j-H~|s6to|of Bp?a
Ǐ%x÷n>-f,Gdž㻶!F-WbfVw)[ڵHv0hns57! 9Z ۳ 3-B|T,3<\MYΑe¼e?87]Č+X3>\2/֯&>2aͰqc4e 3>4:5}c13f_UmGD,}qj!x^ ! `B.
7-! wrd$2K=;h# M$ H@ @
ܩXXNMMUofg}j۶mv;F:D`qq:{luʕrs <xڽ{ws .jΝվ}J O?e=c HwP\t:w\#vB=\_o]p|r7ǫW#5uڵRر;?9uK@J6ڙ3g-xll:tmu,}7jϟ/vGFbhڅP+nŋK={ȑ
7;K N{8܈/JZh >|Wa]z{9Av ]aH[)vKz{)<8}'Mچo 0yIs
;ٟo_Ľ1}혒=14Xn-K^ !toC!l&VnPm\[fBý 36w Djbv1KQx""3p"[]9"0/B+Xx3 Vj
536G}K :[ B]N]ƹ'gk1ުX̘]bk쐻,ը;36_" 5bw K!.4K9P: ט){pTG#>3Ûu{=-UMJՌqr2Č?ei`u4Nv,WMh$ p2Z;O4:-8[HC\Kq>?q$0 0OtPŇF.7?| /~q}6im<G:w+/| =٩}y`؝%@fĉe"KOX "o꣏>*Ww'/A ~믿^<y!$ =3Φ\$ I EC}C{Uwz#nc|<G xrH,30_e9HȀ=\i]H@6q qk"#u)/ ?~g?[wأ˴O^hQi=m2z>6__+
b)u:qqKyi&ã?+>""8!EhHxNLNNٳH7ͶG4ַJ5o`K˗/ };iC^// \vwI'nFLӅ?քu?GkݼVs5f1^r}fC|t)fe^ u.fSR/GO\[fy6c2f=
Tgb+!MJ3ܳ !1 Rփ} 2+ ՙaS]fB|]DbBBpZ+1;1;IJKչM{1fr
:?5[Mݢ3 %Cx-"mC }rxO /cO] K-lf6uwq{/f oF]č"h҇`3]^.:'Ց|pp- H@T8҉su'6s>*vqv8> KQr~9>?뻏?x H@ xFS7۵ݶo+{g:tT. _me:ً u:LȨ is[ٻݺ}eЩ[ lEg(ܻ JLf= 2c QeoY
}^z" 0SN?9g H`3T Q7\OZ4Bk^ᅩoeW_} DSgR ru?P~I\qP~+?ֳ~M?I
C<V6G=_K-B{z *}|i?QO#"rѰn8GL qe̪%Ǐםݶl;SK2A;* s*'}]n vx.>? Lەg
1 CN tÓv5aviB?%/ ~h:8_0vឆkYyc㔧P㻲#" ڥ34OķJYx*D `o"ދ[%{m%">]<ȸȗXx٫#';;BK|bK\_ 7
(pzo~|Wu!A٘;P#Sk ].zW㰚ϳlh!WTSbsC#>"|^ qʹ?mZD͊em$P:5٨u1K(RYBd/WyveK,$ N ђ_.ADGe&&&JG:|JH( BX:}اcLg`';U_7'|Ooo e':l% \#NtH
vc/I7LX-'a §;bttRa(&L#\pߘF7~~!x`,#\.9$I#F2|җT~ 1,Q 6f(p GDa7gy۟Aol7Ad\W[ m_eb^|3<+0?b'A\3?hP1hZ,Hp69EMM6}w}=+i"<N{/OU{\ %v7d↟ącY2ݔ _O<qvB'3c 7cǎzQ'?_(
yJCǏ /q|ភmXUY* {NR y Pyy < ?Oh e /X,)DFLx3Cz@hm'D8G^WZʼJ|iwONN87i8G|9? 0qm%Ίp`(Y7KJ5 ,"X><ƩyV] ߸Ysz=D [
er9~0L,c!+rxeo΄Pz=k&~/F^哉<^M9b<asc&.3sK XRL&v3f"& kZ;#F azA[j5DjV+j'+4r/-kqLcٱNjq H`KCXy#F畎1<HEo0Ȗz 7xt3y^x|h?2BA:\)2I'N 2B$q=#>1y:~.r/@! zκ!{t^ 3H` pR8t
vpGXƐ7 q& F:+B|H sNLX!"%˴I~:Nc_
Rt S#D{͏:e0U 1u^ 9}O ݜq uI I}O yn%nU{;<?ftc߱G{:Hh7`xVA=E Ì- e @6 FD gxy2(699Y#X<ibp|3)=!#f_8G?Eܓ܃GH:q Ba#d]$YO6KzL[ P҇E?+he[~v~ fcV('pQv(WOa()z0%inG'Xč>wViegeykL#Î|nsӏ>.mVOHmMI;g >0c9?p
?lYw }g]]^z-.8]w~ A 囩-[(? nr잺R p"W-goqtL%ԒdtdF
džbe l9or~SFL'7b @4 Mn% . @=DG7V41@,S=Kr 7)@D L: C-Yf@à~0+* 3ޥxBgAI
Z:t#\2f@z9cH'ّoU9:{A$5438@ ÉЉZOr@#: w:1 XAzLQqxY'? 3t t + ?'|r-m:~AH`+~eL?(gU~s_g; Qn^>e0g 10`uF-
A `~'IP@8ɛ3Cxv K!.7UpO}Ev2^LŁd; ,@{6c-UhS#\qO7)viW#\ޠ]sYhO'z^@9 *{?.h?G; ^gp?/ff NҎ` <?Z]G} Kq2z9m5l#}ifIWԻȞm@ڇAC @ IDATߍ2āxNݔFC'~ăd)qC9$'"eYYApK>v3q_6}G J;'/&&\=^h ?i'c=ܧq.$Wa rB<6r_6X@\|T:GzzG~B ) H@(9BLd t@`%63!2)d`B|`FƄx5~0 C|SLO:tLc 2{$1, '{=t$N abrKz߿ۿ43OǞ `rY.CĦCI pr t@Yz3' HR M>9o T`.i%F~ 뿖-ӹV#@yg 7(8 *tCH``n >^ .TG *s4@o. A0xLf@sIg.:u])lo ;E.~d=ṕV%@YyJ ;3EZO;!/ vqO2"oG?y
yq9//8"K8O[vF q?@ n8}J>/*fh!'u"u,gÖ)В vKaf)nw7e?D+6OLnA ?
?y _2JGO!+?҄ wY~[
qoM?62
"7232#2l= ,q!}yaL蓓:yAܷ
~g^P_d;x t@
NB@[rtH@#:w 2#Za*A-BH!ҹ}饗J M:H*e0B Yt:Zt9mh:vt&laB vt!_~6J:yp q=a53C'pb *' d c
F8Fcr8NXc ̠ gI>1/IX#F2 \ğ{ Sι@[+
~|.%D$л+m3YP`/
91i'ح?ӳ]] 6-B<i?M}a$\^
ef"/:bhϗ4v?/Hpq/"FJ7ik@PËH 4!~;u݄Mn ;g^.JahQnY&_}o4GYHqEEԤ,Kɲ~FIXFnN}K:n^t`~icxu;h }nqǖ0S^3GxM! s}A_;))<,! \'n }?6>F^H@Ln}*m H@6
:yEq6;@t|Z[l(Ӊ}{,GnqKxt:1tX r0tAcЅ}dx4Jfr\vzu?L} 'dFK n@s?3DLs
s iE+LI 8Jq7 uqu% P~a ^n d̼:);np.
ܦ=K?r[$ $PC\y_.G=@ A>k mzޥ
L C;k9L{{=<s + a1~8K7؉~ObF'L$S~A4VfΒSQBD xYcDfyZ -vpC8 @ڏڕ(a|*\) o
-˺Y>[/^_wK ~#m]p$/ q"p˿3/ӎfz f`8/ŋޔ{ˈ!~54
(+% ̈qvn% O
~K@ *Ed /(0ssEPgK'wcR@a`e gd,[tT4ӑfЅAfҡt$gXy̶#i/r
Ni=Z?NDŽV&}K
,vŋ 1Vs :^r&VsR}KYG} uFr?SP ,vvsvgu-O؊-0pCg13N`{e6#0# WO>qJ ?nSd_}$>KcJH~"R2ՋvXV) !"~2!pz iarA 1H0M^$-H<f١ݨ! iIe2DŽˋS,lZ~FD%}ДLW)"f?s
Fo)hcu}q1!{#8S$ B@v$ lr !:?tz 3H"mi~
u Rr
H3Lyk*[ytx7u@v\=^3y^ˏ&3 d |s.Š staOǙ]ݤs7k6;0J~ R1``
uYo#إN `R`z3fd$ Og4u3b 㼔E*N@G | Q#@Y#ZR5=}P m<ϱx/Y;8{<1N[CJxa7(x)yH&?y0"")3D/V]Wi'wm7CG^z2 §YsO{nAڛ<+Xr
1[HH?QCEc7v鯶w=;` <\$-jhmu{kܐK>em<3n% tm'i$ H LѡtBRZPѩd;99Yᖷc;:Kaw>xS7aAC\N#,ob褲/trE7: ^aGZ|6s=N{f&XQ0df*gRĥu Z43M{f<'JK=_/w(C })! ePs3EymZGZ: Ĥ|Ĺs0vdg` qq" 4<h}K6< 6>] /cJB/ov RqRܧ}ݎi{>8E ,͚}$38=Kw6yuapF<@~ncpO@pMd^j4gc^VHb$f&Zk`9`DŽGދ?f2Ø~=}l?opk80F@J@ ~;)G?-uW@ϟu:6_QG VQ(=$ H`u<|ㆎ +3S"oӹM% Ybv1L `SŒH?\#|:[FdR'N vx;% 1
8Pa #.LߤǽvN7V:؈G ڐ&:āo4'\'yf#ѩE,'θawr`ᗿeɏz<rd lEW+ 3иo b:9V{;A}099Y5fp/28H{ jqqRwi$ 4L@ ?#f _i{1M E:E,N];8إ-@7@./RQi s_mO2+f"-mzմy4C6qA$x8я߂F r&HڍFoB?*yQ=CmMfR$/[9G:ݶe 4_&福)/WC9A{z2ÌaA(G<'Hg݆ ;"
E)o fcHY0a|@|f y!u
Zy=@M;KO
v8rEDy _+å[@xѺ|sh\2$ K ~tiBD`@O:Ktytr/b:at^9G
v ӡ
$/BL ,5:tĿ/$" G?*a mt'
̚%Pv-96 0XBgY5OgOC8 ɵV5BaŬdQf9':ĕ;B !a* '
t_~ʠqW&Rg:J` >bzsu1B p3ý=`EC̾E垢.~=Bs{5@oils*GΡZ 5,<y i(9z;GLV!C>`x"M0 D+^bF/\<yE9_#l} ^Ң_A> m 97[I$E)S)w7!?`N P.(vv5i0kiӑ_p}F u?K^4^` K٢JK6DŽ]d?
#,SS }B̋ Ww[m3<z/Dߜ% Aߒ&ܰӌ[ݯϰ5W<ȟ'jǽM_q(< Ym8vܓğ3~Rj zךKUb~wupl,kڵzkB_b1Eq|̭ >8
A7D@S`ť+_=c t)l4m oR2Hޥ8L <40 '] pN]ڥcǀ^c
o !tX`@ ,vx3AԙI' ,""Xbwi ?1x` i!mC qC\ؑ&NGN3` ' 08Ogay8ikFaI# UlS,f0`@U1%?8g>k:tjI#2| xO>^ҸӰo2@u x :{{r=Ž){/7G 8 >u!?M:Oӛ( <gh'LMcO?rà;/}RP/'mk=
3CNua)<o)7ѹOyGϸGٯ70 Gp<m }G6m?wц ^&ާ͑;~v i֍< qKo
yKSQVny<o~
u& m4إ@>S'
̿OF6 f I{( MvKڥwcڸA9'oΏt&3Mă{Sgy}~~c~=;5g^*~g"ĕ<& Q#y60I{ 4l3;'NV#'_|%W}Jc`u[lWƹؔ9ΦE;]h5NR
VQ/_pDVb_1X<uudT!wP/P.
188tk]y}}Ulnѳs3` TV- l}ـ %ϖ=[c" ;,OHw&" 7fᗝz:xө9hH:
{tif#OOe??%{l19B8O # :a\9 (a08߬_p"' pPG: i {/%L^vfNAY ~<Ip_?_{>p/q# ufy1mg: nGZ{!]/
j8gyef#A[-Ʒ92xEZrqpqoqO`/)K/l7l0L|tsM[k<y>Nh,5#أNsm>3噏[. vӍ&@l7v9h(۴ay6N+ɴi ן#i{{ùls?f e; L Ŭ/u>V0mI u>ag{\?MF F:v-ܒYǙ>,~cpC }H6zm5P0Gy!45:7#M<SS6(#]Np#Va?➣s6>\gIX3
u%Vvc` Ɇ'/Q>Cش`[\:?o_v gB@M_lɇb[|9L~;yxslj8ޗ3<T=c?Ss zt&(wVO ] /G|; ԋCn}{UwRA5 H@? ҁb)"t0ؑh Q8;@l 0 c:qbpY:q:Yc`1= I bnKõd }Kt1N}lv n3̘q08d\D<q Fy fd?7pM#H;,ܫ# q.=E ǵfޝ$xg;(z9m H*u 8Sed=uwK`+m|s4wI#ߚ=[3Wb|%Xo٭s,D^'bT}Ȝ8>Ϫi)^c?}/ 'ǬYN¸<f7i?Q=dQn0ccܦ˵fO}5u?n(gl3wL<[rw7C,~vcC1"0ic!~՟ s7q-O03K +>"mhkSd~ȟ7Wn"0m}vY"}G/>yzr1iT6J FG^ols(K@$U;C9 Ag*
v|=Χ i?Syk/ZOX &97vq<qiv>ùSqad/N`e9ZvO^mvmvFOX/c
ff#v"f왛~jf/f,=a[fKmSNO(K拨sGVā_=龗Y6 d;
?
LU=r|;e3 o'<=Pv7SXLδ6_iĵ1z̬##աsG0oaZݒl*̮`~wj{09~pu%HX@Vz. 5$ H@]KNR;&e'orrNLn mn a]H݇vÕ$0zNo滩nG on8(?sϕ"z i`/E Ӝ|mUյqAtp?br S{-l5@g (vI@$&:M `m0gi_;RmӚ$ H@$ 7o?wAeIV>`˹2͘i$ H@]H@ 3$I@
: N8@UrxJ@$ Hwd?UޡcJ% H@
wCM7$ t CG$ H@}$`>k Hh8c^mcy$J{ڬ\w';Y5ˀyV$ H@$ H@$ -4ŕji9ؾj/6Tڃq/ήėhTqܿTZU 0} ق?(n^}ހ@ VB*v ke? ](nu= H@$ H@$ H@$ 2I[frk !ֆ~mWa/lwqoz2M hB/\P]r|'bϞ=I?|uڵjbbBm333ST{-[˗/W.]*"paRNrX$ H@$ H@$ H Cׁ0c qr0~̎E菙q "l8Yέn?@XWܮRޫ=ɓ'VvjKD3gtΝ quj( .-qO?-".Lj̴MS{wGGG#;[ H@$ H@$ H@z|P4Xt)&SO,.nGUE Sm/@%z!ݦqcX<q,S\V s!;^Z^۷0>Tm۶"ȦHK \$ H@$ H@$ H ̈́f%v k{4^v9a 堋X{%]%i+Ǝ2ro0{F͜v'hcYfbX/^XDYnVEF`;) =z̸-OVvyV$ H@$ H@z BN>]ƔsСCerzTpX4n -+:u;fX~GdO}[ ˘(J G3hW-٥@rOsP&8"-߿:{l---7--y\9ol(h$ H@$ H@$ 6f!-c,m||:vX /T h9X竗^z
&/bO ?.a >|<Ė"y̖AEhf8 ^1h6pB~2Ҿ6WK[=
7&-[H|%QY-kF K@$ H@$ H@@w`ʕ+"" ?~:rH0_կ~U&2qgf,Bm^_-f/_\;իZ:u3z葉1_9d gm^"i|HZ;]&A}fMcǎ"mpԊ$ H@$ H@$ $@ovg)ٻ[fže&""""-LqOV_WքVaoϞ= n{CY%)ތ{$p (ށ0sΕ7eYV%!I2Ljmyk$ H@$ H@$ H@@hO*O=TWs M1?{""eeYbVzd|e}˪,k'3%l wfH$ <X
Az̞L'N'?#в1ߢmuzI$ H@$ H@
ƒRgf,zbbr 2Y4v9F`eYbt5cof o"ܹ\?_! 3iF ,ho$,"-y`psi H@$ H@$ H@0`LVO?3siƣgy~~̈̂E}뭷*f2nͲ̠=}t|ڷo_u~l5$ @GYĖ ; ziypdy 7,a|@え:o*,[B7o$ H@$ H@$ fP <Xƫ-KL1b,b3gʸ5-bw]N!kǎ } ߰}wmrYq mxyN/hyl߾7eyH˛B"-o%pðCM.o!҅ ʃTX}$ H@$ H@$M ?^} _~U/2̆eIBe3c9cַʘc=VٳaGɲ̲Eo$ <\=#F <Ge+j>a9 k4=\!r p Ϟ=[ɒ H@$ H@$ H@2#K 9rzX3̏?xu""Ȳ rWƫ/}]#r{]?2#F H@ zB5bѣG˃A!-$fv*1ob-,x1ۖk.]*ݻwMM$ Mj$ H@$ H@$ H@-#8mf?ʌWf2Ɲ3js"nju3 |/
v.F6h͛H1LWf2;3ceaH˃ 4%#ن ;.(C" H@$ H@$ H@ covӟ]]b97d^fblƶ/_\ƬnO8Q] 3$"Ʒ 3W# H@@O,U˛E<xPq myĖ~1˸
q%cG# H@$ H@$ H@`<AEL~V=3eiW^yɲ#~dYn<P3l(3?s5$9@y @imکkJmu $ H@$ H@$ "4g>7߬eߕO!2+_rqLMMU'O,ڜ{G_|կ~UkG }T>#~__.C H@xzR#n%/ H@$ H@$ H@ Xz//cǎUN e 9RVFp{7Sfy=M{իW\;zh0R406 _۷o/kvJ@@g @Y& H@$ H@$ H@h B7bYxii FGG˯vW>>@"ر}'7gq ۶m+bo3 _~%q_qӕ$ H@$ H@$ Hc-adVSL GM[sʯVU_% H@$ H@$ H@mXOHmvϵW % H;띾I@$ H@$ H@$ H@@+
x^$ H@$ H@$ H@@ (vI@$ H@$ H@$ H@hE@K@$ H@$ H@$ H@0; H@$ H@$ H@$ H@(ж"y H@$ H@$ H@$ H@ &@az' H@$ H@$ H@$ HVd</ H@$ H@$ H@$ Hh; T$ H@$ H@$ H@$ "@ۊ% H@$ H@$ H@$ tm$ H@$ H@$ H@$ Vh[$ H@$ H@$ H@$ P0P$ H@$ H@$ H@$Њm+2$ H@$ H@$ H@$aťeZ#-N`yflW%orb9f1}\b1]}<,5C#x6 ?$еguM}km$ MAfSdhA^>ٯ pi <4χހ%:&R@E*z
m .lXFǜ){Az\F؊h|n4g t G^~,,,TKKKݒ4! lR;0;6ˮ$ t@sPvo=@ .|4Y4n&@@4W
Ưo``UYPJ $,Yr,s:PK̔/ ɖ3 p7
c rw#.]T1$p իWm o/ '@'_@f&|>n\2n$I h3R<XPJR"qBTAٳKw89Fͷ_5$o߾ط` gsW&DI@&$.%@}ӥee< HA@`x$ L`lll3GϸI@$ H@$ ܁@ sk^$6ڶQiQ$q67L$ H@$ H@m7i$ H@$ H@$ H@
,[?
{mOd$ H@$ H@$ H@ իW"n۶itŧjvzSLr
]&O$ H@$ H@$ &<f>.\P
V=X# {OΜ9Sٳ:vXH{3smf'q~̝nP= H@$ H@$ H@$ugϖpp aaR|p9 9f^~h'T'Nfgg&q&m#{?˗WѣGKr lM9{K<yCʹfn=w+[yx$ H@$ H@$ H@ b((CCCd ~X---4Źz
, ;v4vq_կP8K\GuѝwGvZ<11Q 9rNS|!?}"Gܹse4b̈\ڵǯFZ/nh{1M$ H@$ H@$ H@=A э"}E`cΝ;K.Uk*@RdELcl7X_g\Yqym "g?55UZ ,KOcf,3) :y]#oۙM~2kQOI̯Zpzm/i$ H@$ H@$ Hg !!!!"]xڽ{w [ [q{}"#'r7L&ݧ&of1GsG,!/?K #R0㏋PKxux{2~h{9M$ H@$ H@$ H@]E q - B+bܣ>Zf""!!!q B "n
|?h˖0YvYý<$V oYÇs┍sNr~\, D[f2|"(?,mL^b(o rSe KJB H@$ H@$ H@ ?1~\-jzDLKQ#!~+_fQ1lAyM "&oS{#緀 `| ]\ ={\G>"lzjThopO$ H@$ H@$ lijauy̕+Wn͘" "K!#i&DP{B@e+'(B+3iRSef3y t{j߾},Owfϝ;W`Y[Y Ǽ mc֤Xzwv}$ H@$ H@$ H@xX]xlID\3D8m jP B;yˌWTf*#ڞ:u,]`K:ߥMy %qY.w
[pOYB~~, |I~Wh{5M$ H@$ H@$ H@=G AG vUD356tASE<!&Tfb'&&?9="=Nj ;_!"G~6#a1۽{w@Ch{(M$ H@$ H@$ H@M 1o)1fk 1; ,i,XfҒrEe65/gr ;<q!,XW #CнvZ}3 ,5Mi7Y' H@$ H@$ H@ B3 1 LˮNx%~\_5grq;/"l6-"NjrǸn
,3j 9RXF= M3-N
nqFwGo|s+ H@$ H@$ H@IJC%m |WQh'|4=Y;+߈ef?^Xfb]38F\lgӰT1dsmgH;<<|KY[=#R( ӺCYYP(cQ qGAk,\x
.~0 -j9 H@$ H@$ H@$)hh|h(gϞP?fe
9<Xc=V {Β;v;}{-+f*'|R\,\gޤ-Oc=F5k( <XZ
Gea*o 7ME #Ȟ<yG"r-`#$ H@$ H@$ H~@ ih'h!+;XNk
e۶mkBH~$ǎ +yLWÞ={ʄF&bƏb{~Y؛!ܣ o[ߍs C$E42`kA!|-^'''K-nrk?
*
~駟."->mB%Gx̴% L- I6RF$ H@$ H@$ l "bku-p~=GqGEC{ kw&@ޡg6]p`E\h^̘E+C{m̺eRc sMs@D{
أ>ZfRYC=uTaTof"fDa
4EC!tRy ;O;vqM
=,qf*?ej7=0J@$ H@$ H@$ N@[h)MAAݤ.ض
ѣEE' D!vj7N QLRĐ/D; @ IDAT)3s hU`|f5Z/sσkkt8D= ^6@H KaD0 ,< iHLۦBI_{뭷JME,Zj$ H@$ H@$ H@ (+)q7q{p.f ;XY apntt3GUOt/ |-"*?,m߭EhSS)h3p(YݰON7iBK 3q 2yh)y, H@$ H@$ H@k h4 ~8VeR hwu?ʅ !13X=쳲h3fx_|n162\Ѷg||MaZηIZ
oqpga
ڼ-(2kEA̓|;1mBKE8 ]⠑$ H@$ H@$ H@" Z3!9Rk
wh LD[ R\Vnó>[V2
`^^.fr y Y+gR>'2O ?^q.۲Y3{;)J2k5 (odDW
3 Jen8ʛ
)H~% o F# H@$ H@$ H@:M O1E'n@^N@IM5qx06M+y#Ѭ0)X]} e731*yݜQj5 kZ) Y*KFA a[7\ ~Кn|<- H@$ H@$ H@6L 9L*kG@K"vvZH)ʶy-r̯Qz^km:%̖͌ÇGN Rٱ \{À\gYg+3e?Z W}=&L$ H@$ H@$ H@xr v
_[@O dӬٳzf^
lQYg=k)0==]]zu̾Epem! f^tE% +FR K@$ H@$ H@$ HPGlVٛ3c 9ٰ;v(Sŋ˒ &ݳd2߶0Y$ H@$ H@$ H@$znm's.@lׯWgΜ)" 8pb&-Yڵk |P0{S dK$ H@$ H@$ H@\zBe`~6̠E\EEѣE'O,K|e'''+)v:wO$ H@$ H@$ H@@O9ӕٮwʎ?8x;&_DUY-Z;ʵO?|A)Ç+f*)'. H@$ H@$ H@$ p %<Ho߾jhhdBDWDVDTDf"-/#bX8
K ;vڻwo1;;;[.D~XgG# H@$ H@$ H@$ t?hF
(+3 ݻwW;vX9ˌY
$ H@$ H@$ H@@dYך;d$ H@$ H@$ H@$ ;迓K@$ H@$ H@$ H@@g(vH@$ H@$ H@$ H@#;"҂$ H@$ H@$ H@$ P G}$ H@$ H@$ H@$pG
wD H@$ H@$ H@$ H@!0oE$ H@$ H@$ H`3XYY꿌S U{-{dK/4n KmH$ H@$ H@$ H@jff(?V^0"l85n7AkR}
K%@k$ H@$ H@$ H@]B bTR1",&Wۜ gz8?ɬj "ڇߠ% H@$ H@$ H@
7V).ہpY8~'qncUՅo2ڴ#P+#who$ H@$ H@$ H@زUjd 64 Gjq)m,r\ε&nY mF|qi%FGX: bۦ{u7J5ӡկh: H@$ H@$ H@z:8WفPZC
q~·Xq_|K B˥ a ]
mgWDg
F~ H@$ H@$ H@$ H@xh eÐ$ H@$ H@$ H@$h-$ H@$ H@$ H@ `$ H@$ H@$ H@$ (Z$ H@$ H@$ H@$ <
H@$ H@$ H@$ H@4N{'GB sͶk{纶^Rwj,n!
$p!)ҜBS{ν@>R!79ES$@ !MHhBȍlKd˒K3<-ْF\k1sM q" " " " " " " " " " " " ڼ<e[Z^%7J.G`U"jYl̺t:|NtzŖҾ>mKmiWiO]}6Ĩ%&hGy<yd_&˪\ʲ囥]ĚW|ayߣe*/RAAED@D@D@D@D@D@D@D@D@D@D@v3M@HW~>ɭL ne *ȷ%:s'y)ԲIX*?-#G+JD@D@D@D@D@D@D@D@D@D@D@v5M Q""!,2_̏x _|R :; ID@D@D@D@D@D@D@D@D@D@D _` 7iLh&5fD@D@D@D@D@D@D@D@D@D@D@D@D@vi칸<fbv P6=v!x.^sEzE 9;X[a͍V\.G@v}TKD@D@D@D@D@D@D@D@D@D@D@D@@zi9Lx? ܷ7d3L}L]fK+_^l3s 6 ~$>VcvPW" " " " " " " " " " " ".^cmz8r&(3|x]I_qkjRS<9 a"e v|ppCXXH[A~ | p ,mُȕ}yv
r"4 7'mzz6H¢"ڪ
+*.{7>_\7B.Bv}蘍O+,VUYi+.&m~nv'\W bn1f3v`UU:q,|vcܞ}R#
(S8
wAJ Eu9뗅YMk<Pc
dzW]:IǡzKv) xy `Ņށ ({$D@D@D@D@D@D@D@D@D@D@D@D XJmͱ<hƱ6Q_cmMVV]t v}
ɗ \DVV[ |?7`ƍ)zJþ5]mtt2d_ "8g抿.t Ԍxr|PM߆jt% rkCFgHXx U \Zgk >O\ fwg.ža%NJ _돀D8` {$nAؿ{c\ ͼԖl#e㓞.wjkk*\λuA;|}ԣ-
<-%ϗ%R1%bڦ\|.<lhvARVAЖeO^fCF%aKAoȥ 1p[QQf]ƒAlffEՄ(Z[V9% c&wݕkq~ð*{aO \x )9)LSv犝|ڢ}<JvlG5Zz++uIIRf/K.gg<*z_#˳6_g$-i^<wΥ^~lܹ{!ݱ_*" " " " " " " " " " " " 7g=0՞pK .CK9ޜJXAyhT zD(E q[DLb<\ o{ښPA;0xî%
Х 9vY\X夏sEoCVRLDdNysyOKy]jE.fl^L 3|&'ylu[`Uγ]-vJ\sZ=0!ЛPh%Z9r%z&JwHl~Υ0¹ݏ-Ϧ<Yu9C;7?o|l4'~ ]~5|H@t.W
_
Bv# K\biȑf\EC,S9fvBO|] b䪛^^
x+6Oe 9lC(Q>Wj cwz.|z.R7# } .12o 7 V\f.ڙs.g\i
S\ʦю i
270^ )}溽:8I9H|ܭ i_t| kOs9;uKRS5 sl7iٌvW" " " " " " " " " " " ",,(
l?+"TiBf}ò YO#;ie%]4s|_E!GZ4
}"? <64%ץBfڣ ә<uWz9 4j=M3sƬﱣЊM[ϹKa >S;bs%xxd6\7 -MkB\sW9_=%<ݱo8\k8 _NwS=쭃
3b?kϛGIn=c " " " " " " " " " " " N{TlmMG7-"/.jCZu JyUy]e:
0?_3v}~[76x:993VV.rW\OzzZ sZh#-.l!:Lt-2xy,zDcSvA;T !
إi% >s4ƞBܥk!m9X/wy*+=bz ,=q.iԘ`E] B9vQ;|c^UCzj w|ƣg g|ܽ%g<]ED@D@D@D@D@D@D@D@D@D@D@D`@\.MI9Lzknz=Iq|\yt P"j}['e=umY6t&&߮yzҐ"c\\R5##'=0~
.<
ByqI<}
X'-t!TI}ٞ>,<8r? mc >jUI' I-I $u$-߯ /]'=җAΖZw{>މhkDEK-'d*s1[_t J:|;AE"ʖ.fܵ.J2=[T墴
_6rc]4[~'Ƨ,
DMz#25[}UUUx_)O{_.ϝb3.ǃ
?ϣ]Ξq9KZcOE JR*' 㝇̅''\ey)6ӫ4یi''gV"OklǻZ&_xjND@D@D@D@D@D@D@D@D@D@D@ )m\̵xjROs<"c+=̮92VsT*mxd:]po5v
z? }[hW BSh.ӟW6ʽ ~<pI[j37|tǙ=99ϵ.^i_,gXΏ ;l]m
\ G<2Mbd.=:gR e=bzӳ!zfzc3W#>c>lE[5mlWvkLDχhŦ*k<XQV Kvh-*ru pyy bc 葴5Vf ^'7߁ym==2Vk^mMO $.(hXBg|XsVnYðGLM| e'25`_x U*p()G[S('mĬRE.n=z+GUۍ>ʡ-: 5Vn CGmw"g;CZp! z#A} MEɍRED@D@D@D@D@D@D@D@D@D@D` u7{jk<@+.ņ2D23?<u!ȳ"L<ejvmj Q;6>cSS.
<֣[g+։mA"kfBcC]]1)"_>7Q6`W\s鐏57eشRJzdR)6t3DfY>9{9p9O /lº`-ɾb>1Y89g4٣.ˋÏ~׃= 7V&
DaL)dՖdX s{\VZZl7Ǧlxx
=6,k)vI:R!76[sc؍voSҦ烝kࢯqdHim^w60t軤ZHs Źѓ M]6tmʘ+w1hUa,aҺ* o/X3ClWy:vHuxƂe _Qg˜B9WBe%Lj|eeo
O)ߎ\.+sEŅ.?ׯ{NwJcc|Gŏ( 47}E;tvm"6d/ r1,a #" " " " " " " " " " & ef\|V\ i=5펠 QK2'&kqaut "&^N\˾o6YIq?OM q{=O%Eֆ- r,{diqq<.֖ 髷wuL6몭Byޜ~ȴs_y畫 5){#d ;㩎| +]>~պHkR>7
LpyGM usVm
z/AHoA?QOSp***WeA|+ncccv%%t555>wͺXO?Z"t5ƈ~G <xp5zw=m@n</M
hI
ѬV3dt+[S>l-, ~(ͣ]- [esȴKc_YQ#FSv@ltd"̉JR4u5UAƑ{ۣ]=v -j&\ʖ \ξ+XIa 9rǖ c?{ea3/^ k :d'|V< =}V28MVD,'v
b¥vwg y 9\7CLI!ō_.^Dĺl^v ѷLjw6 s 9o]ڥߘ^9RD@D@D@D@D@D@D@D@D@D@D#*j]\+QEc.oxTܘ cKKJlɣYa~pB+*pvkg$kjC ٲ E.~Cؑ/Ic{|lvS>ʲ}s)t0_jb6wq
|ܴmՂGKMw晋9j2Dm~~{tw; y>W\fg.ܖ5y> "ڍ:lkk/5wqn|$g-{DDv2w`}먻6oE-_haYq75*\R}PB{l,.nKr%mq -E@D@D@D@D@D@D@D@D@D@D@ щ.e SV=/% { |c| 'vIZPNM'nQ㠰=π
52o}тC(
'S6>9.|9cۢc> t>O9VZ킐-8dg/y3^ hv5oEv%{#] sa-@f:WvHna;DILUA[egGRJt*: a{ʕPavOOhV>_y}n[ˏyNUA/qcM[ǜHZo1㓤!C[X{`/˵v^v Ej%zd>siwxt#Q3u Hqsהyx0>s6A9F ] )+K-]s{etII;| {-{KJo#µwUj2+YO9 &u/^겍HVD(I3deX"l)ɰu/#|OD#GB͛7ƍAFAK{VQ{웱̄v﨤" " " " " " " " " " " " x²Mxl]UZ۷S< q"Ksyz9Ԭْ"nkr$TN mL?4j)̻{}tVιu__l$)ѨOHSD,QHd!ʖQT)RaB=<|rG
U+RjkkCOݑc_/>wKD > rzZ~&q!zَ;bE!18D 9{ u9;K"gG<%s!_R4H>GrSCu+6vi2= xX֖z_{#Vv]D"E\E"7\A#aE"MIW|Cq,>/ht,lEVTTG۬Cƹco2.)g۲^'r;WE@D@D@D@D@D@D@D@D@D@D@D`?ҝJYI<>k~Fcg=rvY ?=˭B-DtÁ{,svufpR룓\O+kk9s'@d7K>K#0,++ Ea?"icd+K-۠n|iaˋȤ#,QfD@D@D@D@D@D@D@D@D@D@D@D`7Hy[avMelssK6zsʦ<6Y_YRRh]
HaZX瑴U5+$-nk)pش57Y~D0v[ |HQ*ѲQ.(3D4l0ol|i9>yC }H\J }le1=HWD@D@D@D@D@D@D@D@D@D@D@v3,e#F[Xkn&{XU疳(i G5 ɬoʷzJ
82r DiS tqNd*] 6%ٗ8-ii4ĤZ>wjvڮ" " " " " " " " " " " " 6˽y|*mnUr(Zm?wUUevGκ]v
<sӁjm
\Ц쑣VWk cjWuӒ=Kb ԄHS$LxQB-/Rlll
zP2g*팍 9bmmm 抍s&犥>(4f,7RbGuE@D@D@D@D@D@D@D@D@D@D@D`yvcܷh#z8vjGxʲR+).x( l*++-reV[]g,*A\"?Ik\SSS644htj-BK])u!Mr]v-D-ʕm̥%]+WExOݑ D}Vh}dҘu*" " " " " " " " " " " " Z*H~op&6Q6 i JwO[3k% ZT_alv
=qmuq;X04#AO"tHW$E !Jt+iYO}RJd,:ڍ6M˺jhy<A$.7$*˗;HY-/-Q!2m& }IL kmmNN ut
uv}֮NIKCUuvJK> ~A=hnxг2 <-w*Ѿ K%K
GQ"FKKKC}-"uHR"lѰ---AKZeS|Eƒ.B:d"dYO$,c` rDV Bq(*" " " " " " " " " " " " EJc1;nQ_UVZ~ֺ<lkk_UWW$+dEEn"?)uʂ̍E"5H}GDe=풺=_K-}ERuW"Zq:Wggg #gY/B8ǪuQ>SVd9@-g$hCiA"]y!4)˸. Zy%5^\ l7G}LdlԏuY>mfڢ~^v }N !v[zQoi'j|]$hׅigU4n3n'. dF\&[>K" " " " " " " " " " " "HycIݻjl ͠6D@D@D@D@D@D@D@D@D@D@D@D@D@D` $hIUD@D@D@D@D@D@D@D@D@D@D@D@D@D`3HnE!" " " " " " " " " " " " " AH"" " " " " " " " " " " " " A`3Q" " " &l ᵲr TCD@D@D@@^^ZqqR]} ." " " " " "$h v!k%iuulmQQZCCUTTlE7jSD@D@D@D@D@D> H'8&" " %099iAVVVZMMww
G`611a/_fP," " " " " "u$hZΘt:mMMM!`AA٢"" " " [A A[^^ ^ 288ޓXED@D@D@D@D@D` Hn9D@D@01yPJ,sIᓮCm& 8 IA{p D@D@D` Z9Hm\XXhD"hUD@D@D@D`+ 0=s1 <$hqR-0"Wfgg0> " " " D7 5*" " " " " "A4Ֆd@SgmG21kt:eaPx/lID@D@D 7y@]D@D@D@D@D@6&Us" " " " " " " " " " " " " " ڵhl2 MD@D@D@D@D@D@D@D@D@D@D@D@D@D`-km+++k}""` =adɷS'K|f&6Meӂ 4tF U_ۦ˖K9ͻe[>zaO}6!&hqP)+W*? [ ǣ>E`|'VB4+ԲxKM[_.m
my)mydK[ZBN~"" " " " " " " " " " " "{ l Vd"-90ѳ7e9z 3SԽ%bS9Je]H3fKf:$k I xħT*en ,HGS|
<|\Pp? ,7*B`ffFGGJKK><=`jjV'r`TD@D@D@D@D@D@D@D@D`}jb}M }
a|f=zWI;88hmnnnMi겗%VRR"coիW\¯{묭ͽ:ن}.]dj{ꩧƍ//6== ?VYY
U"FFFZ[[!OΝ;g o~Y? znC _?='x"aC&evG '"; \vǬ쿞12{/y^h4jE2NNN& .ؘZ"gϟ? h_ء]f===4Ω^WF!q611-Ry %&pԩ c[Q~ m= +p.ѵHV7G
?zuuwv]D@D@D@D@D@D@D@D@D`9B#+}f?mА٤/2 7__ofeME)KTkmmj^Oo_e G ydNv[>G92Uo7~ H\ij73)c\={ֈGG ÇH ax
Mn@ 9rLR'?;yQA#QDIuz">f!-(HǏG9}MT|UUUSHf0<qjtlr'0~ ~{_5'>a R} D\?hr`wʕp q$s^;::=-ܮ" " " " " " " " " ;</@.30G͔G=g^Ys933$-oyKNT$u/fE m ;-f`` D
---Alu79B/ݼy3iNAtK_dOww"KDq\hf\ mĺ C2e)K\q m: ll) }"H4 T版 /s}Cl~;"z96a 3϶d;k NY~!4:
}13LH˵H]xk^c+b9̙3FT8ac _B8lg, ~rwE˿ D9O&5?x|g8 >p !kØi[d17ɞt <566~uqp - V Ї//yBBoj9O~AS?\c ^\?ѼXw9>YD`\w+fiڸ2ݵE ~u U!,D!Cl"2 #P!H A[?}; Ia8k%k_ZD
↺F.?Ab!ʤ . x!@7q?xKⒺ /c`nY"">%y%łlF0iVAj?sΑ)a,%z!M=q t h<.~Gzd22p0
) [.vaa089~d%'<d~T+_J^ʵ II86H# _C.%WA~S
L\O~A~s c/Bۜ߫FDsL\פ:я~S~o$>9'}f"[96u{{{n u A"r/߷X`ϵŵ cqs!lg~&Zc"Yr^7,DlNN6-E@D@D@D@D@D@D@D@D@v6 ڝ}~4:$g_ͺOzKٷ'k>
JAd+r"H@ B)ncA"RV$erBA/}"iٟ:$\{6BP#1D1*? E 1.JLe[<vd
D|
:bܹ
X ǃtc|FPGά%F/c}_
W~ :o~WIѹ[
b|ePÌLD*Q'y - @^&BN5_5 @ IDAT.kKk GZ"9w:<.E5N{AۈTƝK.Fn~;vF}gSL:f> 76RyO+ {y˘y9ks\[|W,{wyKqv [V8ZMΏ3 *?x{~@A>l$%Xq1ƶ$hwD@ 2\54կ5{]E H!"HA hLG$CB"
)/}KC"
قt
H F CVC"Ef2F""NB!jx/Q.EТ.+^H7"H{ED HEF%mxI 8vƀ e!q# Z(Y8qܰ=Q%Ѿz# }WФ%f1Xe/{YXO~睾䘹noxBdi!9'k=Dpr&yMi+rIy /~w¼֘ɴÏ(:mq~TÜ#"8^*g1 Cl ۸(1wLWʾ/ics2f(+Po j$aB}V"k5ۿ
__
:i# HH(WKG@v3X7OjSOg\qIm w $ q=K e=bidT#!8-b"}AHW$
mHRҝ"
n\E&! )#K$0D~C */be܌cA~"$z~&؎ L$'}(Y8^ ُqYǒD2N
ǏG.lҤ \36RrqSN>x M$ ]q N\2Nd+"Hu &y<tO[D"?pmsN;W{ĵ@\\o< IXhx '?> z7Wr?.Ïg;{e.pߚ0&pm(h\W!uþg|D ST|*~1>я{>}1]Qڢ=cO" " " " " " " " <iϼ<㸽mIo?XP";zf@F6fPT" saĊɂA R(AE o_ ̿D$9 %FhRl= ҅H>"nNQf6؏~VL0%}>H1|G~ه 2>i7ZvxE!{D6c HR"v?r9 ÑwH'z$bԉ} ~>ӟt̾+
#K?ҏuG qOJ^5[,ÙRp p|i
"6ʽxB*tϑ.g-pqDrMp=SANd Xsx8w\& cd_&r7zى8nD s\jv+YDGP
:1?u=&4mq<}c>ÖB*iǓm'Ǚ" " " " " " " &$I<8#gK\$? xf,2r%#<e uCY^8y?Ko? q2:+ߣy*}f , C(^:D-cx bC
H SXM$̟I (Xؗ?\E
!hcQA>Lډa%UYC A<~B:nxg# Kr|q]\RW<N/s"o>#zwcJ|86 :a@=X? 7CM,m%\ӈMAR~#o29d{cLng=%}{eT3<'߿x sf<
}3\ ?;B ?wx묵 (ת" " " " " " " V̟ypƴ?IЃ0Eޝ+$S\7z!*3ϕs@f0XC1n f "vD@v< 7da8W+I(>$U+(RQf(h؏y%zvQ%z M{HQ#HUK.BIa HY{A1,R}zuhcsGGG#~sRc!r~}ꩧ#Z3L]k c^Oxz$-}'Q]{#Ǿqlu Y,D3_?=yOuj8NYyy1?|@~>Ant,:!c=sm^ 8/G<2k(`'c"b.̣K+w=.D2sv7mϧ>)} E-O$V~k^z7zǡ" " " " " " " {@f~~?o<K{+܃ϩT 2C&v}\<7,-z'<ٌ"AՆ!@|?0z 뉔C|!(D !kL۠$ E萖M,$HORW,D "H L*F.!xw3a '?C!?BE*\bDXkI-cM& mQ?Tp@"haM%=#HYLM0yv%oypna;.x=og $??wppxӛd{Bl3/sֹw?I(rرcbƈz$&\)>ZklqiD"^U
BVY=;whߏ|dcçO?\?c <
Zq7}M]E@D@D@D@D@D@D@Lgf>K\j++Z~|1*ER툀C">P퉐D1O$&FfG`>r#M^9H]A"whHYP/}KA</(6dq X)a1 -?IC>D"}6т'N±Gl9rI˘ub, /!<#cD #ɐ^Q!O:x"6,n)gR֘c#jo}k;%k}{#z)a9k(ٗk(o!F
cx¹M|^i;9no|2Q?(dHq̍K*q"a? R|[
9~IW >TED@D@D@D@D@D@D@v"s8Srܛo?}<1K>(A/"+ 0 B^نD F!H)H1+_5c_Gc"VYGA,!H$#2 !< ۈCF1~gHz"q|_-?AuB.#ɐQ U_U!q961)sLḩD.cϾ<<H(k?Y"S0n>O<g QH10 xIKgÊhqm?q[ ?^`$jI-9&bk-
sr#}`G}#m#1F11BB2 ;c }7,}mp Jt,>i+>Cxqr&9 b -E@D@D@D@D@D@D@D@D@. ڽ{nud" OHL!GzX C"{1JZT bqD R(Xֱ:}HSDB$jo!ØB6(G@;DGH;
tx.4 #2F$$y-Bc dѥD\d5F #H'eQa9b sLg
b\ox9w< #>R9~9WHZvx0ɱcLx;u9'=3WWZ.Dw"I7 1W("BHq |qN(DK#>|2|;Ar}P+kxF=\DqEJ4;s(7b 7pFzd={ x.TJ'Ft'V-m<^Ϊ(" " " " " " " " "$hh " [M P O tQx |A "Q #.XvqEyG$dd<LH>"}! ;dDbd\c ޣ-9)O a G_q,m!xKrG")pmIᘑD?xN
u {zz^4j1 99G~!e6 \ED>SEe? fT'Q+_JQyH{W" ߙ3gBa2Òm#yopA
ٯ}k!11X5
w2RZ.q9gD3]z% Apy?po<M "grR w$5FƐk 韶[/9H'.{m}}k>RtB?D努%bg=cfƖk|kvsmd=mg'.4-KY X G
"}'>d6"$noxξs~hݤ&/bIM{s#W!u3s9QFPI_ 4)x;BO2SHL pƇ ? \}s2.~8ADْh_ H\ 1O߹
6i?Q8DfvND@D@D@D@D@D@D@D@D`g1F DQ.D9!4Q6[.uV "(wvCf"xxM<u[qm(+PJU)k"t%
ڏ~.i;</y/HI/ %̉Ї>$*{59K3Ѻq }0T߇d ƈ %ٳgCt*/}i~ @0IVMH-Qe
c,}ӟL-" |шYxd7ǂwkooB'O0 7)ݨÿمsJ ~ÿ C?ǖ>L; s`2e2HZ A8kGGGCg fpzɇ< 2YC8cDkädN\;HtWL1~<5) i#q 2 6g?]擌rR"UD@D`?@V^{i LG>HTM ^ߒ^oܓ/>|-mbZwvגA [O(9bw,X?3ғq'ĿW});ZmB^8xb:㗼%<!sI'χ}HÝL ِvo}k7<y1.Z$nRD@D@D@D@D@D@D@D@D`ݹ掑]zz{{0jyLzH()&y;RP $LJٗDݸq#\ Ee-12.B//9ь㴝LW6GFFش"" RF SܷS Kf%}Ŷ72n{P)GG![nQHZRU
6[FÍ̿\4\L}~:_16!3}+mdɃbt<$FH%ҕh<>p_x< q|!K$.)1*Y%BX P#pI I;\(#mia L4&B K4N `i?؏{ Vnm#T|uX2o/FX\'6m߲ngR5g z," " " " " " " " "{pw Ǟ -ѥY$xDЗA,0iK-P1 ly( "zY3 ]]]!&ERֈWX XH|?x*?kG"HC@k(D.A// Jd->qxXo'{e/YJ{5<< I}pE1B#!vh!7FEK-uC(qQ!CNZ@nX%
2k R3J[=[,l#ّ9EC.BHJ==\` 3KHXme.]朥 rim]Ƭ"" " " " " " " " " " " "~ؕe1 W7>w[ uDl}JD)R|M-W)3)2JE": r6F&X0Q,!Pa"sAlOllB9/m /_i%qnOE@D@D@D@D@D@D@D@D@D@D@D`c1k-]Wljf. Ç08{
[B@vKnn|!BׯU"PDEn@^Q\%J J*dA"_){d.K^N\%.c >Ƙc}.2u"" " " " " " " " " " " {g=Ev9?V2,c=WV،;c VR\"kk}^j{fַgpP\xF#taa!Jjah%a%5υD=qD BgϞB+ Hi288R
q~ i Kq *f+Y%3gB.ْ^YED@D@D@D@D@D@D@D@D@D@D`ٯt }s'>^ ?NrU/ӗ Kvupؽ͘-m<mqKAki:95!
\3cS^+,(V+}7 -1x:儛qOZxg Fi%hw.Qf8k%i{ܹe'_/ ۑJlC:| xO /y.Y m%m3.R'Sb㸝%ǔ>D yn3y u={ž3|h >>Z@&5h#qFFN
d %Yov а695e#wRZ\dVw^p'/J;z՞;qsANN n͍>}fe
Wr;<R<o*fZ|5-eZ EvE|%2\qQnT Yk=6 9r$U}!KҽqFIrcd<Qe,_c{L̍2|I]#@3
K :;;x S
ի9 E0ٓO>;| pر^\"x+CG*B[Û j)8JVNmeُcMLjkj
u.kݲ3.`Ϝle} 9an_셞 65<Ź>sG Y_굸C㺙^ ϳ=I+A+a
7S~/)1fDiMpG7n+)cnl"JA"[ʁM_\xю ? nq ,٧_ġlq{l;.7~RD@v3utogQcK ߐh4rY?K544gO&/#3sz F
RM>*++ Y~-adՌ%ۣǁo {']tRZUUe/_ 0# F2ψvs'/M/,y<k:Pg Lي:}Y;y?O>r,HG{.H#mdX|#g?u.
¢Y 6%"
9{%}!:ϥ/Ҳ H" 'm* 7"ӧ/ER"V7)ܜr7
0{nU$?7Gniflmmm9S >B{ R T{u " " " OAxE
:A qE) gQ
3~*AXP 0 hJ-c>>g_J]L{DRp ؏\,%'NGDp 82^ vttXKK&unD-"mıeLͱG l ? .gv/Ѭn; ,]Dl^h(er 琴~8 -cἯUg<6)T_cI/=v
ovhHqW"܈DW"`͌$78)LI
pMvrrc}nfqCoܬCHZR-#i R!nV./ rG6/UD@D@D@Da/qg*" " " " y3K Ѧ 3|D(Y3 > |AaQB.Y%)o<#<c 3τ im&B "j HggE<xc) vG"H3G= GhG-{* A8q*+<R\] imS8?wUmϝg픏+6s1!V;y J>/%$qRY7Jnbx/M1rs.ܴ1<y2=uه,}g/M};::' c(&7\mG;eQN?'{&lxߍ< k-0Ƣ>D@D@D@D@ >θC#y ,A_6!<Ϝ9s|? \!EFYJ.m ߪ<3#gP! x Dν>{i995 k=.zۇfbUkn9n=5v~y9sc
]ךc I{!E[=r.<rGΞAκl0] nNtY<` m> J$7%.VntSf7I~KF:>#Yc'mR?RArd}rq|q\pUWD@D`7IRa<w1h" " " jD9D 쮣hE@D@D@D@ g<{;[}<Xs+ۨXjwfvϡܴ<KѣGC;qPqD87D}!x~_ '㥍<bY{.zGUuZMUeHA|{#={ca,}OϜ=c%r!د+bg} r#g{ `wW=vˈ+rmiTeXXr]'Zg&=:k=w6MD@@cę/%0V X<8!VV" " " "s *ys(.$%yB q?)l|
I4E+G*>ُb?$T l#Ќ([h\_x1cו+WB[+ ³bh Ԟ<[=hA$mC]=y%[վAOw|bn:Z[lίsv%9[qOi|X_{L>3mnI@D`?~ a~ *" " " "ۃU큨6
jSD@D@D@v.&B4Efa "Qy`eD< !b|&1")-KR#Ye م>b?mK~
Z[[E:r䈝;w.A fYGd/.☒}Ji&r@>>UVYOLjd0pn z$m^*ψ]J/ْG^1jS>_ 9{٦"F+/+q9n ;be.gR Qv}#u<" " ; 0Ic 9P
JD@D@D`]r @D@D@D@D`C;OLDd".HEߋ%6JyR"hB-yE,}'H:%vI-HZc]3"wll,lXf,F..0ǧp)#ăL 4r^Qloɤ^^ Ѫyy>MfqI.7-#i86ߧeRe{$KpzZ9[阏uىV摳dW<g:(]L P4t H I,yС 2' @gUE7s1e)4֑_Vbސ.D"c .ʣs oَYgެDfًm~qEie.;bE 4>o)O?R5շ{x$]rIG) Cx5fr%3ѳ垚yـ[v+:-" " " " " " " " " " " 5 YMQC9]c7isipBld% dϲ
zgYeYVV3O.|
/qc2̭qQEBԴ
]Ő:8y*?eG=
D V\oKW}t5d~3+>'_+IkLsJޜD$#A" " " " " " " " " " " " }E"B Fd"WQdR0wl[[[H-L˗/vh
iA"H)HRk-h˾N
r+~)|Ͱg-XD0㥰tDqU&
{?2,<epV{ QDf ?e;Eu8S?wˌ>T:\oe%V"k׳w"+|;*{pD@D@D@D@D@D@D@D@D@D@D@/()s΅S$ D& s"HblCQzDΒ^ ѭ b =A cKޗi<xψZ/)s%xGZwG=vӽ슝>{fo.."g]2`}CǓ,~mjzz.^q[b55NK%hԱkM U"[HL*ѳ1%D"M+**%bG
Q[!uNzdU)K}ں$EƘZɓ'_ml!
1!9.^{,=-
R 9sv[~^={'H'<rx7;Ke\bg.Pi)?L?GnON-V7D CI JZ&X^HZ&%FR7J[:HQD,r6l?cIDRh#Wa=zú9> ՍM^{}:NNs-v+="k<9ם5c?c>}Ku"gM
6h}]ʦZsI;|Ӟ]%ty ڽvFu<" " " " " " " " " " " @Q`"hfk(b >q}-W{>q?$1nmmrz.idu`Gs}v"rv&Y.Ң q<;`y+,Rv#iGFÂB;ҐcVv'~4&IK~^]O٪;qL[uKv͑8Ep/X]Mު]$G˞~gV^VOx:把r(Kۓ'|gwȖKA^ ?pw/9Z l!u {攧vZ
O?]Y^l^Dyggg=ͬY6+*} c7)O\__m8b+n x$;DҎٳzþmHL
-К}hՑ@M\M?{ dWR iFF(gm$ K &8`
ʔcgvp)S6lbXQ9g(MQ ]ݑf; O9O9pIdYVWUu-U jZsvˮq߾,#: 'EBq<S&M+, aiٖ( ihϬCM3kڀih 7$ H@$ H@$ H@ 5¹({iه}m<{.s6q xxmX`nXrq6v !Cuu w`hmi
-ÚO<)\hjg5is$ H@$ H@$ H@$ D T>xx\8zd,aB^;,,ͮZ %Ri'O 7XfOڍ2f&S±'H h$ H@$ H@$ H@h:~x055we k<rpګ&5iS'E* uSÆE+
-`% H@$ H@$ H@$N {V=uJjq!C;¨Q#%"&q%aÖуxHi٢0~Jbho(~$ H@$ H@$ H@KHgΆCiDZC8p"jz6\2MƎ F F5t}yiEO#G-a#C۷$ H@$ H@$ H@$pV
I !]{Ç^dB m Ξ? &N Fua{*L0Ǐn!wm,+eb-~kkkhni CZx -|/H ?vMS?-G9G675)}9o]Y{# H@$ H@$ H@>CT9{xbF 'ץ`˗Ln)WNeFUY+h;EVM%u qGlDu+F0$ H@$ H@$ H`` ƌ -杏\=$Eax o<jHo7CZ# :*~lk Ķ
/3B#ĸ--UaHuKhZ ɏUCCUt&AUtnڀ$ H@$ H@$ H@DK- Q>=lzpWL-fwn%0 dq/ ߓ|5 g!3A. H@$ H@$ H@uҨ*$ H@$ H@$ H@$ M@vp_G/ H@$ H@$ H@$ "^mS$ H@$ H@$ H@&@;$ H@$ H@$ H@zm/¶) H@$ H@$ H@$ H`pP K@$ H@$ H@$ H@H@a۔$ H@$ H@$ H@$0 (% H@$ H@$ H@$ ^$@ۋmJ$ H@$ H@$ H@hw$ H@$ H@$ H@@/PE6% H@$ H@$ H@$ nՃ{^$ H@$ H@$ ,ϟgΜ gϞ
UUU& 2$WWWwsyĹZ[[0vܹ0dMmmmݬy|$ H@$ H@$ H@@Yr||8W<Oukcԃ]# H@$ H@$ H@ ÇO <`-C͞Km(Kѝ~Q9y 6,ɂu輝MMM+A[ ڐ$ H@$ H@$ H@@^sWq`] s%ڮs$ H@$ H@$ H@$ "`;S˹_L>O+\\|X>+Ϲ$ H@$ H@$ H@@&@O &x8q" ;v,?>Ł 1bD?~|=zt͖+z#GLKƔ=jԨ..vM%q5'^=}멋sΥ444qQ17.Зn ¹m$ H@$ H@$ H@h) Q
a۶mСC9y0w$rwѰ~tnI$-
6lHv,YBI ݽ{wػwoQ,XfϞ],Rvii68kd11bF yX6`$ H@$ H@$ H@)~p5o ۗz;v$j" 9r$߿?x"z"_.ԔPYϞ=Vp uʔ)aŢe)O=`8ٓlϺ_!>:u* <x0y.]43}3% H@$ H@$ H@$ (IbDXD3ftxx艀I(M'OLB*}@h=~xKnx"22/YX<gIxRvkjj۔% H@N @ IDAT$ H@$ H@$' 7ɮ٩L OTBq=XMIx"Rכqd1F8e}&W.
S(cB3>h;}tL[OnS$ H@$ H@$ H@@%@g/ #d1^y٢xr0aK*R\TkiӦS}#vG |wԨQim֬<bsZiԞ$ H@$ H@$ H@K qܗF N+x5ZǏ XLP'NϢ+>9)/
!9B*#θqR}쐇p'o^[nK9q65.-O#mX$ H@$ H@$ H@}m_5_,XvN8NZjED$ Iѣ/(kKEA|P<ts(c<r6 >$|+$ H@$ H@$ H@:++e}0x<y2}Ο? 444$ڥKv9F|EX9sf-7bk1!bvJd>vg9֒b0yEE{}ZVוWy H@$ H@$ H@$0 < f}c
}:\x)ˇ쑊PV+^cƌGhcZbB%1blN|9ie˖o,Ԟ9s&yf omEWoi i2sk$ H@$ H@$ H@^q)w|S1|X
zPq2ݻShaVB #dvLjiӦAZ9C<NQ<%O1q DxR>,,".^ZfmZDẺT_l Smsȧ|dz2a$ H@$ H@$ H@"C{ƶ{©Ƴaʤaa0v̥}g_ m_:o| )h*&[PAHĖ
uYtɒ%c7۠;w&]cTYRQ 1؊/kfO_ʲ.v
Ƌ6w+ H@$ H@$ H@@d-mwS[Z/.-nK\^ʕWVr|{t1EaXmM^?vdxc57G53g ø ikS);eh{u^
cǎMܔǎ K"i%|-b6[LhoڴiI`œ!/\1*W =I1cF aÆ0o$bxݻ7C t g$ H@$ H@$ H{gwZYR; }-De9=lT-t>$16/D?wG4j+-slHCI^ :X
mу܅ eRFxaaѝ|ég #G ץc=3hk
cGLswї*soӧOOޥ7oNb,J>^PM4)2D~X] jE0,Ξ=;Co91)# Xn ~Ǔ$6bĈ2G$ H@$ H@$ .`>?GdIA.;3FG&g,KMd= Ų! ݡYCCC)G /zH38} 0rT };Å0MrWJu}rR n1a᩵[B-m
G$^vwϡ
;x$lٶ;.96,[4EZ}ODzOK1(vw =]^ _}~H"]Pˏ (3q$ - <~4Q E$." ڳK + xM^ا<2?G~<)uvvT$ H@$ H@$ H@ ,yyD GEଯO)sީ,Y~PL#2wyRyZ 2 !O_Ν;7ّvs86gѢEb~KKz1z7Yuj(SG
}ٍ[aaղEa3분FE6j<LiwhXq{8xhq!<+uÓ6uh6ki~Uq-ޠ\6LaaW~d)o]+o' ~里 ď%o馎2-ru
v
o>!͏'}utmyKP/q< #I,8p+ H@$ H@$ H@@y̱#=NV8weZF= 3;[1gOKs ǫ\s'#Qހ&mQ&EE,H L6'B'_hh
AP&vh7zT>cRȨ;zk> }QBoK8}A[)k"t Nge
O
[vzr 6`^hn<i#
'38a5ays ՝++T ?x`Ó_8> 8~r*W bT>9ùR~,F>O1 abS.J@$ H@$ H@$P s٣+Mg~ΝIe Mx"~q<@KٜEy9W+!i-Sюf 6gΜ$c6;zE!'} Y_}KTN<lyss_ӖcK kmE4z*s0 ZH;6:E9fDJQ##\녴(nڶ+!,Y.Җ/vkOg7m
{ l\߸U6njݛ6[~vR֕ԕ/pWʔk\ZNiޕ@˵Ujc H@$ H@$ H@#<;.Ɯ<"'[WZ#⁊'ٳ;8#X{]{Mfh5(M6.]mًMqs9hcʑȧ߹y\c ' 6' =hGq6z:'I47ҜOo](L:Gp=F0ˣ,b-;xƳaC\~.[<7ϥׇ#
'},c015i0PjK@߯ } ӡI@$ H@$ H@*N ڳ-
#r"|%!"8>vRY{DPB
xavHc}Yld.b+e˘>supkCxzm8ۂ=3gυ 13(V Q#(Ҷm;H Bz̍k&!
⚳^ =W.vBݽfho(~$ H@$ H@$ H@'ȊW,"!"fa#ʲ,&*.\i/ueAX\1:{آ8hѢC.e "+ݻ:#qI:^dQni Q %lHFIƅ{al6= #Ge C Dsxƾ59wqMڡaA}]Dɸv aC0~LX>̛=p<g3{L$ >H q}vI$ H@$ H@:L% 9r$ 'NH , )I85kV@o߾$!+"ƒD F,E>}zL&ehz9q<>$`Y /cDfz ۷oO"-/ul;mc73XxMל-zζlNn]8̘:9r :V, j+Ϟ|Tc\cvGbDOs^{fcϾ,aU<alX|a=#<g{Պmo H@ m;<<̙3'=n$ H@$ H@$0 T⹚WL㓅[0zf|!Y;|89Q#"愀zС$آ8˕n߳g&qyM\6xR<ƅw-4 ay' 8!#1,kN:)^0۪̌(zkL\H[Gω!cI{6m1tqcc{g7vӅl/54>z..Tx_gZwߥJzn;w a]܍bŊ( .'C
C˗/ f0G$ H@$ H`0@LE< 5jTSGīcB9;[DXCDe
q˞/-' ii\EXO{Iل3xbH/^$8P[nM9r@oq jO E,&O7GiS& Ξc(aM7#dtO^ /"mp F q\زsO_8;t01a^>̞5=q9[Yn uօ G o[ T>c)[zsM HXf̘.\@箒 $ H@$ H@ Ô0ĈIhEleތyFZbbG#v",!yy[EOUN&L$qI ^T^'ųƓrúx2&DdbbX OFكFȧdӣ({уvbdwS°(zzy<iXpswDפԆlF, ١UaRgW.[̜z -L /~!-ܒ ? ^< mܸ1))%1၄xPC oPo`u̙OHeD #acގ>6 wBYٲ X$b6)G{<,Ht<6$ H@$ H@$ @:ڲG+ެ̥!2WF9(d^<G >>sDleܜ u\\9,e8-}"1'-`q"2F֨e;ke 8b0uJ]Cm?F/ڦ xv=jDX<v/pMzipvkk.3ж
: Hx{;ė/|aj7ömRz* < >)/"-uVZn5kքM6%NАBÃ٭ޚ ֮] 8 |xXZzu 2C;?xzX⡉^!#ڜ4iR# 8ϛvϢ2u#H<J$b!>c x1 Fc:8a90 x@dɒ IcYrezK$ H@$ H@9sn8I03; $>Yn
b>B:aGcvO;טc^;{ <ە<ω,s2? }mslhmk &Z xfS8vDk 1,fLiQE-Md.-#t5gϜ
-%1皢|pBS9b8|U+W~H@ oy!p [;<I;H<4Ƀk"S|ᡆxۓ 1b0uZi{ͲC$5桇oQa ]ޤ7ڲm^hlEgk8 ; oxRDg}6=j9oۈψ˄D ytnѢE)C=[Z :y3I@$ H@$ H`NC漘ˎ1gΜ4w|\JG #cΌ$ݨObp`N:9qRn/ŖO^捹bK."-7ΓϼyR
5Emª ¬CxMZT)q勢Hלk)v~g\7U9_Ӳ}0&,7;^o_J@[)ڑ$p x@H$`CQEѐ}<@YO2< F"'yx!$ HCoy{'?IJ.>-S˛g$6(<|~Qvy;
63[uw/e<! #/<]aYO>`>a7 {<&AH> rX ބ~F M$ H@$ H@H6mZr 8{0cEN2׆CEgN9=;>sh!. ء nT+C$_n q5 czsO_ä_vg?]zHC{UKnԨqǟjքV.Ha;ӿ1# =v2۴-w(cYs6êkbִ-c9k7l¢OځzMhoh.!CÃF
\>9!nٲswygzK
nZat)t u͛f}_?l9Uywb>v+ ӟ4y2 7%?a
L<<-]tix^ %$1*ôZwuW; r/~/})w] `$X J0g\
ýEv$ H@$ H@@0$"dY 9DUR>G e;>ǥS(PzcSW8c07Ifq0 8۶Lm 7]{G-z. uӧq6yġω
'Ú(.75Ź 1p6Iqs }}ư.-.]47Ko\ht,@& rxW%f~5bf>ᆷ- &B+N- ᐷ%;^< k0,yB$ /a Lu}B&beM h Y`>#+v61b09t>G3 ut/ H@$ H@$N9">#?s^+הq3yٖ-YL[7Qmy6"펽D=iW.^q]t9*ƭa(!C¤rP_73z^a%CXeG8ZτMėE1#|m&KK@< B(" =DH>qlFb1*sŔ yRzry|PŹ\0r/o,Yq˳_qg&wV>"#fVە6$ H@$ H@`
)4ןEp/DQpXM|`ahij ynqߥOgo
sa'V,Msq^zHX=i[Z-¹)t#_ѓvTٗE
!1C@@Lk? Xn۶--tOzO=T@ wqG((Y%nB_|8ry/g/W<l%>fqY.Q>)w"T*z<|'^EԎ$ H@$ H@q gei|۵Y4r0q0i0"F 6}9&Z^
[⚹G禰svqayaaXMun 7jdX2nAÆ;R8E3Immi ˗ԇQ{ɜ@H
*: H`@7o^Xvm И i}XD=},,%1V^ ;X2uuuӝ;wٺ7 $W6"c Z֔DʱmNdiA4'Dlua0L=;c$s^HScӮ$ H@$ H@hAeCsU|3IFQ;,,a~k9*cg;W?GNǰG:abǏ הsfK pǎ- {ًϜ
{d$N_RC";$ \e˖5k$3]dIvӦMIE<`̙3'yh"=C,bO<[A6Rk^G7+R~GL
f=Ye|ɰy$".Xbf4L`EuvwĒwaܹn /"00]g9 H@$ H@$лWüN8EQ`kSvR(ro^>}H{sa羃m`
Ə
7/_ל w+ߖv|L]l~ 7-"-ۣ͖bق0Sj WL+%xie$ [5yMZ'6 Q9|p!Ύ*/x ¾} ;[}<HCunP C"P,9 D?ry.D^oi7e[wbS1a6zk?~|hhh(7gym@ [Vxի^q Y<iLs{W:aO`gDZJ֞$ H@$ H@,0מ$J
xTWǥJpBc(rQ߭+ |FEO۪vc$ʎ9<A hG6Gwc&xW-wk' HNӟ4<IDB x̾%/ K.x@${
>`HwQn +bK!)KÓ0|r< r>9?IX7:?Ɗ}\`qtM/P+j,|K=_ < ޜ s D_ݓ>nn'Ҷ$ H@$ H@@er1Iĩ8Xz%dt\ S|q}hik
vc$ȕK緋q~KߥQ#k&ms\Ƅv^d~X0wVKz}ӵ9*-)ح͗x
]]J` c"a11[g}Ώ|#7EƀxݻSiqƅ3g&!b ^?&LD u'@@J;#bu[s>!rء,#mS:&3^ѕH~P9W xg.穏x>B1lDy$.ϋ!xz-mJ@$ H@$ T :gϞ
[nMJ3ÖW_2L |sfl0
8fΊ.9np'r͙d{7҅83+
V+> :~x/
r0e*bk8q2l۵?LϙϿ3gυ'EgǕ.9Hߥ ߓdì
Uă6k
!M3{|qx,6 D!1 "->b_lzMI&'v 4? udv8CC]]]Z5w4,/C Y~gm<VJ1FRQ[[& H@$ H@$ H@7@V%ᣡj}ңWQy8jN vW;,
e+!}| kzT u|ek1ᒗ-O^I#|v(E(.5'ZYG@QlaIYy!=9+ պ:RQ۷= H@$ H@$ H@Mz0!
gcѓQmwH_]ǒc c:=*v$5 דp 0} =Q2-=kWh&. !:'wzbڔ@o?m~[a{9:
oBm?^Uk ̖a8,n;$ H@$ H@$ tN`hf>9GBh3Wܺi1ZaFtJE+iFzDE ]Q;dَ^ I? m{ |?қ#0ah[[YڡPm _ $ H@$ H@$ T ڰ`0wJ-o' K)ܕ{hS.#E㘑.q.-5 vfۢ Y<CkwH[E1jh Ų|hڥ?$ H@$ H@$ @6":7 _gm{;*/UZt. sn%0
HBmډS٪ty!jq(VU?J7I@$ H@$ H@$0(kوvv| Htv{=% Hhjj
[l
7ͷχӧOWιs3ghĉaݺuL
gϞ-krǎ a]1}KN<y]رca۶m&1qsaSnc$ H@$ H@z.I@DO|{
wyg:th&$N4)\_Ȕ {,o{[!$
.&g?ٰ~ַ5կNf\p!]>&fȑaԨQo߾| ̘1#<<?τ#F
'O~BbE>'üyooge ;vlXre_oVx ^p&c?~¸qʎÆ
8ϵ~sȑOM6w a G?Q{^^tt H@$ H@$ tB@0fK@:D@,
_?? Heuuukp''I [nD$ԩSNE?;w^J5k$Gb%g7|s:U1 u[[[^>_s
˖- /p[Ϋ(گZRL{
kM,s)__Ku̙駟N 6IC{ꩧ³>WAyʽ/No]+V?_ҵpM76 [0'w8fJgwԩgϞ
A{̘1#3^zux_}w4͛C}}}C?|p=/$ H@$ H@(tvp] H@ :GH?x#RĨ
6$1nKeC,
a<L GBx|nNZ<Bx>I)|ի^<@(8Jm'8o| h#/bˢ]-D9' [.qᵯ}%ެKƄPO}*Uް0{ӛ` _Xrg͚x N_-
O5b$,Ho~×(ɋ1vgҗC-5Ã!0E/J(-OXb<SaIx #sf~0ĸ =qRkN|O" cxEFڥ -:߱:V$ H@$ H@$@[Iڒ$ 0]%?D%V֢EBE^CB߾oL"wZl ovXxq>' ݣGvXyxix"P ѣlV&$2FD^9Y:DRƅ :nOw; <H Wʝ?e~[ց%2c rѢEɫx%#}Ke}0˂k^;G8ēs\9x x6vh ;8qb*9-^xZ ppS*t z(VO6C/g#|S`4կ~5ڙ
.-oyK@߄ƫKUg VExEC P>|x^|+_ K,I- >'~pHc$ H@$ H@$Pi:U$ H@=H>zjⱉIZti8Xhh|$!z!f!+w
!B#n!."d!^Q lɛۈ[.^zG$$qqڶ ǒgO<o=Ky^MH^▵I7nܘ;DY;Hk"Fn-%]wݕ[<- 2}͢jns0'uv:cG 팷)N6 u{]*yl#"$ð4QOڻi)">5}S.}MڜY^@PEԬx_rNxq̵G=uyI 1{$ƃO}Êz:|{?,{>@-'=̙Sii<$ H@$ H@@w(ve% H@7 a=ITxS\2fP|epFy_a9gdç-M>Ј ؖOO՜_%!B(B%'} 9!!P#D&G<5,!P~Oxc"W& 9S:&\;Ύq|Cpx#jE$/<nG(gFE<~Y 닠]` cW$"v:7*} o}[4?`IG(˿Lc<]Mmmo{[Z ׃\ 2;K5+\CAh~Lc'nofknۭ$ H@$ H@*A@! H@%NI^uSP#Hrh#x"PCF8k~ma/elCCE|-MyYfMrېq=9(k*$`ǧ%"/
Δ%y%#zeLcHR$M:5 WKؤ\3!vwfD۴M'"В(1أxL M<v} N ^<˱fe,\?
F EЅ?ۄ>"T3˿t*6l{qqG4ۙk#Z# \ޭ$ H@$ H@P$ H@lqΝI << Єg%%B. E Es IfԡZCM"r6 }$q1 Z ć\&oinS9<kĽRBcq3`IcDGt;>=/ xɄeܬ8E=5Hh]<? !v]KõuiA.ɇ'!|$q.֣ e8Ή5uO4ÿN~aʔ)Slq3&U^ g=ۢ 61fx"2ce/{YW\_|Fq ~0L7!k(®4>~ ]
+c$ H@$ H@@\>+U)ڑ$ H8H@Ѕ'b}|el% )ϥaCbKbE˯|+i}CI h*(-% ~6 /[*f]bLKסѰJX`<z iӦKsa0ECF{GR(i} Mܩzfͯ}kI\)F`FP-<gnjx 4!"lb 0҄MP(7 x"3b͙3g&1 !|,_
ܧ0!p u2b[E6O*, a_lp/ZlK }1I@$ H@$ Hh+IS[$ $pw#4-b'?$}KBƍQ%"ı(^x|~N"b x;?Hkt%ǫoDڡ<@ZSLЙ@5PJPvul}7 ʾoLxG|_$2fطgϞt ӵS>v'ݕɌP\#kHjc|q? K|>; s|6CkwQnS> 1^Dc<F6^w_ϵ9ų5/3p$ H@$ H@ [4Kor6 [xy@ >|t5h/gb$ H@l"*ޏ뿞D0 Y[Dd8)˹0B+ަzk@'VZF<=Ss KkJ*y˳&}DC>$x)ތx,v& J茧\R6$"=I ! Ncx'?I6-B"^΅s>wޙgl\}0E'B"Oݢl?H be\űN^wq^
r=Dc-dØup\Kb##ۣ<ו#܋0B0\f,.by H@$ H@@oW742!0_>$m?忕x!$r*]P-G< H@@ &'a\x(@@cÜ7%w6aϳT{oZ\^(_)a+Y&ޏӟtw
݄ GZMmR2{쎱߇ ;v$hK_SyRTlq5yM??&hj r۶m 5 <p vb\Y,w4/eK˔ 7Rcu $"rs>I`}_ Ə Ž'7cB|E.zG?J_G,/ )5F;x|V\kfޥׯ K@$ H@*g^Pf}c? ]1~ Hy97暈m T r Lsh$ F G E7</ [ s+) ^iA{^,7,V};Y<]vh3?炜cUƁ"!zປ_\Ű9-qQ1AKJgVPo6ѹ4aN<!^f oy[/ţ[#=w;|3 ַ >1 ;veG aiv(+` mÍQ"s+ԡ : ֭KЈҬ-r @ IDAT ka94x 绀m^mo{[zɀi y{^??%a룇sWEV$ H@$З7=/3dfncyc'ۀ
p y& d|ODL]%ZՆ$ H@D Q
lG#
އӧx䡁)?D?aB YyD4I6 f.6F$4-6 5>XlXJԥψDqZlD +w֭o}[0x{%.x:sͲhNy UZ*9thIhIexҏI <ޥvʋ\9f\ KYDSdÊ{&_b42ן=/"^C_%z SXN] '?Ź<u7OuyYo$ H@$ ]\W|8Vr:#Pmg͗$ A{M-B׃>''HD)B".ꕆ'FCX:q-&@!aJ~6<b+6s7Y',fwx{2 !Tߟ8"]Jo% hѢKYƙNJ 1}$>$m9Q!\/~1PvY EEe+VH,k2tf|+1 /&)ùWfDgΜ֮]<Y`Em=#㍝Pdl1 K_R^W0 ѣG!>l}W"T`>>}{Plg$ H@$0H俥K $w@N\v3h$ H@7 b {3qW$-၇iO+ arrl{/\+6sY} _l> .Baw=s2 iM_@Hbe C%x[2b#eLeDI,"`N J"(c~&|>hӛ
Z,7*᧹V\{ە*Wh7.k~Nb5"? x7+鮻JhEE$qz P x"r}+_Ic|?kUY֢eg6^ɥ*2 фiS:
& H@$ H@$ TmjO$CX0/}K@w*b ^a.!N!z!eE)B ^WuIʕ&D4EG/'. S!+<,!P"TS8\ G>T/xAD1G Iw &oN FHEh$]zp' ,O~2<66w?#Y&]?N<X KE$~&y,y hWM<W*5z, /kr=r }iӦu\c`uk6"7y|DlS0?nc9asÆ
ic^b;|=[n#\r.V$ H@$ H@&@[iړ$ g$+~_Ma\YXً P".t ?h}(b u4D CУ?x/ڢիWr\pa?Eya}ܳgO,_*T DܿB]?ORbZ.e.~*k-4;7%e ء ^\ $!of^H7
I>}.y"jN7S8k!_lem# ~xX#\⽋8 Z" rޣ ^xp=~i1>
Ȍa/Ξ=s⹚' #26-אu&[|m9\jF;5(O& H@$ H@$ TmjO$CrEBX?䥈$c G $"* !v8DS&)\/ \(I> Es FތE+9J.ڤe/*v`H JE8y>ń,DcOQ̠X}YhDGL@DD5SM k/|! r-<;A]:lpM 8ab7."yg }x&^c~Ö>W l>1vP}+~/b96>=gΜז: 83SI$ H@$ H@E$[
ڎ 8I?O<hmmI1#ČxZCSsVZBK,4!я~47v!tq3 Q VB #eA|9oQ>9TBel+@#rE[]'uN̎ ;$ ,Bti(˺wLݼ,b5e [Ä;9EdTD,`#]-qChEd ! rोM$[5 ޥ9ZÈًcT^_kllLޯx;NF/=ϺHÉcA_a$ H@$ Hw7'щ%1O|"<cofem~ٚc>ej:kqZffxsy& d a1~;vĥQ=n}WeG$ <(28?P=&;{Fw( DדMKؙMjY[.6Yߴ.3 .] gg}}ě/yG̽g[ś6\?l>\zû3$tcqt5ٶ[ H@$ H@$ ڞM H@@记ԙpu-ݻv- n(ڮng:V]I--.# űS=[ H@$ H@$ s{^iW$ H@$ H@$ H@ $@; /C$ H@$ H@$ H@&bUml .\aweGq'Z[%~YZZ[ZCkkpҖ[cE ;, H@$ H@$ H@
%P\ tc T\墶47f8:Ĩ;H[$[ @e6Bs9 ۖ$ H@$ H@$ H @8~t8ul0fT;ft? rڪ_8aذaaСa([t@Qn> lss|!l9f;UK$ H@$ H@$ H@@ZKF5lھ3ݰ3& V, gY%F< hMMBU刑#CMMMOW Ae?{28^j8755?$ H@$ H@$
7OwsrxyΗ-/=i/b:y=bY:+-?x6< ߪ!Uaa\[NUчȱ᩵©SasA,:ZTӧ뗷c<VFoA;bqX& H9+RѕyN$ H@$ H@:#p6=}a*E> ?~|3fLg;)pܹѴdI6 N**OY"^)]p! =z4E St\{АFqYbGck6'Y8]M v8aKcHi3gBKNcpy0n0::]En7~Yxlh3jd6e5ۿS=th\P*̙9rY$"-) cWT'wݔ$ H@$ H@$ H`@@p;vX =zt=ꮨݻS" De˖#G۷'Q.D ^ӦM ++Ç]v%1I cǎMu>w7dG*+6&z4Gy,Qׇ Mwlר:
ԵVňMaaxgL n^8:Ym斸b9w!4GNkW+{67pImw'yG(W
3MI|g;^يb~[9[K{C% H@$ H@$ H@$08 PՊ:2zHe)&'"mg LQi+JmO[ }ڲeKhllL4iRgCb8|Qo߾ut Qq'NM6qƕK+x^8!jl!̞5=X0TEЭIFݸmWxz0|Xm}P_73ܶzi7l
3N
#kQoN7 Ξ !ai2iB=_v:\9^aHlBK=sz7Jv*#ۄhH$ H@$ H@$ H@n ih6<]pa
1ާx"|N2%KP1" '"URxbƥɓˆLΝ;Ábqaƌ in~"q1!-ݸqcp3s̰gϞdq\&іqر#^:wl059vFpNx[TB/\h
6mlstՙ뒟ܺWꪰduNe(Ƶtc(w(ZeŢ0-WkB֬ls,eX>eR5
nvX$ H@$ H@$ H`xɲ+krvi mݰaCIRg͚Z_9`*O&`W䅋x"#" #{YKr #( . A R_M9Z1 +sWt9y>aKHυ脛D҆˧EA*̞1-=j9QSsuj{qcG% c'U{ic%a鳜
֜qQ=v2 x͚1%,[7 Y^A7M9I@$ H@$ H@$ DNB #p ("!l"?~x
s"/BkQ W.+%DT֯E;wn!i?{ruiG?'L>,QDbD2?\[<!v.^b5Ó1D#´]5]|u!Ls[\og7Qd
Q9p8{իF]@mxaM=~Eq6
q}ݺ(rIu~dKc[A ^J@$ H@$ H@$ N Q,"!rr ZB#r |HCuI-eM־Eܜ9s.)-)Jf+xϲ>-ur9O}?Y8| ߺ3<ל=}^ϥ}eL F
o;_=4ϝ aZ) 9z"6Җ=QM+5i%0; O=948K{Xܺ Hm=-J@$ H@$ H@$ F !!5f
WL<N9OB ={v;Gؤ,b'ĉpXʺxrnʕ ޫ˚iƔmm˺xDS kkd2y\5fMvgzN-gY E+Q#]43cѫvƻpi0u=5Q`>$~V ̚n& >x/WE6% H@$ H@$ H@z (k"z"[.y6+ GC<^|DQ)Sr|<lYCԩSuf a=U"#=ZLH9-*,bkccc?xWe<rnݚk
oܧ@+[w'rl[g8[naG{hN~Eq}MQ=㚴Qݽ`r] x=ƚ6
5ԍﭫ8=܋}h{mH@$ H@$ H@$ ^ xG3f$SUDNOY^xh8ZLR\6lkCCCkɓ''L+oe\#FHb0YM?S|s k#[=myi ^hNXx~/ijgMkU\[vK8|!kt)7{Tchl#kla,fkk@;$ H@$ H@$ H`@$iӒJ>"(:sB4)-^$lyϼl.y"R䗦\/Cݲ%/uSH^<s Lb x
>F]v?n Z-ú
[Ƴ2q6"G\`vXtQl;EDFC¢ys=i0[S]fQC^nk8xX q钤$3lXM?gFXdA4فhud$ H@$ H@$ 2"&TۓoEݿ
<f̘P SO}֙E<_7.Ps<^x[N$%/# ;v,E^dIZ6[Dc֦}'S?VZQ {{MƎ ! iH :m N]s- ^ 㚳7-kg v ê]x595^в% k8<i0rSMF!w(N,UI$ H@$ H@$ zȑm) 1.&ewܙP\s!v۶mA/U#+K-][ֿ-=K[7oNb*zĉ'E &WaȞ{ |#ajbxN7*L21"Cl9,7\ F
b(i[DH~I <@ gΘעR i;:S,cVI$ H@$ H@$ lj]n]N 8HT<X):uuuaӦMI%1acHZ&qmiyg85͙Uٮvv-\]`Tm
/
x/l/8 5ݰ6RifRIq9~:|WIy;{ι ҖÅ
X$F6YIΝ cC#d>z9/X=ڴ_ ho]0wKg%ɑ=͑7\Ⱦ > ,c#waqɞ<{a
%Q3=jOD@D@D@D@D@D@D@D@D@D@D@ ҵ!?E"+RAJ5K,0w-###!:6=sutt4qHR6Q b!EN.WQ7j&cGZ垞mkl c3ٰv泋~
ȥf-:lMUo=^!;2nyb}nk|qo.KGAҺ=^'r)rAWuy{!ͅ
o{'|psW$&ҕHY beQNt* >!=E"hُe_/b^ʕ+9u d[D"Q&wjP'a;翲nS.6'&w7 =g/9˼/ښ*g{j}}Þ< r(c,175ںx`zV]?}<!hcvJ8m*/qvlm6g,477~reFuYuY)KVT7`vq(/ol䋃/AK-" " " " " " " " " " ' ԑQ;1'ǼS4䱹Xm.SOAr^ l,s~ Zzv}; iMy 79qlbfv+2:{:HťemO=.왧AF}q57*k\do#msnO? ˮE
xv*l/n5mVgn-~r>aZCD& mp}^nC5ʓ'OBps~xX&O~|y
=g}Cz=qo=NyъڃG#VZ뷮 [#`ܧ 9{TR\.g][
6-;~>.iYKs<[8+c\C[ i綹'%#\3k̂e5;l&+m,UQ9f 4 m||<Lom /Ub~xrׇ?dR/gؾ&OrՓ. 'N{,fqP~)Ԗ!kk>촇 mmfO_MzZwFѭ 1{dHk<M
ŕ[9rS3~鼟 |Rh ;?FҮz\f`]f B9o,Zf쮭SOxb95Uh%f5M~+-˾y.S +0fӖWY YxX"@c;E&FNMMᙔHS$( qL $kGz1|HUbBAtIDDx͂hΝ;!6ɻr?}^xqo&pB]D@D@D@D@D@D@D@D@D@D@D@N:Q z klSՕ!..q tΐƈy?_ie%~ 8@P`giwznkN5Ow<}}EkiB&N\9Oa6eo٦7jZ4e++[snM_\EDm|`ayuYZR%ÄtD|"_z-[24F^|ؼ] ҕERH ; @ >|ܜw%r]]]lKA{Q3d |ԋVj"u<F"_cv8Z1<)w8yυ q;63;bK<rG9y$i4c?yv!;f+;* 7{Jb(3C슭sʖ[IE+;sݬGѺ i]³_ Yoi$8eٙ
K:#RHDK&^,IIENNn(.jkkC|Xi X}߽{7X' f܂%17y >d@AlcnܸasssZ"PgvsvgMN؝_^` W\XEy
t 38M[]۰cVUYf_^hUk8o;قvSO>Vī<u|塚oذѱ3#x Y!T%g?sE_m`E}f?Xiy+ɅQE5K'ʤt%}a?ѧD<::v}}}Q/w}/8酛<9t0 p{8 gvUb$ϧ ;Uc=]glRkokW
{dݚ?m=Z;Vnos[v3\ArpsްtDΞ,)tso4kÿtAJlZQu,nÿҴmLwd))v)ɇr|D>~8Dٲ # <yd&ۈ%ԩSyg GB ڤB:icY,X
GÖ́D#Z{=ND@D@D@D@D@D@D@D@D@D@D gDUUUor)97ʊr;)kw=%rrBvw{M=0ϯ3- mLA}X{04>+Ƭ~j7W/]_}J*=mrieoG~sچGxT]GAF:ܹYcˈPRG'`3-w]h-Y-#LI QqeDnTs^ݭp#a^ơ"" " " " " " " " " " JgGGaZmSNj lmm#V=&ѧ!nmzEl {C+Q Ir&}Rᑴg%o6igۚԱ<fwv, W]xa5Kyᒖ @Φ w[z֏Y~EL+1Roo2 Z͕i>j[-U(ڷϿ$%1Ҕ9_
YI^r,27ik+u_H"L?nd rwz'mw}g/Bh_:^0 8u~1j {r$6v[泼vj=NGvy:tVrv@ASUIGj3+t^|ۦGǦ<Mo({==q)Okٹ!6;7j- =ï gϞƮ^-w'B%ݾ8(ѸZa?w\n}nuho||rLG;E@D@D@D@D@D@D@D@D@D@v!qFR, "Jmmk
6=3o+S fR-:;Z]Vmx-j w
#nh~ā b OQ좵Ҥ .UbZ#3}>P;aGryDGf< r֣hmمp / r%&
9ONuImL{˷ kdd$Dƾ ۶6kjj*JxF2¹mSxxx u hW>}*Lsp8
|N |-X F3]YYn-do* Dڪ}t84-- 憧7_ 0l7. B"*<ʶ^k V!#hsO`_ 'u/QWR[[* ?Bz䙙Um]ܡP&|[ '&&$hw" " " " " " " " " " y Ĵ ?m93𝞡mPE=;JKR>Wk]x Xr,<A63x#<>'l)lOm/-ѷ%筬,]ɤ±禍n73!۵aX"PwjR?6 8eEE]x1^YYc{QR7Aσevv`u." " " " " " " " " " @Lk%ٟYGGGx~-{}W@ ڐCZ |'Rz| S&rOnXf]1XeG=eCR9%=%2mE
V rcn[*guu5}; ''' <1_Bn ?DjRkg/hYBTn,}D-~m1ܶ." " " " " " " " " "Pr_eHo3_wwo_|#Nd
ڷ!W疥}kgbŅ+բ˄u啣r]n:;"Q.//-..Z__;7(# Bj}}mD0oA2+/v fڍp)pUUU 2W|1>2ks Sf2Wn=${Nʏ9>-" " " " " " " )w_E<ok7"iO$<VOӡs#p2-szt+bv#c=XpK.MKm3s!2<! ƍb͞ZKnd((v D #͛7sZ*3NN2zsssA+7== ~w^kOd0[ZZύ#?nϟm%" GG{I~=C߷_iϞ=|AvvvtgΜ3p8H'Iqe)sϦH=sKT n닖BԺM{)<G¾x"tX X]] #0BAȌ6,24J]ưSk '?_TpNw 28w?c|%
Hn8F 344Xt E@D ~P¼;ǡE@D@D@D@D@D@D@DS'c#'?߷ɓ'at i˔|<8H'O"b<MnEY}>lnåG `\[Y+Ȣ@$rT<g!E"HdĄMMMt ?D랴|ɾʷ?m[ Yk?QYYYe[&bcpp0ڇ ~i
Q ?+WrIe8j^R scQ" " " " " " " ")yvWWWx^ ̔ ޑd|UIm}2C6 L?
ѳF˦+<uٲVB$A
ͬe^ѹ
L)Yw="rS&ͻP)2}QD"n}vBgc/Pwb5_,>Ɣol#1Xui.2(4.b ]pIwLƤm" "p?{H%wIڣ
KD@D@D@D@D@D@D@~$3g<[gDl:NWv 8 'Oк8et]<eftj¾f7gƙmI]z J5OmCP
ypҥ j={$ /{ɡYD遉FeS8 )\7&ڤB u#r;cx'4UD pb^m~a"" " " " " " " "p|ܙ !#+fggI%p-&YRH5͖lsi6& ZiuG" uvqNaۦaL ^TMw |Gě
E~rr2Y`%/ic-===An]<gWdRh{nBc˭:р|I"6D1y9cEfJp<i)IOD@ ? Ϗp.yG9%" " " " " " " "3[^Od
ZDky6sOq<mrO[٦A{\Ua=Qݝjv~ѳ3 뙓-Bȍ )˼<G.K kQƇ縡!#6eG[9Y-4.%M0Sa?%یHBc;672hטqKT.빅klc6a"." &ϽǼ
[D@D@D@D@D@D@D@D@D@>.)h0+qA]͑͵[ mKږuq]R%VrkƲVk0,7^_ZvfYI_
B ySID62_-X$(yE13 iP;#Dr
D*Q9ܹHQƳSm& ) ߿ 6?l¹ИGn|vGC" " " " " " " " " " " " "hAkr+=}ٲ8G.?Z*b*+Rꭤ+ Wv6gGlmז rvi+;sRU^ m ((,9|7Hle ىݷӐb]ER1ԄW *'8^$6v.t@1N$Nç=gde8h'[В┕6W|.im#iK'EKwx:| aoL~g2X9l<E#[g ]kYǴSvx.D(}@J>A[Ng~)Td\RbdZ؝ Y*WWWCv˘2NHS\'7Sy8co [Jedmm\_ɻ &+aSgڣEKH =%rvm̍-TɳfnF.u;K7<~9x9{PP툀@ Ѹ9D"eWlؖ9G,m^*"$pE!hi
1z OsZ܋^IUQ]ۗ}TY4[iז9FB-I PVVGdJA
L#g)1z6-wsAjXUUU`bwn3~G}TZ2J*<ݱ%=c٩G>m.Nffţc]ĆT[|nڔߐ*TZ7ȵ&" " " " " " " " " " " G t eY5Jٸq^|g[1\6| T) AxlI]=quO]<v{D-˙58jm[yclT oNd4㪈 $PH~OQCK-j*Uҵ>XɦGBE҆V %f ϛ $@4_yNvI,noӂ <Z>$eq $" " " " " " " " " " " " "Pn6ۢƤ' A Ղ8^(J @ IDAT쉀0|8 gD@D@D@D@D@D@D@D@D@D@D@D@D@D`O$hID@D@D@D@D@D@D@D@D@D@D@D@D@D H~8C " " " " " " " " " " " " " {" A'L$" " " " " " " " " " " " '@*ur^l#-+M[[߰|| |R ⊀Wؼb#/mf~N75XV(+GkEAU{" " " " " " " " " " " " "L&Ҕ9mv{mlfm@UT[!JAw aG.E@D@D@D@D@D@D@D@D@D@D@D r_3 (ߨ[|嫛^veyuFG'mrfβ̾WN3~ڏn OҒ
UOoJlna =Rr"i Dn7[[_?*dr|i h|
d| MٞFb *" " " " " " " " " " !@4̌Ά*++1\Vlѣ/.X^^n
bi<x+ XorEI{UUUv̙ UTTXsssc=h٘o-ثIG.ye%VQY-immJJJ.t{OغO_pi;26agۚ_gfK?u%uI= 1 e$z Z e?HneucKnM_-,^
%ƺe|}cÏ˰/M2^w똣 8yDd"Ƣ<E"3 -tf666f/^+h_|E > 5یbIxi +O62251 b{{{=ò G /c谞ws\߳~s!ҵ[[B=ۦK!"n皽UW٠K{5إMKozt~e. 3sv{= u^iލ
tOrM6U@#~w9C}`i.-!\~vPNM KuidpdҖqQ[7E}$rI/ n*" " " " " " " " " " "P ⒨V"L---VWW"*HZSޒIE"Wڂ,MԯLrE& rvee^~ 6lgA˸+/U f D>{,lg iKD|2>{N!^lɮ]wVs <gõw9{C{؊G~~] 똲~fzZMM #sS4߾8D{0̺l3|fvj#_p9;Ć =U ݺ9e|UV|I{`hQ_a]>Yo*?b _YDl~u;i \MAV7F!!-MMM '6&*X"aَ\eTOmcJdP֤9>il^"k)E ^EJ"XL&ʖvf" G,,s K$-Ѻl?I%f!Y9^I{9ژu}Qw <q1kl6{iyu Inc=vn!W356xVW(.UG iX
Z.QV")6o߄ND@D@D@D@D@D@D@D@D@D@ދ Ϥ۲G*V^UPsv"oiYDpPꍏ^"gĴ1>EynYFs<}06֗|TE(63R7FEK˕q/Rߺ ]'[Y[=.عޮ!YCC]]qLǷ%kO{ М ?rG z4⑳.gd( 9\ee ?F[.h?IO |Eb3`Db (;o߾ H-Lƶ|H7L__diK _!YxE V Slx!eqp|nx|13Ma[Y}NWQ; moqޮx \֦z꠫ؔ[3eiO}#<uwM\Dže4 _ k嫞E-"A[ WQ " " " " " " " " " " " ΅E&ѪRIa %ioooQ]4>1.mE&BKD?>HT{qE+16foKme2eK_
,繸h?{h=%4NY QZ[:ާW10>{K#/]mjf~R.O[)Ѱ^gyy%4Mfڅ얜+*9 Z(@@|"+A"O S#ӨK`y!<c:a%
A#caXG;B>ٳ ^植%_!x_z"pmgΜ ǰ ?~l]]- b<!_8G.gcZc9i/xz-!SWH. Q#/s*hׯg](?I5{i? v%g ƃv\wYK N
!DaJ4'O(EFȐGG10BZʜw
ʶ(Yy
7 Ŷ SojjFFFlff&Z cA"3^}KnLi ύ۽[h<'aٛw ӌOְYkR8V8
>\`Hk<쑴s_SS3>'[H啵xyeY^<cϻ 27X%hJ<D@D@D@D@D@D@D@D@D@D@D@>y" ;>>8 ,mccvZcd /E"l'&&B㉰E|D"RO>
qvttD/3.E<#re "m1[O^.-OkX v9ѫjyYGӾ-tק%G##l#ad / ˖HkL:*r味)ga-A{8)" " " " " " " " " " " 24AKz`E"8N`) fB4FFQ;c{-T1,s rv}}=p<bgHY2T`EϦ- g_;.sAΖ<YDjw ZYi ƆSG)b
EOٳᗖMyc+ =} m5!1rj¸%NF6C" " " " " " " " " " " "p *D`s":s6WD(xx}pp0 *(]a mKa"Z [h\.s_<6J(j֭[A _z5uDS%h%{>6QLNyZ.>3r27 VV^NsXN8Iw\n;v1:i+m|]ƕş?R" " " " " " " " " " " "p $,TD2o,b]XX2D"y={+Ƭ#cYoiiْs"Yi3Yk?Ի~ܹsa\KѣGcʌ&6ϟs<q.-EhnZ.Oq8,i[KG2[r6RgQ/q]㩨M/Yu>lEEyrs.KՉ|jaVD,(-|=}tDZDJ Q
<! hp6W& yqz|>p>Kf d99KcN}vOG;/{)᧷l vZ[]iyZu\Γ蟏OG|ܗ,Y[\;£g;[u/k[6лp0"f;;;#HN$& _WR#\- aI#<== "[~"Yi7)~ rM
i|ҥ/Q דr9 Y 6y^~s;I#ًW6:>a |y߮^siW 6ܼ<&{ e<ahi?7J2Y~=c7nyzm1]M'O $Ze"eBE,#8(9_čhq=Ga!?dvn>yL0)ɸc
; kemfmqSD?x[juŁ^+MXIi=vr붴jw} = rvs?*=s:DmN؆KکVޮv+uV$h|D@D@D@D@D@D@D@D@D@D@D@>y1^(f IL#@1u@ r^
S7w:6Ye)V\/wܢ--Z\qy\=v|/۱\c"gIk<|L|O]uHg/C$gsHYIk ?iչ HܺG6MxT⊥<o:ҽ,mszj\Z EOA}{VVW<U1?0r< j ]|PhgwgC$kv.מ(AgT(" " " " " " " " " " " " GEo]]3sVPktk5ZuMTV ;9K,rΐ9Uݒ.c{jf5[c͍>n aݬe\ԚM Y<1"%hoH ԣfzZC)ro7g.=7ycZG#oYKm9|z<rb^Y[ʅ[ ǣc>' $9咶:Z4V?jZD@D@D@D@D@D@D@D@D@D@D@D@ޗ@MUww)k HR,/,zZ㡧.gGzZcW味=r`_HioH-Azxt,DzPM{f}= ay\K h " " " " " " " " " " " " " o`Vs{ɚnqyŦ\.>d( }=!q|r6A͍I槌ݴK; DzQG+AE@D@D@D@D@D@D@D@D@D@D@D@D@M
uvqN77ي2˃=!6ָPz”mk1Dfyyv VUY-qۮh<" " " " " " " " " " " " $%.;C,ĝ}f >&2+~@&yXa%vy)
9iK," " " " " " " " " " " " GAԿ+6>9m%L6celݦJJRyjk#^]ξɸ9iS gl ;"A{!@luVg/lbz-Xc)ÇY Ipetɩ=O\ft5{5ml 2m-gljj?Hi$ fi zApW" " " " " " " " " " " " :% WuzH-\*+es1)A[WW&" " " " " " " " " " " "p Yyy!Ç܅ =aR%8< 2_J- a46E@D@D@D@D@D@D@D@D@D@D@D@D@D@% A.mC! A{(XըK@]&"" " " " " " " " " " " " " BPZUEO Ju k82$"" " " " " " " " " " " " H@~/--!<yX:G!;??ol6 ǰS >cT01nƜ~ve2=nKӲ# A{G 11{={u vd"q٭[lee%/myyˍHݣ566fn---o]Ow||&''mmmJKKFo E@D]?X"ѳD"f)#<Qw|X.%%%A#h N
Z"߿ eK ێzOD@D@D@D@D@D@D@D@D@D@D@D`H O( I bhV"
)9u^di ڭ~_Dɾ|cᘃ,О
ѳCvww۩S%5sLw{E@D@D@D@D@D@D@D@D@D@D@D@N ړsH3VNMM/^)
633!-뭣4ϟ?+&rhSgφ>vAbbL K[aܹDz?kf io<r:"!{ƍؖv 3Mgg9s&ԫ璔{_D@D@D@D@D@D@D@D@D@D@D@D@ u=hR'Rh ]CVVV Q~"]c4,=|6DR_p!SrAbJ`ڏ"IX#YϜ7oW^-~ؽ,_UU
!N 8eY"yIbZI@d^2j!ѳQz TMhD|ƂTb9YVV֑XyIX /Gb>}H]B10iٖ,9Y=ΙHa
2{0vf[, @<'gͬee㶸 c?
~
s'ayŢa#_yE "hTnZD"nso|hOŋ!ÇCD+ 17ҘhY/$-ѱIqhK
ks !Ea(#1$64\h]D@D@D@D@D@D@D@D@D@D@x3e
ϛeϥ C羳 y Y$yND={?*M \5 7b#GA1O+B(Z/HW"5T~ pnԧLTl`m.Be_
"X#wy/E;5>," " " " " " " " " " ǝ Ϲó|x;6
ȤeǓxl+nLE6H?E>C;/R~pqWL*3yƟ#y=nv',7Cd-m#RF|Q?Dن=n,1Kd;R ϵ|TD@D@D@D@D@D@D@D@D@D@D I<K&ȉ{Y8d;l-^,{I2˟yu=;σA^"m0bA2I8::6V3* pЛ@s<Q'?v>^xWrF`NF"#<~a ԗ'su!>_?#E" Ai]:[ sIYO
MĄuww;D:]K+ѱ|X AI}"[GNq| 1y!6^zNm7NfH_aǴ pMIAy tCQ" " " " " " " " " " ' cvz
= ڢ ~D"7yU__oHQdӧOCd-/mɉd?HƑ O|Qq(ɓ tʴK}֩Oda.P|gϞs #Coݺމ cO}˜c'3ׁl=1}' A{LEKHD"S[ZZB'*˗A"aǏ ch+X#6
PA>| %QɂDܲ K{eC51 e|ǗwGd1,xp!"k@ M`˰s Bsrrr;z5
ZDBh"h<R# .ϝ;8e?QN__}Cӳ&u؎0&B6vʛ|O,b l;suuu䩩 Y1*" " " " " " " " " " " " '"hO;#6Ϟ=kmmmR3 (? b X%1i}I6i4ʔ[SSGꫯD([=uTog|˜_v;(hrJQ80VDًFJ6һL' 騣h"#XXF.W,lOۑIjM$o,h<32FΑW /}ed2q>\{PcR;" " " " " " " " " "W< x-NRL8L;!>(
Eq$4ܭESdԧnwڿӾd_,n]uGE@D@D@D@D@D@D@D@D@D ~&,nmC|
Jū fG66 z'I'.[email protected]: "_ D55/8"" " " " " " " " " vߙ22[sOќϺ.ti%d|]h.z A{?>`.uE9cD~ƿt(ɴa8| 5/S.i1 i?8wcz9XYbaZA{.t'
3*_1UníT[{/" " " " " " " " " " dc/Fllcf}gմG/Y?JC-?
.jc$_j0h?hMTE`b6 8 s?}m9[UmٺM;2<@]٦,/Xznt˝?K-,Zտm[t[ M8)@rښUU[Eyy\}r K G%d|X6Sm=c_ثC[uA4uYB[QyK ,O=}d{|n/惻P`l67ѳ|r|'.d39n
=kkmKz6֏VW" " " " " " " " " " "p lYQ6Uis5aa)SyWyOeexnОn =`ىq[^YrlA[ZZkQ~k R/wcl?Ywzq~gaye"[aQ^^f6=3g7?ĴԌ-,7/ZCo/,k#4I#A{R)" " " " " " " " " " M^6i[U"i׃AFar,QuNHԦO{,\Z/u)iW+s{AՐ2~:0um^oܻƱrsL7
]yc>>Ob_XثOO.s.zhMSiKScVWSe]9RbOp?csdV퇈4.}e2PW[}|! !?9I5$" " " " " " " " " " "P.2YpirY DB'$6]*_WyX]nlؚGZJX/;cqqў?n
N>m
F?655Х횚촹9 q\ԏnwXobb"WDkuu={۷4ϑ{uh%a2G[p aV^Vϱl](B 9;;QTg|v~{Mwi#cSL6 K?G'Sk]:gU.i(?_b_^`u|.}.Vg" " " " " " " " " " "p| EU2͍OEVUUy #zf
zZ>߯ p,2vKKKŋ f\#$(i ^w799oE[GGG/_ c{uy啧Dw/Y+Fe#by!/^D1csq~ uڵ'i3~]g|Tz:B_4r{.qb|¾Jne.9]{9d몭캋z`\MN}q킏rrscbl*<}3Q] igVoED ~)2_cLavi>*" " " " " " " " " "px>Y2E(Bj{aG-~9xv̋z;]x<ϠgffB$*===&Hڱ-PM'AjD"sP/ְ/9IO伈ES/D?c%ӧŸ r?00zr:ƶSUl.h5_.<_ܸrtJ"Ϭ-ww]xzJs3ީvjRZO166>>kxxK˂:q"~O4`Zjjjzg/Hvl(ʈ:|y:u*C}2"J~ɝh!"k9"2y!xKIL96ja"rgn=lB:(Gy66df|3jE"Eig "7M; !ԧW^m?+]"`yNPU__v-10&,iisݻw8q u?pN$ 3ʣNoܱW7ID÷?Ͼn mOVsњ5>s٦gl??|WVgk[
9<œSG>qnn<tk wa & #N _b/o&|,//ٳˢ*T_~ ˗_L\Iv|.]|>%ė#6KFED@D@D@D@D@D@D@D@D@@ʟU-3K/-/?M"lNGQt+ϢyL!kƳj"d)<w~ax U\q'Q,>Ƕ\ȱO< AHgΜ szH_Rq$+dڊca<#Җu "!ESbGx ז*ٺH #c.E~Ukmn,\jOc|@7>UOoLaۻ.i>ϯ\|\O"g~!ikr=?#a#A{B/q E{n`t._|ʕWe6vvhz.\!_*" " " " " " " " " "12b|@0FFqq#=d;ϩd3lm#L;;;ëjO%[єAGX<%-㘨Go #IRg[?nc 9 (g `iI̍#Y砖sGҮ/
R!vy:8sI+ct9{}{1* >sM
aq&TڑX'O]' Fl睛 `va=.%Pl_" " " " " " " " " " " Uh3i)Ϝy #RG@<f 66J>z(DrL5ϼϼ,}qQReziF 3>,ѵD6
cd\ԏO=+9{ocS mk==3>d_vN77n_bØW5{
HڡGan܋{}N0yy
T6͍uܵ}9Q$h8_"#)dȫ*DT`N#c\ yHS$'"9\)HY2"c$pg{=
VR3Hmjj
qJ-utt#Ji !K~o}D>~80&
l?&ʖ<HYƍ4f@ x܊ZG_MگRYki {_^VOm CV JYn}lˤkb?{dkv/-w,29]H :bu " " " " " " " " " "pTK"DslFytT ~s6t">lybv+{1h y2C~ǻwrO]O.[E$%kDF %ҔB=SHU;w.},e:533mhA|2 DlX/60ٳgzYc벘~ϣ/>e|W-,g:ښ+EÉ9>u8HnN. gn=7veu? x0v䬏_:iOkzc=k[)+ 8x8"* Iʏ`B\#x4d
o9+w!CԞO"Mqİ?{?/X{S+ɼXqEga'9 - 90w,WJ >[ epn: A8%Ɣd]_z5D" 㡯w? q]q}ƹ=q痭ѯ\sd454u:|EI _:4s.zc
<y s [yh,'}Z#" " " " " " " " " " C لB:IdT<^On1ю:7 mq#e
v 7bmi}{^/_[MEٻu?p o||<#|oGMK`mL5LwĿE
`YFIgTMFmicrO'-/:<< v,KQRzAEY˜Ŝ9>1mmuIiK,r+>lc`G4׳}{ٖ6U˞C.~j\_>#[^ےAҽ#MlS}ymк:Hk> j^mߑ b7x#
9~a QFD@D@D@D@D@D@D@D@D#@ yb
bPDWgD rzs<i T*QF{+ |n܂tC"Ṷ11鿑<;Gd"hC"_D2W-GlCv#r<}O!ʕX3z겍xx
!vi}<8~Γ1uX8R!.Js
sZz+rr6ϒ U tӪ*lpV<c[J8rq,p؋]!7NRpDw+ˇ(ƽۡL
& ݎ~Gg( Urvo0gD #\{-<}26o3KVi;V؊G.ޘ<Z4~ F <#g\W\k |iG+ѩG~Il]ZZ
c>/U ?$orJxO.m0,Gs )E?|0SuȘIZ|>=h_]hqצgޜGhiki}>Fqd~<Ƭo[s[QQ[ޮ1|}J &"l:t܈%̵kMt8_T7w 7na($\v֭p#W6䡧 };Pi]D@D@D@D@D@D@D@D@D }GІ xƋ^mx36jUu5{3EXzs YIpוRs})[ל}D2N>Fv$/Z?sy8
No9_m800 ss&ڗ / =Y%:kWS3olkv2njBvݸ5d=߲ľ-P| Yʷ_4>wmQ8#A{/a
*7B&&A}'L&Md=/Z Qc{ɺQrMn8ڥ$
y˟{Ipͷ̍˗ǩl!Y> =Ss:趕ՌyE,YG$w]XgD @ IDAT ̳pN<:#/Y3|@,
[҉]XX<[|=G={: C$Op,~rj˔,ycbRb0 ؑ㾖o>l gNOlѵNzg=l ܯJCT{(//ڝOcӮ5U.ܽn1 bpN(* xetMc?mj#% C4,_S6qěl\OY oLDN.X13 n}zb"spd*Rg< dAR?>;Y{<>>y֞t߭Pb] /c'2Xr;ѥ3 qQ;_^$ |S=} >t{2;]Ύncߘ֟=uZ+[?XX\Z -\⟕+3"+ tNc9rKv
QƖoH .lG7 7χtƱG l#.s yɡO/cc!iK"w8zߧq^9c[s >Wh}y_{lg{kp2MzMNwK9&umgYddKl;ߐ JKsBPT UM^Q)^At5P@f$IwGYd5-#H:G{k^{kϷVQvڶ-%M+ ˇO`ٕGNEymV%mM<_m* A_0/lLst.!O簘E\%tLM|(#Eey?84
S0P80J:_e&/" " " " " " " " " " " A b]t9!#q]֪UA
a٢(b朦g_:bwOgjmyi۶oV7'! t*=6I{"h݊JÍcy(x27='+L5+m!bÞ y(zСpҥT8K600[GEPƒ:be(\{z#Vc)
m$/I|XFN08<lQ'0ڰ 2{iIX0O,% ^ZKA
.u
uqj榍 sAz -=/ A
DTo fANHy<pYmDB?{l-g3 Ǣէ2VbN9: 6+<X <֭[ɬe닜#",6~ʕ=+,a6ְ%ʩESrfav.{ycx.Ng> VD@D@D@D@D@D@D@D@D@D@V 0A(
"gl;C3%G}e 04ڸl-iub ۚm8$Ca_22S:0- NKK P sҢ" (uիWa:UF Coڵ Pۑ#G{(n t۶m5iIC%Oc9 z ta1yC;x)윚j,1D^;|pChLi/SB۷/5(@@c`&ձtL?|u{>Lkya8[[D5gC~VUQnwM΄z(AH%3LjaIoA_ ?¢X+X""""b݉c;Fu]SjUUUp\|# p0?v 1{/6S?@8ˆ~@Oh?)z{S9;w.LZֽ8-u
"_Dqy9X! = 3{SN"^9.,zGe-.*#7 Z-6gw6#̽-i zA_yIHAj-I]WqB'Կ8Z@r â5#OTI&9ukM%Ƀ.2<Gb2u eGݹsmmmSx<]@fϔ;vsL= =zʹheL [dS'\'0|\(3Ȳ%EA
c#a utl%2\ZF(
bsI"0-Af;tYgvb}vL4tiSV!v-6fw=vJˊm ֶ)7仓@Wp78Vln %(b&-aXb oqn<#S']R$ӧOG!70K <=.rG|D o}Ry[X,i2+2. Y&2ԗ-J'" " " " " " " " + c ?~ܚR c~ <x~'~bjfx 3
oxC/]PYjjW٥a B{[-7ڷ]U5+3?gׇG*ivڧB r"lIh wQzu۵*ZuUm˦)L+@[5g~FY8V2x+ 7?"=Sbщ-!ǬCTįnXJ*n!9ڵElsSS#d"xR6bJR CMcʅa W6ڍKrX+;Vr" " " " " " " " " Og}~^W U1ӏ/ږ-[fh|'[8q~w~'k>3կ~5&
1F[KKK2x*Jݏ?ž~ kNھ5T_ajʣ`؎A`9:nk~] KمԤ îw [Wްw}- ft,ggL"0pX.s>AgK5s?`7ÏJ,K&yFjVǵb'9TKڽm[Ϝ ^hsޕM{K
FI9
#."p#5a@r^zxXvb P -&S2ɏ/\YMɓ_*0 <}̙,#2S@?#Nȭ}=y" " " " " " " " " Cq[VngWWA3e9Çݻm߾}Vlڵ|N<i_WG u1|3q !~P---'HeDQv,LeCZ<Lm<n (;?d߳.8{#Ů
ܚxrZ072H,Bmuy1luYI,'0̓A0h
uVVRl.مm!SОd v9luuXth2ȓݧ,-_@uU>< O܊|xxG]eY>h\p2 a=R?R|x L|СhJ|@
v\%|4 7lǽ|Ύsl^goF@c)}QDhzի `}.5$rgcň } ۿh˸(cCőO3+3
ekͪ2۶҆F/űʲ(dWXv.\a Gƨ=_?Ю;هޱ7Zb!teA
CǛ G;Tg,_{>Wn# ׅ K3?6fNJ?¶67Cҙ#fL6l敥; F2!E )h#bHÀ+q!`qWH>$@ź0?PO!P%i ,w4q:2p:Qn%y 'sٓޭI8e Gּx^{1m3,=c{.Q\`X6c%؞y8fXߑ#G~ ?E[ݹsg #dT?qLIW~Wx 1ZRs=}J3}4셳W잍VSQj=ׇtπ
E?d 20jyݖ8:\c6t31-SX,X],J*glS\Յuq#'Y%o߲1Y;%3, O9% vqyEi|h`݉PΥ~ U{zzJ p\>^d&GΝe!
{yOtԏgraKuYP> i29# 8>Xz E %3qA_c{18=1aG>+c=f?51&ApH}o XY z)LWayi=Z l Iׯ. `4 pXw65ت 2
w?h_yӞ|ng,>9xNї^貿(v(XNswbU"p/Z 䖞ڥ9W NDD~@Ȕ~<Ӄ||`-)"$q:89|CDIO|֖2bA)a^9%4`/=c:# f`c]x-ԕ69>~")~ϟǚF 0 "
qcCg\?A {_ >qF,e0HK /Dz.ϲOXey5ׯkUyݷvZS+wS ꮯ^e/w\Xw(rFًOM6ۧ=PF 5N pYc:Z9X(/,T7wH͝k35ضm[U {`Ȥ/`ؽ{FZM:CA}M@ LL]R z*4Æ.X8DoC eףHLlnn v|DUE@D@D@D@D@D@D@D@D@`o aҎKMx+o|/yjD>)wحlg7rKs:9;*gS= S-
'zPp`7azBIAT
AAɝmj2hcvBhP^Rha&B}p #sm
ȉ@H/R# Qp͚5sn&b##b*) XUǛ6mLSw?.&i{:ǯ96Sti5ۋ0)mް% b;Dm>xWu:h/" " " " " " " " " yzǞ1w&,OO ycd̾[aq#-ыQd*kWn vR}; M &.nXL[Iw, nG7ug+Jݯj~%浡J@lƚc:O}۱ WD@{gS[l$f
aN`dw+Q
GZ{j:ǒK=ǴSO7Y:08 Y_-" " " " " " " " "ts=\{zzl]ъ69ƙϸ Xc]zהJ<f{gOOb|792 k.wͪ+r{Ma}`T$`,ްK;]h.2{ !U듙D02[ aly(#̅ڹRܜ$0r.q96-BMyL`1ҥKẅwU{77^1=:|SS x]}6A2mWˤ1+>JsJzk۸:6 kچ81B.ke5,7)wpkc/ok i]Mإ`M[f?k_{3Nm\}챶c__yV (Rb,W|H=,`
c֞WrLY"'" " " " " " " " "4KQ46~c֒}en|Yv\b'g[Fr;zU䃛,m'a¸>mb7ګw7 $_Qׇi'GqO hWBw<l+/uYЈU!vʀ}6Z( >
ˍ#"$.-. tLq|t!Ҳɉ,>`Qo>hZg?A˙w}ǶfM T7ykfO<؟&(?֯aJ`jfXPa V֨jW X\k#ȕ<.\ iU~]K-).Ңh}[Y^l%ADi((+)(j@(UdF MND@D@D@D@D@D@D@D@D`i `NX o~;8%h}{$cYo>٩S~~;Ί 'dx]ī7G'zzmnƴWnomӗ~6Lc< DI57vҠ
ጜ,9 K~ T| xO~2Z"}ƻ6 ]"///F7]3]Fj+Kݯ,f+Úgs쯞:f;W??X֎Uv?<ioZIt v<(g/
a0
wDݱfhl܆Ca''" Y'0zPD@D@D@D@D@D@D@D@D@D@ ,n/_~[~} ~?8-2V9s'k~C __4Wl{X4ڛ7ڍnTO EO_\X n<NC\[YDq^{㚍QS-3qī>Roni8%radR∀x] D`4XQ =z !NG<<<lc2{ӛ GZof `<Hlɳ-Eݳg
ӧ0oOK\ ,O4x6{UķNpuW5ck'"#v"
w#4̢`·B[-T:k;ָ :{# )2%ɓ/Xc٭[Fa5Hַ//FYGؖ-[c bcJc֠X7e.q/
1rEej7 `[ڬ<}Vog_ZoUeQ$ >ag߰lG7a}wf}H=yr#&zonѰDm(8! S+Yqh{_hbϞ ȹGzlCqI?L9}x={-kXm{$IE!" " " " " " " " " "l0u?lCCCm6{fzliۉCٟٟ'> {ꩧ쳟=LCީֲ7n Ξ=-g |(bU|$===Q]jU:k gIQ5Օ[yiu^ qkX]j +Ra{Po~pqKXc7Tۃ-s68ǐ23~6µ! &g<(>c_{+4HVIm 8Ϙv
{=" xXɉ@:\;70 s" !/$O=& eyr" " " " " " " " " Gi~~jjj "m&5Xfo1qgg!w߾}:[w644>{W^m>hpw}cǎi`BϞ >swv6VɋaM C],ȉvǷOVk۾M5hPl_jaøl' vulBuzfsaG`K\Tf~.oyؘbܙq,'I#phAQyH<t|H%20K ?z [hXS3\ {Xݲ1ǘ ~~g6/Xn]rtuu7hw-.A?XZ Xf M yI]NޱVY^֍EDIDXËhO'nãQ˷=-%%% (1xamhWJ] =
'6NJ# رcqz~vQ G y > P~U+ 9?1vС۳g 9r$G\GGuuuEvVE@D@D@D@D@D@D@D@D` 8`̑#u\8`250`oX5 ~
P [/Δd*kAzft(: ږnaoh wƏ$@;_J" `e˖) Wu)?Qǃp[KKK| Y~}ru܊h;jL5<GtDֹ{M7r_D@ V~%8K(.XגqƘ|k'.S*TUU٪UbXKhҹ@ .ҦIO,|<~c$#" " " " " " " " " " " "?~6]% vqy4L@
j[S Xou>o>Ҋ@$fJJF`xxFGG˧KND`ݼy3UVVdQQT<#Qw&:
X(hFWv;{544x6D0vObɈsUUUVSS3%ى'b ;vXccc,ҥK6666yUWW[iiT^ GPfP+_X|܍1H
cL-2vab0i%VV\hVXpwÙ_ڄծG'y< . .^EJ3g֯X^r%)5 \|4ԩSzj+))mӵڿ[.] |uuu뭮.X;FY.P" " " " " " " " ˈ c̬cEE2j6qqUVe43׆
lܚW[]eKWig%ƄxxA5[I3BΚN% yy3eA(y
CX_Ǐ'DV>( -P XcӧO֭[c::S-uwwGK`Z05~c'iА=#QM!" " " " " " " " yE1Hf1 aʼjRTHJls.mնsc%+aBF[ 0;62d
0^3 Jw܇rKK@_#A+) fc|@7Z[[[@@%+;{&X""2U磘{(pE}ȩRNLߜhϞY f" " " " " " " " "p 1c lǘ$rw`0cwƚ=yg}*7o[yeU0-B칬V<qpl@jdž@\bh
W[
ʨ,qVthW_#*"Ln۶-N]?@WmX"nٲ%ZR+!J .>X3BT>HǴLqU-x\& %1 0~,1*LD@D@D@D@D@D@D@D@&d1` ɓqIT(10d͚5ql^ Y?Gv5 c7_~ٞ;W
N ] 'l]ei`Ϥ_$;'qxdN9g zː۬q} x^b@W`y<X"8FQc7@; +.>~0>[Yޑ>eOXL^V&yiZ2^ϝ;g/^Zv`
F\~9 0Hk1F 9:0l7q`- nPmO <oϞ`ݗlt<,36ܛgK؞&ײ&p9z6p}f{ޤ-N>MLqiI?PGw&3ll<\ӆ}v0 iuJh/Oak7@ϱh4ָa}@:\Ktq2
<|i\'6ׯ2 " C|
];\Hj]A#
kRtӥ;?[y"cN}߾}Q-]픁 XCWkl>I+'" " " " " " " " "0; =֮]cl0J{umqVgwg qv
Ƀ&Ư;[A>:1>#
K RdEg p t{
2Pqtqԉ{0][6FYbUT+AԭUSiƨ i{Xe6nic֯ϊ;:,T̞
*].{tׯ_Cխe ; $:\\wwwdD</}]Y~ɅPxPPU]Kvkjj~Dh^L0C>qD\'צź6K0[T>" " " " " " " " " " ˇ 1%/3^͘3QS6x9Ӆ[~tgϞ83䙰3cr))]<L%ͬQl@U<c.fD% "?Θ2sx,LAu:{RkBT,͛#mJ˭q{=Sn?o
òPvݍvT 9n5U6[.\q <i{ЖlWw@dWV./d `qy-tX""PrPvɽ]^^ _+"^K8ʅO/(tX-iJ'" " " " " " " " " "20q'%̌7326HKt1}Y1jƯSS<aǑL
1>
0F!mkL50@eZsh1JLeB87G(4omۂf ku!c;ƫJK lnhݷ3vd{ȿ6[,\g G7lg -4 Gl9ѱq;i 칃GvԸ.s3'x1%. Y֯nE:Ѥ(AW3gϞS2ɦàS߹sg(̽K>L3ӧmSYR /L^ 9&>xp,'" " " " " " " " " " w#2X21c툙YcmD.2 M\UfdGƩ|Y&NxcL]FKHKlq:M 67n'ԙw6[^G1EAAb4rf=u > 4d ZY1X jҐkKsY ]=6 x{. };!GCs/KGOY
+$f.S wUZ8u swx@ O<; 7N8tқ7o/ :`RرcǜIh^$S'AL[ KY^xp,t===1>Ht.s,^E@D@D@D@D@D@D@D@D@D@@KΦcqeL9
Hq1{0"aX2>^GqaU¸603hx7FJ8f&M!c=K<ʣ:/ԙ<ɛ:P?ꌎXK^ߕ ;u֞?x,NVA^Njq-cu?dW6؞6bUutt<;ttd9Xξx(}1}wǛڮ-V^V:ctyj\2ˬ^*_й@x8c/ 91u;|& d%fԕmGM
m>PPh txD@D@D@D@D@D@D@D@D@D` 0Z4,v#%#7m"aXjr<s.xݖi{t`onav<L`#(ftEX;WcɊ 5E@Ee|է*FDuqcbVL#XaZ⚚3/~qsCzĞr\čW?{$9i/aƍ(0uYE<]Sf 60=79(V/^`qE& 0w^ֿ'qscg t{)[u^|$.X. M:]~y'_YhKMXسEGڇiB9^ůT
X"B"D@D@D@D@D@D@D@D@D@D` -mVp'wmyK ڍ8M, ^V@-8q
>A u2, N.յV=2?I WQ w?&b)VKs q1x6Ÿ%_^0ƍ6-tLUL: i*4sQo6gy[HK]=h3 ѰKO"Җׯej b6=VX eӆ7˓jccqbnغ&%%saZ 0#+
z
Vo%{ ztt8` z:{wtX 9r$>X&;p=e!ξ+Q(ge^Bu5,//Di4e~
D}~Ϸ>J/" " " " " " " " " w%P^az̊&[Iyk?`WTPla70A
VrN YK<Jlxv߰
pYPTǐG-9xXbX8KX=cԌ?ojj #2fyƵv1m&OݻwJ$J #28e1`j .:8yP<ۣK9oذ!I<hkRw |,=7Ă? L |"9;)z[6Q*4B°nu6H{j_(rҷ7 'lV[ݗ#'
SPGM@w] ]_bVYE㤃Mut>m*/^ tXQ[: NzrL0 G S8nwɆ <,ER ^D@D@D@D@D@D@D@D@D@M X؍MVX H[x];ch< dy ]s "ڥ̆k$WspYK,Y1bfKf=9nglZV0nU,k2lKK5c3Ot c<<ɘ8z o߾=֕soY/QC`L ZFӕ{k/k=q=iO Ή+.g ؿ*+5\KRtt_uٿ5\!{1W8 *ϵ+ e0 )N,RJͽklkD رctl?3%s3e[{6`ħL;y1e| ͖w&xܹ3<fYya`%K8-a< $Pq'ڍ_U|7Ο4+
%Fkم,Yy#xVڅ7<a_D dQdưSǹ8@)cԈ#\hsX8cФ%MK^Pqs?nE0t 3MzeqOzfcy9|7nX.KF\v#GCOA5gS[\KlWӶ*V8W]Vp-KW,-[GWx{ Jus߹=X2F$~ xGNǟS//=^&&=/ÇOY;$ xX6̳Wgsi|r! kb^>r" " " " " " " " " "tUkX?j%G%BBl$L-ܰ:8ưoI\qqrư3q/31c==ihɋ-<ocp1IqjOٓ+X){&ǏЊU+We˖h9/#"@T闩M;S iOtءc'mFq4-Q֜ݱuݹ-k^otXqQhiרrۅ;ƽt]|Eq'Pr6yceo5LM=tt[nsTtnJgLg96:V 8lwɰ,6I~tLis?nNi;*F9Iv}%eQi
vaN+l|ϊ\`i`K'M Lַ֣u]7n 4IDAT+cƌ#8k6c<;#bJܻX9cqg g^iYC lō8L5,oj]}gdfdͶH^ R/Ը>, H^Ƃ5酞+JS ?5&ۿ{8 p]ϴwؚGvڅcI˚ / : ֤
K=t 7Lk| ulr_w1U)x訙?S3_ y"O:{!^F^6:3q)?xeeOp˃ {]''" " " " " " " " " I2~8eizv#<g1K _PH#wՂ=6,d6,DFƲXٻ@cw+X.bC' ڧ )qi ƑS⬕n=ԛs~ [fMA\%>X?Z % euttDc0gk֦{^Cqho}mmX`7l<XWvnba\: ̅L>Kḯ7nXך7`㣓K>R~QUYa[u9lRv˔@UB @Hs!;V_H ԺHC/ppK&N'4ټysl uacqskerY/x{Q !" " " " " " " " " 0ɘ.cEn(ǂ0;͍^D0͚Þ1aDI6]Ĝ.M\;#v =z4E:1&#OL/S oڴɚq=Z@zDXW)ï;.bգ,bb?]g 1:sgǎ q
Z^YKG 6S͗
3mئ
mg:lsX,c۶6ہݭi٥n+? 6gW0YA;yӪWW-iZ(-
:t.5x6Gz8Iԝ20bKօ &6x8>)0M" " " " " " " " " "Mw8909q1z5^`[R% n,m cnM3a33%*#_M04☴ וe{ Y\UI#f Xvm tq6al` }u.xf/qn :b f};Şg·O[K>r29;ݲv[8y^:|zх&> ׳bahIܮel$&i/L%y0t
=xڋB@¹(8B3ΰwYO<dPTxQELƜkmmFUQ<%=לmz {s9ҳm9p@SaR6B,2ԉlNe H v=0!mn"V}o6=qvddٗ gCs}M{>:\X'9u
qwS ^D%&`+D_yq$x3,/M"gLJֺxZovA~n51pooo.I){z,"~#.]Xj I؛tsǽNeĸ] [y^|DhJ5oZoܿ;WtD}0 sS0 v ^9jL/YA_ ܿ#3OV%S /0eZq1wuuٶm$f
PD@D@D@D@D@D@D@D@D@O"&cX,x=Wd't4o3x82ɬK^/Yv2dx.^\S_6cv%*G{yY[]Uak&͵iƭ{1r8y:ۿk{{:W鏹FGG\pNwGWyI]l*Ona`F#*BOݻ
)" " " " " " " " " A2)L/>Ӓ6(˸2ίW:ϴ,[ A !py~jXjWʊ.]OwۋվIXݭVW:'Xv7m\Đ {!X^|
a$;bg;.vf!z|Lv,vq!"3EȋK/j{W _=qZ3 X IaoW gqXƕSǜ]bR{A `<u5mksc5k([ xFsFeC-h=,g_b@X+wӆAnuӧ-»q#tH=Et:(@GU[x(;S+Ȟ_;1%~bwaÆ;^3pGN'?iO=T GvY _f?Lt4iZSҹ|3fvm?e/ <1M-.B]+n
lMZ}6o\_>|ִag^+ S%߿B$.6, r)reHb
___ {c;wZ}YP#D@D@D@D@D@D@D@D@D@D@f$Xr :tȎ 9bwq&8>n?c:3nX[kve
[)kn\oa56Z%%ֺecHSlϽ|.v8b7GF%[UVj hf5@ %"@ǚڡz{w.Բ_z1'S wժUQ% 3|1ar" ,ܴz]|QXYZ5|?M5n>[uoMmIȜ2gRc Y W>9>Lo#A7nFř]# c< 'LNB K5Ua*608dX6mazf u4Awl|̞}h-
~myi9$Ny2^xI4y|i+YfM{{{Bٓؒ矮sYn#1<<dEťVȇ([ MN]2:z3֔>4|ȉ| '=}J{d*Fw q:'"pn/=~|`}Q&}ŏ̋cē<iho&xi֏k^i'yf'r!Uec[sKSV}p[Wжl ;xڬq]CY|< 9T\% $x %)yc%}10% ͝}O0ݮ-ig~K0W˹ރ~/gkϳ¯ KJ˂@~I (G9<(Z>D@D`9?oJ/" " }ûw 9 -sV+5&F 2(3 3F~~L {?ts7k@Xh F%j6JC* FnQVZb[7qʪ*ʭvigʍ l Vf ֭)j^K˦J/5:G رclhhoG @Ç?6Y'| 'Εc i[kkk̇gKK ?~<L7o 6cjllS '5֭3gD Ν ckAmm={vO|ªcZ`*e'c[QQ1jʢ ꁟ~~wy[~}eWÆ
C|g7n ߴiSŢE ? /^onn]t)5~z g1ٳ 0WN\T?kBp
xfR===S~EC;hyvwwǶ lp0 T瞂31 qܟz·USS1˽ӎl~V>ld^r" "0 ޟ~>y)dB9$∀L"}y .Yqr5uX [2<8Cqɒ"
.صT2844A\Uf\Xy<Ը6ޏ-fCq//ڍW`њD`q С-#(q{8{^_
{_b8I?b(DŽ#{|{ 8䏟ϱI!C~ϟ+8K=E~ԏpI>rɇ8Cy ?G(8OwGχv=T?ey )~&.6 ~>?h3I?q(䓌C/u?YR
~
a/'" !@>DZ,4;]e)X.wHGmJ(w]d3 Ćs?n%,!>~<\E%P\ gԽz>~0q5mZ-[~asFvrW
D aaNhOJ+N_p.Q#O;I ፍS'cAɎc/?3I `&KN;ɖlk0ɶq[-&g利19S O>~fX9f>zTD@D`0S ~)'"0xnx~xv`fVZ,G}W>O7o8<.cl~qsca~<;`XƋп]kl,,qKR[SW n'3b"w 3 `.Ϭݢ->ewN;vE <ppO==^w%^&疣?ڔ佒\$ _'߂}ʳSM+s;$é пҧɉbwL!ˁ@M.+6msv< 'uϻ065d84ku`VpK䖖ڥW ^t9^81wqpc{c^V#1(<lo}/2D?L1-'" %7?Wo" " "043QRI 9rwRJ&y0f=#%o7p S7'Cô_ .Ni*e H]+W ^l:ؙ^xH=>X b{Zߓ.|L1ӳ| Lgu%T%D@ _^^BUZD@@6//*D)yv8tK-y3~+cZ Ny C|9! va*W /R?KcieJ 9yp?^V*-
?jdcg} ۰R-"=}GU9DXV*\D6䳣o\仓'%'c_qҟ?oe$Xhr) /Q?Ə`>8B.~pOKxϱt>gQtQݛ[B@\T4F3CrҪ@>>o[" :7=8wkT{X<]?o+]%:qӭ a>ׯK>O'7rq"''Ϲ@xEIg =>r7L?2Mw|q8p P!zd665 =ǝ),y^~X x6x֊
,Y6B&I Zԙ.랳PU1''l}yE@D@D x]^ND 3
ώ ̌JŽϳx+|y8|<>q{Ozڋd5;)eJɓ6<<l0y{'?GM^jgΜVQQqG4!sv
۾}եa3+KE ֳ n% pq<?" LGmLq<>>6<m>dZt " ềD8BS4ysͩϼ3T"Bw \!}d 5f0G9ݯc=Cln8<iX<hu^ċܹseCCC622PԽqVVVqO'?00`QM
~ڵk1ӧdZz#677Ǐi'SKY)sˑ0X<.{6 UH τOS,hD5ɠ]m F(%'~CM@'?{17B@fxvxfۍc9H%c|>N 'ss]-%Ӻ}9E@C@mv8.\@0˗ww[n* 9)y`:4yc iӦhˇu]8'HIqS RcˉJ%@_la1&Z3ȹ:B" yEo yUyUVD@D ߪwGByUX@١g.*2 }8s:֎xg<a /ݞ09# vX]It.\`'NvXƶpi_+sƒGmmڵˮ\2eqvژyHKLk g'Si`~Oy9c6ELC;?t\[135NŊ96E<{'.3ώLT Xg2V%"އ><n%x{Wҟ k/"0$. e+kGG={6Nk\^^n۶mbwL[b9L ᶪʎ 92ŋ#-nSSӴt _ߒ7k40s zQ^:97[<dHg'RTha EyG(űT@W_I!| ˤJ$5沼jg8=5w-ET{XLE@rܸ9U :k;~xE$=bla= K,a;~ZI,k< .krl
4555Sx10.R m)n"Y&nx.MkM8{Zs l's^liي'B{
C-3/uKfw EQ')`ڴ
nwI" " "a/'"vGfm{D}l_ty2 qix '$X8hmƴ8J:kc:bwxG %5KZ°eԎ8;88E=-V7o-[L;<KyM-@|X>Xv9%
{)zPO1u :0<kBqRޯ+爗K wIr"_^.Na.hY- 9 ث" GoSWD@D@D`1=A[e,<78v>#;+q\L{2|di+ɟd$jy_H=˻5Zbׯ/vDׯG?V1ppIݏhKx85, F`{~8( #!#nj|?
G??=uvbG=3i]\]eO;|]14BfjiέZʮ^M!nuu'mLCzX.בz.SG=k
ua}b,zki' M{tj .5;OLU$m3 EV*[o9X VND`n#߃scRbӷ3$Ó~Z~cWڞgǟ@흝@6T ^g|XEDCd-XSNE?B. b!;sgQ/SGZ'Bn25H1+"mee唵j2MO|OBE#bJްpB[B 34".8./b ;7Ŝ w_l7O>m]]]Sq]>\f}b֔Y6fZ7L x?3T+ QI OD`y_7,.oS9 3gb\ cL,5,y~%{ =?+gVGxnI$Η2NOnj 47~c:*7MHCE#;B7lwgK9aA
E4iZBEdcLf.pA͖(RsE"tsNfو0]bX~epe3(- I@L{7nhoo(LJ<dezshb;+ }6r^<y9X|(t.5 I -gll~hd9#ws.~"$pb
S#FAD$(z1io>e陚]6ځ%
RbS J۱~Ef#Oؓ'O`cL[jkYK Dj\7`]{2iț2/ג
+ilX{bX2 J/]։|$.,i~ED:G?:D={DKW/]* Qg4<ԅX2 3$Ɋ;kGDD0=qDXͶZS&B*\'E{= qiDl%?i+su )2㈋8g,87# ѣn˜-9Xh9~O?ΓϯU." " " " " " " "k䭸" ' 3\q9 atⓩ|Y7Ce]X"rrnӦMqc&!BeRsǎ z{{c[b+V,`;qsp?Ǟ: suibO<o?iuVi;L̹XLy(\r -ju:$LLݻ" " " " " " " " L@D|TF@J^=)֞.βjUUUI\g G }#*Q"G8zkR[DPf`uNJnEd$
uɆ^w_iS2,- i3uIuxwQsɰT?\;tҴuiӁyXD 2yv[rWh
I5$b ֑L$B"LK(&0u/ְ +CEDC(gC%-uADmkk&!+SNE1uWi
ۂU+hO-;c1?e7nPK8&' cġpq-Ydyڵkq:dl~LX&x===Qw1?ǚ0\&}.vݦ9gvjD@D@D@D@D@D@D@D@D@D@RHD<UDZU0o CDC^\ˣЋEqR"qakX],wRvΝQXM9^CYK y(7[z#uqaD]siXR72 panu$ճKzN<OzS'3-3u>!?oW2" " " " " " " " " " " " $N +&"B#bmۦ*J"łѣxQ|L#bI Az=sL:6D]6Epd
]5qXĭ0*2"-B2u@%<I3_Gٴ)/("4B C@łr#aD|tmM֗u2֭X1諾\pOG~Ihu'%*"&B""!" B!" pX"9s&
CD$jaA_JŊOI"%pky1
2V #mkkk,Dip]Y\˔Lˌ/\A<hB'S.SoQWFޙxHy b}bzq=<Gmrk0o.y+ xb>V\49%rSis b!~m 8DX/Fxus>%1Ex8G8 v""Hf(
ODڳ2}
0B Y HIdF#`H>0$ aF/Bh -bI7gҏ L I] I_r ?/))-4Snʁp ^`^a_b_gi?/ p&'pߡ<eI%ezܽuHOQ{;vF @ @ #볙 "+M=Q1ϕW$YipW {)|ܺu٦eg\a2RX̭l`n\s ~X__GvXQ-3N6:lZ :Mh M6wS][[pns,wifR<۰cm/&@ @ @ ̺_|-Ղj;?mǕ}ώqQ;z3E*:!w^Sm37^s<O6̈osYMXkNK @ @ @YP=ggiSbsLϜSMa6Ϥmfe] @ @ @?
XI۷o7o~'zrnugBk]I @ @ phOp(!y^l
OQjX @ @ @ O@ [ k @ @ @ '+0w @ @ @ ̎k @ @ @ P=` @ @ @ ̎k @ @ @ P=` @ @ @ ̎ktsssvj8q;2s n:f9n};g ɕVyn$ @ @ 0 > ctKw\9wkcT`~~<}\zxbh\vZyYy}~ >4ӧO'OʧOʕ+WJϟ?7GÇVtRIC|Ŧww\pu <xP`Br~i9Ymmn;^&O<g,:q=HԜɗ}$ϰ8묬&O>G:Nm cH 8F ?./_n85K?9k]sNm_]]-xqC7oޔ&~uye?~UɸH_ޫF3.]f:N S⣎jǣqWjJ\WHI _0ɖq)ga!cv7'F @ @ #߾}]_!5Q1ϕ{f 3&vS4q
|SkyeI5NuSj?SMq,m0N2ŨlTZ~Mm~\#ӎ?~G$N49stq͙ɓk:yl;?ۦ?L;qo01?q!9L NLqJmgqrfiskm3:u|e1Q:'q /yuIX˹ @ @ @Y@^xwo,.732{N#@ U ES?t:G;ޝ*R? o3X#@ @ @ Ltzw%]i&V< ڻ*}5 @ @ @ +@;]_ @ @ @ PS @ @ @ 0]馗 @If @ @ @&y-VvzIf 0y}
Yj @ @ 0}lwMޣ}W=$V5<8&Y9- @`:mY @ @ @`\kWWBcU666rqF? NrMѶݲnZ]kǛ1&Oqaa N@7}qqmO9q @ @ ̐@a7"2LL IENDB` | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`?:VϘ U=qİK.J_Y}_(UUylX]ve۱)S!=[~ E0 FYf##B B B```VW5}ΗR8C.C[Oմq!!p>@{>'X#Љ 1Fؿ_(ą@@!P >kul
f%N0V 80d !bh/@@ǩ #mmwO\@@@@8~`5!k!!!\:+gee ;+g}w'gN ۻUC 6'h7gl9@w>_8:.JYw}!W\]uUKoǯTZRN]t]!!!!!Sx3ٝR)g@@L'Ps9I\gwj:i,RG ~m+o;WS8>ot47T q (GY aotPFr`= (Fa0p
#J*6qC B B B B` j2v#*B B B` yimJ^UAKva(w gyfd
_ FCuo+}8s=5\B/ =zt8.~
8yK'X _^|譼}6P_ #B B B B B B B B B H2@`
VMvxX%֖sRw *41ΕfhDRV^/ϯ6aSSa|yK7͕~V}nV4XuUW^~⦛nڑF)ه@@@@@@@@@@@,je(Y{ ܮ.[2R|+)##ՆpՖO~\qj7+ciSk|'$ q66 W<i߿'| dFs~"ُUO~/߃<^z%<U>Um5s\@@@@@@@@@@@ lQQ^~adk`b$cai
__Ty(/# D[o߾/?ȑ#;Ｓg)#6Wk =DוW^yљҪWFK/tXeˏSvfuEOiN~iq֫j{nxy1vP҃!R+7x駟 ÿt[ٳd S c:VgKX@@@@@@@@@@@$fqرcfl`av۱"Zոmyצ9 Ρ>L VSA[o 1aWYQ>q,~0^W~+); tM';gl$:ɰW>``3o|:epkjRj }|P8xXY%ꫯa%t!!!!!!!!!!!= s曩VΟ.feбrv֪G0}˸C`yl'c]9~s\jiN،%ZIZ[S ><pF璧]WynVN?C凙$I˘~M'U~HFZ2 cU 3.B B B B B B B B B B`j⣚5kO-+gmC8W'l!.Z>9lTcbȚf@06GW 9uu~}ao
xf$jV\z̫_+c|ۗWٌo#\f]Y0:^jOO峍͒CߣG.=]Soat1_ Vu\@@@@"0 d|H|^kcC7Q[ksGE>HћwG 6i-|ZΕ<3lT>˕wÕ-7xc X,mvΧP5iFFbex+.֭UX^^ܒ4](}aX à J?o0VEKW_=WeySUbcXrΒR#rɒ /Pу S\3Zˈg+iᅋZyg !!!!!9 yI˶+yژj)f_(1ymytRyxMC3ޜH o+__|u]7'|An-L&9s\ɫ8.}Wr qJ{̓MՏUni~v۶-VuC x7.L1/_jjB'æ3ɳ ]g?%Oy<e`Mںr6nttotU 8qgƬ+ '
^<c[B9B9sK'-#8\=Zcrܰg @:IxfRr~xk_;t1ae'[o5|?N]w2!0B B B B B 6 }ߗrV s87&UZq8{cvrjfֹ];[~Ui[9߸+x=lVxQuQ<iX?Z][YoEicn mIz9yxjX?|GVL&a=->[Cmi]^B:鼌'/
?/UFٗ~W|+bזy͏W!6<eOW_ omWmPZu7jdn n MQQu3e|BŪM7h}n՛kpD<g`" v3q6*ʗ\y$Vi2˟T~^Ɓnq^&OQ _#{n0$zj3ŌnXjG[;&7q7OeA1'6mƺ` 7x7yMY1o;h7hipC}%u3K@@@@@,qáĤ~;?}}a0ag 9"\c\i_ yj*?z'-9\1)y W'ɦ+_ۉ[yϘjc -9mZzKC B B`^sƳ̳|-WjNל82U 퀡Prs(t
?x)OСCC?\~ֿ`kI/L!=4)~/F>ɩ#96@˰jm"M)L#u&oE|7
w 9<
ܼMs bn
YW.~54q&j&
*r,3L|Mvg冠Nsk2I.c"A\z9u|'oum+q.{M[7a1Cu n YdN!tҞqў-r\OoNHp$1O!!!!!8!Tӌ
^ 03 ǘ _kNZcv:쭕Am<bNnm^% C OX[J#iR0yr ?堃1qvb;Io3W@gCV;Whtr !!0樟pP/1y6 3n
O xnk~ ]
5j.݂ Eݨ{]FzK WqȴhK_O]gYWBsӧIͷ;dMK
n?B_lVY8a}1j5
't<rSv#vspvsӐfѐl -4I
_|7/ơ
L7U~3DX\amE +AV<Z]K*w9ܸ+ҮfOF
a K?7{aAVVݸYΉĖ'\i 9˥-}*/y҉n%ݗq/6) :PĄB=+/3rk5?I:/B B B B B`o̸`"Ǐ,j26,V\~5Rv /%˜cd;PyHo,نϏ,aR $Gst0mGpG~;*\1Wag;v<@[y+?#1ҷ&X+\y8qs !!xnxF>ݯ~%#nixɳsɳ!sb|&?Z gsS8p/TXi+M]0~+_2ֲ?W'W <.[< z4wmz_| 9;1/̭Wi&cmb+,7o!r2+"'#Eeh\ @eq%h5H3(jRA7 LN[2cl 0oL9h0y7 gxn`n]t5 - Փ?>_"\Y9C~t.g^Z
2q
ܶ-mC,{yҷ$Ϭtp'wu]Wz{~&jrCK>Q2<ߍ kc_I1J'l;vȰ78T>31`UH0hLi|ERƏ&/+^`ϘHzpVp,?*O8k*$GV/M+_sa%U2meϙT2ָͿulN@ʣX9qY_ׇ>gz{'㠟JsuI\gWo' a;} }5F_a_bӗViK ۈ~Z$9Wl3U}
' r z
c &My*AASǬx?k p^ԩt#v!^-s_l_}Tʛld ɴU{<yjUA.:xUFk\m ߸A.}9J¹0ԵqH$
Go7ǥ0q4h7U)g [QaӇAQ^t-\tQ X8]E:Lq{^z@ K <1 WΖUMI\2j f n~9K Q:hu}rI mCU;ƻ Ä@@@@f&`c>qCMOrԤbjƨT c:z* c6z{YEMjy ߖ% AWX͍LU2%:'Xu^䌳|rKu`CZaz0s̟dU/B B <S<3}\Տ7[oux||tZ(ae8%dz<<;;oy]T8͓(n'io"~p
MU#ԍtWN|}C:vf('/ ?%w'qSUXW Q;'>S*c//`}OK8h y]6}TyL˼Zu5к]fP 7oBi@tnMg05$.NV}ȍ05zHaԪފ'?aZ>8W6q=LXiXh' 4W{_ΟEo >QцX^8ӫm zۤj?N;n۸t(G7 MJ+iW ͩ+l+zQt6@wN*{řg/va \ڣss2!!!![>}k?oԘӄ8&%[W}J߆cs&ǵ9&O+E(q5}5f&mzR&Lj*9W 3*V%^ cѕ E֍52.2:6I9= ʯL`g\@@9r \?<<e={ŭggO$?3 繿կs+m; eOK 稯b8oԇza3O S<9}v6OY:7FWuUdwa H0̱ϐ] X
s I?2J*cun0w]b.u)aM7a[?d~C5S?yp|r'_?-*<^yG";JZd`4[qTx;*EO0R㍋[rS&J|fïkD!ñʡAY@!XY4V8xvtǷn|-P7)*g9\МIK-L{̵ \9avZ W^'ҵMJ7Ozds&
'~ũ~9Eyڶ 8Mɛ_tkچvTie8B B B B B,K~\j,AcrMu]^t\N?đqiVy$ g|nONe-y~|<> 34'x8ccmqڹ
t&LVZaѷƚƿ߸\Ţ2gܭ1?+85kRK^5brTYS=V8ą@@l?sJ깴yzN{x+g'A# } ={6yyz~=óg$i7q]ui_ F߅}Ϩf?v ][8䥍3 61vԗEȠѯr8w\Dz9澕] U ˣ V}VM{s S=ᩞ\JfuW1s}Ց d߲nlȘK~ O Jѓ};-`d~YNtru:_j
@.z s1sȝtmegj(tɪ|&47m &mZ] 0]\mlWƊqҍ>.:o
]-q] kqJk nɕMu+ uo8%ݻ9j/n+qR>oi?kqdaF1?qkvk?)kH[tʒ^FhӴr ]\2+\J`?!!!!!K~*2.kۼ`ihk3 0.5^ i+ZWryYx&ȬIY?3 ݏC /nDQNy*l*]_(&jkle9J%bo+=M;.eZ)וXڤ\Zd !! mQ6l5Ǟ! (C029C~z#{w@kozV2*vyθ ׳tyUv}3| ;r>:bdXɨ~"?e!C跔Q 'vr0Ť:S_5\>QLN qҚׇ 3䚇
w,_/2qPpYR,UFm}CyسMR gJ'CTm7~] i,*`WaUFq*l0 f56akAH]9ɮV\2Soiᥧ<aRj|*pl
c\=dk]$'W<U_\ XXF/>r]:amLӯtppX.29r k[iyKݴ<0UGMW[eYzNv8.ҹ\ϮeQ7}Xج,R
M@X¦nh<mrOݸXO?X¹qtm5;*9&+x?.MwܞW\~d8؛*x5I*YGٜa~Gq۱gGcr>5kyUڗ_ɒt37|eN[Wu8B B`kki?~nZ%We%"7u: O 3c0.8Ye / /(@[zRq{~t5n8 WX
W5:8`Aef}N W /.*'~U2*V+ 6f^ھ2XZ*~Kuö.̳8ԥ'%˱ؒ-8sqԅO% J]rd*S]dg%y|ߑlm*, .ZpYUi 3U؉q:'O&GG
־ҭKCi:ПlqZGL .+] AW=mXvci 5.q#P\{C&`'?N8-i#r eoV4ԿZlqjK}MZ9m g,'!!!!! T~N]_me&m&uLW86X<c
Z3֘<9>Ƭѥ_þM
+?*c-LDj[qoA2 *9DU_2lcc:mtS'ŵW9mqNm4q!![@=J=d?N9G`$qYD7As۞G^Ϸl/Pakq~_NͳZ Ĝ)>Nu\[n^]K zҧ| \}҇+I\9aϢ,ʤ ضV媲Wc1;c^ DX aVzq}C*ڏhҙ|i~ I
] ،lI& 8ܿPS\=}o}$hgA9ICqs*
0Fŭ0`
&lTXFGTx8r8Ϳ4wV+غ!xx:wcY6FΗS/VΫLu8M7-ެ62Mi<JvcqQ| 7JF0 r4=MD8&!a2 W|ci`,mdg28ݘ?\s{57I'ZgF~G iv"=ʯcxR!aG<FΚ|1)[Ms&L d+#&Jΐ?Øȩ2c>\+)/& Y&GۉJS8Mzn f !!uj]~oVs\ ~ =<|Fﵗ{yCYTaaɬp
_uOO!C1c{Щ[% , :R֊v o}# }Vz2k3dSVZ%U>Wm.Z,m]_O>W,C8Cb%#{lOSl,6q :tmgo[U呞Lei+\}gJU.mĵ^}YrYfF=}Seft 7*d{
WNCsQV'O~c*i2AO ߖ7.S Pε他T`Lvv!r>Jۖ'&XWZ&iԎN0qݶma*0zZXVc n XNC B B B B 'Pc. øưǑ_}yFL~
&M7ǿ !@<a&Jo{0䘴5Trtu^==LZ+c>P6~@*?<Se3ޕN1W\,:3Ί;օli9q1ae4)욈2VteWT ] !!+!`3Gs<0Vz{ٜN\zVz~ɒ}^2Vr+o-qǺzhYpkV͋*4XZu(_}_OˠWOױHcNݱ>
sZז*Uneč
d\GUq]3?[sǮ \p _o2hrM;/Ղ9O5Z^ AKO~sע>JI|L @/}KCY
זIg\ķGZziWtx#c[-n O$~ 0+0yrn *u*ōKxWo_c+8ȞO=ͯd/
qZ2P =198snO6V&<[u^u=o:$8n!pYxڕmL r/.Q)W,u^͔pOp/ ~C , >ød !!!!!0@k?;|=e#qqpA&U+lhƣgZ &5yH#qkv]\c[v\B*
4t1~1AWO2;)t&013Ftאñ:I9G6^]Y"q2?e752֡dV6]C B 6 jɯz`c(R8<֩ggh[sg0#8 m-ؐyke5iV碋Yx韴a0`NVSDA" گS}}&SꜿǤ7O\}JOj/C! sʥ|"\<j#3kQS_?:\VSuLSʢNE8I?\bG%ڢ6Aҟh]lqt7O
4Bg#
G|ڼ d&NՀ
W M+s7 #d,ɷmcՐ뭆iyYS<.cřgO-B[~L^[/Njuxe2>:/ :{q6oN;SVߟ'zK!K\d#?u-v/4Nrwő^^F2' t*<IfB B B B B >ÄٜI4c|M;O#Iظ\XF7 |B6No6OV:BA'c" #SX73nȘPYY R6# d* 1^^:9_aWݷc9K&yg+nWه@@l~u_oo{;B<HwzyZO RU|}23ɟQȳY
V)9Ted8ơ~NY?q+ _U0鯔:8
;D}#ǥ~chcx,Ւ◁l)V#Gش c/uFuƞNC5珑tLIyO~'3j# ƺ^ ꇑNM2Pq* m^VNmb^G6OO7'ymTUj``Qf+B$ 3͉V;TrrTBRa4WnhmpcqSq1hD%^ C_{C**
j`Nk]t q\ hm*tQPzU oVfsse<c8+6Ʃ x[ҥX8~nɹZY7mds
R~dT cWV ezUOƅ@@@@@@ｲ_/εVo喥ossm [QOl[2QlWN< 3Y:+98iocc*3c:y cx8xބUWe*s?D,N ˿ + s !!qVA1γJL9!zv,e3J_jxfy>{6R,E<۬{~@h" }} s#rŦ80wGHx~ Sz6lsޕ^ꃕ]E? ttw9,yʻR v7VbQ >VoN uxm+y裖㯾kל>7]dKִ<k+VW:+͋tg5[YuVr*We4͉.
FUi24,ci Yz7w7FŹp+M@a!
P4N{nYn.&@,z ,2pG+>tn9Y_# wr&6?۲9)i z䁥GVSmhZ~cy[oYֿҸ^:mLDCiߜvDmwt'f%Wz\]%? c {953 5V/DXy&b7!$^]ĭ㚨11*s2t. ķN|:ONEU(Q¦vdtx qS 8Y
W~uRs$Wq!![{y='='*ܳsq I<0ǠE'|rxn{Сa AgG }tiZUdѽq^Eկhh/g #L?A\ :ƙ ,f }sڕ c?뮻WSJomEzGyl:)6# zؚG/N-"}ֺE}82] l?9s i; -Zf|<Sn33& \@We
c24i&r[
W<4:8ݰ< 9
}zk,PiS7Ye.٫EfH'aUΒsev* 2 -_q(ٓfSy 2{̭-2Tz 巜 mtri[yy|Ksi@N6<[yIÐ<7b" K :$]wJ'm"CaRX/Oyx}lc<GՏ7֎،=M76m 3o,alVyn7/| 7&1&6&QC\c~_L:;w<UA/ GI\q|
.dׄfӒÏ\!Cҫּͧ4g\@$P~}ssfQ9@gNs=g=h}
q\{ ={V'/ۺU} <rU kw'cMK >A-j_P~ zʳlJҖ
M'fwV:^^{ C6:Ǧ?m8a` _ d,G'Xk9a,-lZ746U
daӜpn";v6 J&xˣsM5v~;c% ٖDZW
Ҍe˃ ƶ^N104nu'=k漌b sob&Jv5N BN9{+< cZ7o^cF=qevctSspڋ+`T~@[!YפzLOK횪'`zȓ=M欲$,B B B B v25}:c }y{cZc [ӷd1O+.q|mÔ+{kܸckצ!o F76&RgS&(< m,fdkZKWθK]S^m m<0֦dr !!9 {ksOo5٬R{)z8V+57X~d{0yWY0EġC[ͳ믹bfXMgR~Tu8MiN~d颾;+MQ?MfW E'~Z 3-m믮Pe{Q/^nPO^m)S#\ 7>t}0-n
-L_mW%36h|%K(Ti%ҋ?n tFAJhhѹ1ATziZtmuV Өebtiu\ɥ7 aQN[s=PrXʶ|q8N:䔓3v&]iUcW"▌ڷu&Nk&݇ z?LhVS|K*'@@@@@v"PcYexl@@@YsfVVM'ۅ/o~Pkw6nϱq^ߕ$"N+s</>IfSs[ݩsv:+y{?X1,;ؘE[㰝vJa d@u&[c<pfJv-guGvL> } :4|c`<[/'M߭:+~U
g˶ b!w4%W]dv|Jjmt {Yus>p|d1J{Xڕ8[_j_Ίx/~ꯆHVV>.N[ =B B B B B "ǶbE:VYmCf,?pdXMNڛov<ޗ_)kQ:E ;0IJi7`:"y|Vf"*Q\]Vk S*ul%ol쥕ƒx7&AW^!3Um"Cm5<I$[Y}r 8uc
7,Ri&0F/˃Q
UGdҷ8/)Se*!iS=K* m ŠO2]lO;. +9>58/^$7fcUo7Pߓd/B B B B B B B B B B`0 .gg<˿ @jv^=9RY 6 }ch, N`!Zpt{dsʐ0Z_<
/׀kt lndVJ2^ds,M:ҙn\ u_ҊXgP]IW]ZJ oPp- z ˒ԓ=9d[lI?#mg+[w=qmڞճ7˿ c>!!!!!!!!!!;?? {fa @ IDATѺ<sғ[999ƶS-B ʥyp}㕋R\eʤSM|#]Pi5ooYA<͉x:pǿeiՅZ<.4y<+ ISY\gܸ(-dw=+gyҾde !,γ/c<q7C2m.nDr-S
|͡|À =zt/åÌdpoIyУ6)\ }:0 i<:W cY9X?@~"yLaAՍ*8s7^HF
YV}ַ dC̒-Ã'?**Ny cc.VE@[h 02ڎ 92/go|sͻdq+?!!b8h)n>1_ ¦94νc,W;g _7r_~w׆Evl֓OGDž@@@@@@@@@@4via9fsˌ5\i lɋ l-Ö
Wi08cYP9NZr7V qC B B B B B B B B B v&_/c,ιoڪ!b@,6ԫOܖcW7>6#zuӎevϠ=-XFC B B B B B B B B B v.sɵHl''*"$~l+E#X[7?Fᓯ>[F+{ٝtsYh "ж]ǵ_f;bB B B B B B B B B B`(㬽mN9hl-!hR[2ζ4GK#Ǜ^=4Pۦه@@@@@@@@@@4LZ㬹2JW6&+!#e
n u}lF+1q8ko2FC_/dY`6O}FE`*NJ@ ; xs,څ@@@@@@@@@@l5\u^sе/}k/v<#-%0~<.B B B B B B B B B B #`v =&s|\> X hW-B`!ڇx㰜@@@@@@@@@@y嚃n㱌@-%RC` C hjWVk C B B B B B B B B B
cyf%[C o*=+ݮ5rmj+yէ'VfS>ʅ@@@@@@@@@@;s5\1NsF&!x1.i$\aW{s JhLcW[Ex/C ֗@ 7C`&zMz(N )0!!!!!!!!!!!vIW6<!K !D`5<$ B B B B B B B B B B`j~yt>w &킁F\,@l%?rB B B B B B B B B B v2Ҧ! @( AvUz!!!!!!!!! &0iy<<)Ո)b&!j!:@@@@@@@@@%y[w|vmJԛK[H!!!!!!!!!!E dNzV\6b6Ule` C B B B B B B B B B ֗YaU@ 3!!!!!!!!!!!!!!魳gW2I7 m$g/pxΞoofw_ڵkP?N<]vek_^z_8D0 w{.袙@̟~ݾ}3#/ sיk5g[yJܙ]C4\g{O:ڴX79v}`? Ob=? =Nw'N秝'p~ h#ѣ+߿w=\tw/裏AfwM7u\pR |??u5\ I!!!!!!!!!0t{ݑ#G˃N5Қs |_?,~a]/wԙ䩓\zoMÂ]u肽ߙb<`
Ycwuvn{`NZ/M#7v ·lG%Jq? yٹ!?no?co>yw]w
otyË^AO# aov~;t&je~7{zv$.B B B B B B B B B`Zd XPݻw`| =qD˄6sW8f_#V6sgzgW_y;ݛ_w322"qB ILo ^z{뭷l{Ӌߵ^;t8$+:+\_t?ڻ{WGdcO<}'3-X΅^JC B B B B B B B B F|9T_4nXZI+E/6_N{:B_( ybyuLV݄;ＳD:
: ~U ?_~cr=|įR]-3 FbxJW^yeH>keWx!!!!!!!!!!VFL RH3(oϪ8[s☵![@ [m;àsc-cǎ
Y2
Q'?`d[n鮺1 {aKm2:02u
yIGa!VΖ5\3|5{~RYbE'a! <\}^'8t 8+[}~'u ݽ2,#UVZ [] [kkc>-֕k*Mkr !!!!!!!!!"PFZikҼ9W_#4:E9![@ [elO?tϏ2ZXU:e-3z{K. }ѡq}
Z?W/rG?` f!
yV2,'2ϊX sBs̅rPiҠyӬ-Bه%0ʱs!# X3_rOq{ ~x)l|P +݁nWLF_Xo}[VxG ?l .!!!!!!!!!畀j*4 ;sRn /!;@ ;SX W^Yʵc;3Oalbg &UdZ| go~ z{ '}oo oM5K@@@@@@@@@z--yʋ_me !s @s>%/Z:V?`X}Fx%/h;O<D_bM[6 do ;vlH#3 {u:8
- @@@@@@@@@7hlgk_[?%' <9-@ -PIQ16 /<t0t*ns#˪ٱ!a~Ý<сyì?뭘ا_X _|뭷G.5i1 waw}w75&
-H -XiQ96OC~WVGbcPe,?? 2>ݿ 2 9rdR#.nEVGȧ}@@@@@@@@@s2hQrTxWWwVUOoWB v&hwf!07XD8Wu8Ƃt.>noBfm cߔO~ҽê]qUW]5|
r }Q / o߳j[rꭴJ}@@@@@@@@@c9Js_q͛4; 7|s !@*)*"Pgu4 <x{ >Es!3<3|':YG ?{c V+u?9`Yco}{ :Թ!7 !!!!!!!!!MBvNV^wuKWUF-.,rpą@<1:OC`nV>CGaVg/Xc+]u0!o߾/{u=gnя~4&_vm ё.L8 .oɚ3e@kkYbEx3k%||Z C S$6oY
kƃ>8re7fo%Cհ; gC~{_jꫯ}m'7(!!!!!!!!!= ILk6,Vg 'VrQ _~僌}"Ϊ6&S w^zq?i `xg
.&<0Udc8g@V0C B B B B B B B B B<`=p0Bi VЊ !s @s>%> >S7b/aUl}ا ? Q7|' /ζH"iFV@@@@@@@@<KNIii hB !_{ꩧ:9K_ҏV?{ѣV :t}^>iB B B B B B B B B B B B`vP
$ j5OY(}ìLm6-Ro<yʗQX^}^9.B B B B B B B B B B B 63h7sD@~c?q[o
4[~֧7E?W^~_
qDoO81|G ~gtq ͊/OY4oƠ1Sdz%,B B B B B B B B B B B||@M@JT^~G~oX)+ >ecu<`ex[~ݱcdžߡ=ryg};oKߤe%~ Ljk
fɕO)yd$N@@@@@@@@@@@l4,!U P qӟtlE]=ݷO?~ +C,#ձ <xp0O>9jypP{7kfg~m}&y!/ ~떑֊Yjo
8@@@@@@@@@@@gbMS V{jUO۷o02w}
zwF{g0̾ ۧz=۫jIc܇ zh MG MW%Q(6_<<e$ˆVZI{a>%,$7`'x{AwRi~ V
i !!!!!!!!!!!@ _l,?X}&sǏ >GwWzNH1n$[O1 8pWV1I !!!!!!!!!!!A B R)f@@@@@@@@@@@@'.8&Μ !AO~7n]{3NN۟vԩx 9I!!!!!!!!!!]]kn vt{!ytY
L5{N6 ].UhNbX:kdAi5dۆ ,P[[0lO??e;q?uNt 1؞N8O!!!!!!!!!!!02wOo
H{ ΅hs^ o&sxox0j J'F%^0(VL }9ދ w|
{ . [ C g
epV7Hd`
TZ 3O J]J ۋ@dTulo-cmfa袋d*9ه@@@@@@@@@@@@l<~ jr_˴7$YWKB ήš u<Wx/^\@@@@@@@@@@@%pЮkrYFy[vX$kl@@@@@@@@@@@@@@K`!Z"OKY@@@@@@@@@@@@#F~kdUMJ!!!!!!!!!!!!!Yʷ]
*! 9,@;Gn!!!!!!!!!!!!!;@ ;S%Nn!!!!!!!!!!!!!;@ ;S%wcKn!!!!!!!!!!!!3g]v:DX蟸 ]L~!1Ю H
'pĉɓ';{'O:5a{ ۷[)
_tR<N٫u<OZM.gb=w@@@@@@@@@@@, '| ;v{kkb,l16nF-E]۷SYFO?th = h^xaw/.7٭|kC B B B B B B B B B B B &hYLF+f_2+63~Y m饗e# <aC9ŏ%=03_r%s> %nu>~>*=y@@@@@@@@@@@l_V2F2J2 Qi7cc}20NsǏ X2ζ囖.[@ ggݬnhϜ>ugNw|W ݝξ!Y+$z@@@@@@@@@@@ZN3P
*'
c\0fU6Z{C檼LimY/'e+imF >Q}~w3 9jv.3.ߤ`>6_DW5&7
scȷZopt G Jҍ4B B B B B B B B B B B`({rd q7fC`SS]۴ j'Mmbҝ~p;ݙzgzvw']nϕݗܝ5Uά0WT_ˇowc綾^~^z7>vckR~8|5 o+S^{m0tMk䙸!!!!!!!!!!!ۛ${.qJUl N };ֳwgFJY{ w݉O }{ݞ뺋v |}QwǚW\q9+QQ^o{uCwku^UZJ7>z9qЍn6JaO?w}rtȑ#ÒkvqY⒗}@@@@@@@@@@@@lf[@{㷺7>ݝ9Yֻ/vgF3>7O'_Uo{Ӄ]H{V fe@m
W^y`,tRaRqny!
#hk_{Wlŕ/0+n[yw]v`dϷ1k>}7C/j|۸m0PO 'xW:7>q!!!!!!!!!!!!!U li`d}7ξ`|Tnץ
1u7 ^x0b? {;]Fqwxo<hwfw]1u縂4YV-& C W]uհ5PJ/oqXuZg[~6PYo}!:YJ e>_|qHs72z(#/ YC4'=>oR m\VߖUGϝlŀ1~gd !!!!!!!!!!E|z\%0ݺyu>٩݉O+g鍳O{K+b(^ߛh{K`|xGw7vGN _u{;}Ծxݙ we 1 <8jDFm
><ShKF#on@ʸJ; <:;VMjZ \#:Isɮ
OҳeI,<̐ﭷ%K~8Irk7 xD.)s@@@@@@@@@%[HS?ؼ;o>ѯWg~g
鍷1koo(ev'յg^O _]{;y7ݞo^y6ߧܬZΜ32$2tN2c7tj[2}B1^ &ߊʓLwy{7 ׆ 3 #~Scǎ
ci]Z=[~'/ǎ3c13]'9eNuUwVH[
!!!!!!!!!!i6I!vWok{b~랫%㬰Su ~v_v.k/LS.m۵ n7;>kt:9j/ cO26ZY )1 9rþ UUVJX[UmeɠX:W2ܜKoLt>:2nȭ<d3ξKؑ ._xA߱\2 flFD<Pn֯˟
cm,aq@ߤ:\ m_iz؏'5kޫn8ۇٓ;ǃ_kH{io=;/M{Go
߮7)ju3r~RC߅usdo?Lչnd 0ڷyNS YVJǿ ={a4nzӆRG&cձG6-Viq !!!!!!!!!!;9w,b7J[, cS|6_lUW*rrnE9m-RxrXWV֬Q͊ ¶/ʞ
~[bϾ{5ݮz`too?ߝ:w:r|anw|1edO&mvwCz}}!ѣQ̧5J
W_ nb dZ*M]`Ӝ`-#hӃ
JU9a~V9_$>CMK! zc.= B B B B B B B B B B B N0 Xg}ԜW> <x{衇QG 瞥j8l𪫮ZI#l+)[J ~]K9eÇ[_K٫CIkUֱ]MH|mM̾flkj-TԶq[|hvbkw`Hv~5=Clׇ|G=~gvw=ro9Qu{c{}K,o`-o uc1j=c*-']h {Ĺzsmd[V|^ya!ˣ ^'UowAHGKfKRaxV3SM ͼ;;wy{' vFZA׳ X%\Zƾ {l0I?o}ko
x5\F=Κ<D nơ +EyO=`(g#wNUHg}v0Ou_v )i-T,],ZА<6 {n8fHfbgўB) ~3ɳI&n7l gv:9
L 7\17m?;<v_7
Ecٻ7=<g $ը8X-$ =?s%$ǒM˪XD[s~xw ^3̩<i9gjֈk<P KA)-cԌD(c.s]{Π<CMX4*\y >C<-quͿ)]^Ϝ=gI m&~gn&@A @A @A 0>oL 0N @" O}Sø^giz{饗gb0nsBG}39q' 4`ztZ[v}LGn쮺<x0?Ļ<?dQ ^spwZ*
/˃.l,,{a=SKc
57txr3g^>';е"@n|G^; + 6a;CmPx dm_5^[%մQ4XVU?3JJ
jU-2
_|+њ]bҟH/_Ң `]"'41iR <Z" ^rsA @A @A 9ڍg?H5c R֊L}R.ؾz[@Yu[8s=8#- blD /]mNtJE N ;|=#un [%jm1{p8yqAx¯x
SUpG%Ip$A?wr]Ĭ< Jքe{[ [ξ N^0|;vf3smOsmmmi9p͞~͞|zJַ<n7.$oצ6s-vbCիկ
Z^JH\lm7|ٻ*(=4 HR{HO)
X)~3t9-q<S@[V
+tU0aVaPa@A @A @A ;#`|݁p3UYil W
׀EX=͘?醠xcܺ7M p'lH+}+յvđvpvX'x]rkr_]{ۑNnG`cU퉽I)[I'? lq,zqFV:N?G Z]|g>>˵=s=Cwq|ۅm_Mp }]|3/V[F9t zoçշ] :fX ؾvR~w|; v~l4uP ,BV!`JcQ4 J*NqQh?t *` *ZiR36F+"]pA*m] !n3$
{$?FHp"A @A @A Cq[Z˰6䭀EځpEҺg>!ó xC>5ޏwxg,/|yrZsBKn O< :ea|mx*khJhKo]L#h
VD* ;s]罌E" ', ]q s5~O
N
ob} nH> +DAg }%C}uO
Ovu͜x ߂][m ҵ^^OW;Wq { .Q"JXdPEVN=76pRY
])r){ X*l 1H'h¯0l?iBZF[9H㺶n'θ A @A @A 6G / @![xU^z4*GU s5K5w 6ݽ"o,_7Cz?ܙv/ޯ//ǎ:^}v?p'"^MVVnY'|H['__ N{ϰFz'&X;EW~q7/RYL%oHc~qϵtYH/w9m_WΝD[voo Wk}Ne}+Y wkKmm6t%fN}Ok!)(M)xN
!KJ_! b֊\/
/J>bW8V\6QT烇;nq38 Seܕͼ3d!C$ @A @A @pS0FoE+<C(w??$l?.NDxVY5.NcˍkZ#܅틟}:q|m3dO>h{ 헯X^jO?X;05!_|qX -v>=\{gg3!E"j
=bow|:E
V|^Sc&J ~Ivh}E>f/woU-h?--Kqi'_|lԟٹg6?{,G8RRĢH)`VR; HP|q،S|%`Q*J*2m'lV?2y3 (`8 sΌV-
~&ӻYܹ @A @A @A LG<CX Vc\
|P3No j ?au/<řةS?j\vZ _gk'V/^N ? CJZ 6Eկl+K퉾v;E涉vޗ[`'1
L Tp?ZQ q)nS03Ix"qy3 .pq[>n|//zHwpCewJ|]o};Ŷ|6sSoWj_~(v^<V*FL,/%NxVX[3Bī0m' !ϭ.(BHNd+aVH?F1)fZ LwaXB
R[uZ /r?\_A @A @A 0>O~2l o!Ƭ1}c1GS qAzfu&![;f6p G"3g rnWH* = Z[ ؔ=Rr0cxXwh'g7r0w@#{+' ;A" u)BRYD^=}y+MJ)
o^{ ^-ڇm|v/۲'g{-ʶWv*~7ٷ3;?|sW N6JWPD
U8SXn>(܄cBv\ C֖\ܮ-a{fHTJP㙂R~*<08CNU%HjX
3'@$+Lac)#m @A @A @A#`<ؾ1wc:c_җn}_{0f̳듟@ ?wb--9Z+˿pJZsQ쫆W*ؾSLxJ;Wn-ȡO>N: }DZlSJ"ӈ.7pV~2ޥV{*wI{Ỹ24:yE_F7?ũM> k D'j|-_l?2ֿծU'r7nn3 i lJࢤQ1q0rcB
Jy+lʊDZ`(M3ⶔ
D^ԭ 3FyftUsV#ZX텷HV aV+ܜ@A @A @A !`8nqv s?ϵ+EV>he WA(..8 xvϴwϝo?ًP'M{v b"=?0vhyN[= | ,ӟ<M @ IDATO!\ )?r Ɏ44
pd`*]$;>g[&[k0R%f$xRyw])l_Йv:_y* 8<3'N+5
I'ݏsS0?y-l(Ha
09ÊPp@|*</-HҚfY/e~KV
l w^d.CuOZYk^3g= @A @A @G 1 ta, 1d[c~#p E6t Wۤc;)CX=k #_2GZ xyGSt6wη??=ΛzS(MȻC>sC:aY~_ xɰ"~@鯴x\i[i- > ?4)_:w L{ |[[Vǵj}t}kپßj3 Gb7(פ2nǯ f0d2lZJNQ0CN~/(^X B+n0m-# ܛw2+ jbiQ`<+bҟ
jDC:=-LHZ,Y#A @A @A tֆ1k
t'EMvS00n_+)[=ks\ ӶRW^i/; ~ݱ0se=|tgζW~z[YX% \[loN;uX;|}XPϊOX ]=SXN/gyfX:
{T:og<a'i3]yZWdDcǿVn\n_dP㏷'f<#|b#4nq>KFFa'Zg²HTn0jYd8ƿwgt֊k?,8Бv"
͍_rsA @A @A ]~ؽk:-BW6=CYeL,1"ЊYC>t+_J;{@}_ oZ_ c ރᩓ:Ю~v؉'6Mֵ띜=,~- |q Ȥ ϝ;wsw=9aeЈY<E}HPaY
SnTx7^+qV<ccit;d)
7nτimvg/\
63vkkKW L̑Sm/tB>EU8n'R]8
9Mʏ0jo3 wMg|!_
˹乞+X3F~ @A @A @/1cǎNqv/@!泈 F쾉C!\r_V_ׇg+C^:3grV܈7i}ol'nQ lC O<~O_|}bNҞj:v(啵vڻv> $|L
;{ 0 +Bb:\w s+XL u܌]WkmysD¢yF_žS+ 8"+vtˏ"zM
'Y:GAˏ_0 m`s=Vq bHN,}smg;a턱 7[[naN /@A @A @A EjudLm au)f%]8nE!jpVq"GӟZUYkdUgN<3O_y7.<]JgjnXV~O?WnAʧw +$f#AzgRi~s7â;ҭ~ W\V8
YnറR3anz1RiC^Cn6sd;ʍ=IWvsC/;߫/:
A @A @A _V"ju?뺐*ЪI䜕3&H"EU}97NŻևOw N~Rؙd#O :3eVpjw? sv^^+P̟ww[:QτxpifeoTW=O|-/]k^ mt6_n@ =>uIAA @A @J9Ty+BHq0Hz^a ~O< g;7N ?ֿC{tX1{_k@>0S;c\& Qq s0'OƵ=G;{6xI|m{/u7I Go>V$
v;H +n@A vP ǽ@3aoR?oB"Ϭ F`f}nݿ=rP;zHэ ?.wrwAl060=V }vvo2͞D[x?@A>"xݍH o<%A u|kiqqqHA~"ݶH wJvl
A}D:O> {c1[gA fYBf_$ AwygJmsg_q@rڵ? F$(wN>< oAGL{뭷.@w%h$:1;w3HA $f/,,OtA`KKK-ʽ 5䬲'@_(k껁)o ^!PcU 'kpQMxA @`=!fA 0P A`g PX睑"@ʝ @.T ^E`vf,
A @A @A @A 4B7 @A @A @A gAg_m2@A @A @A -,gN<A @A @A @DcvvkknnnpvOM ; z$Z1N
@A @A @A 6A`*⪈{ $~{yynXXX߸qcSwy7@ ^s74 @A @A @A |0ɥ:2uiuM\)[V 8 >e$CpW"PzA:!h HA @A @A @GXEE"%E);&i苤NǑ#GTG mW^ H]8"{K wҋA. @A @A @A l"_m@TY[lEz| ~F+ck;:ߢb
atݩcIuA @A @A "`_ZIWNeENUAv=Ńp~A T@@\L@A @A @`Uu\ddY)w{nOo#6
A zΟ?~[o
ߙ; z# 3Īauҥ6[z]F2@A @A @A`"pO Z3Xq7V'IA#Mbgqͣ\Y]~loȤnC K/^x
28qD'>Ѿ/G }t+}{myy}ӟn?l{ @A A`uujڷ> +{yqq]reOL6כSO=Վ ;v+J}_WN>}^H;Ν;7L6&RMX]laO~rn܍xG {_7zhُ}cK]3' vE+GW^ ;ȑ#k
`¾JyeGg'$ ^f u3% <lZ]k3ȧ)r+7elb gRwJzŽ Y]YmkeK++նݭkFo&7/پ 7n }
/7xnN<.\^~塓zԩab@
A 0cV 9 @"g+A!Ϳ7ѣq*K!B mEo
$8@;_eԧ>վo܊SLZ/ L:-$QO/~wwoSÅ0ofHp^h7 9 p !1/ｖU8c=,Ѥ ~ - 5я~Ծ~Cáp草%X653M`~i"_cS:mAoy [ FƨؔpoC<?OOeggo @؍3V3}6Q/pj`v#:Is'l,!g
[I>aF_}6 laD S@Ʊղ< >ly##|̙q\]5u$5
8m΅:UTXt_IʋIXʽ:NiV8)
VGt6
3|K ;Թzs Pduz U!={vz0c`GÞjUzIerS_7~r7mu¤+i
NUu_69 ؛ fJ&cX
ګk>(UU[ #nI];X8i~7xer@ Q"/[+Bi2
t[~sP߃rv E.i*q/~1/ #A6yƎvZ}`P~+I wU8!pKWaigX A8-i~rok-݁[m+е Ժ_:(lG =c5#\}IPoa#-} W: YʇIwc63w%ZXC ծ. ŃTuL|˝PBiWgx/{>))7>I @
39; Zވy<#ly7v0voY!}Z#f{muy~rt}e~1yj븚ed2 N>;VfFv>3̭ƴƺƻtan0ӑ04vuD/6+u5uDE ' n+-AJN%-:m@\u"*
ҜA)}_&2 ?#Eбۿ п}s
mQ%AC CPΗ=+"PwߪV__9_r7u
s>̥21ggC5vLQk%?mp, ڀ>ڢl&tKm 6DnѶ5Q.ݮ''"h h Ļ?&ǣ~O
Wg{N{LՏ]9q:6"ĆIѶzO >䕕*pؠCƽU&x3}1
ۖ?? C)la_}J~+ד[iz R;nC j")=w£?꠫O?S51_/!D1Qsy{D8W ^Aqi, y.."^v,d_8V_0 Ía!j+p*z A VA[ ئܕv}W m
A[&ſ2N2m4|z#Nn|yIݫ!u"cGm]kFFƳF7"W#V'`, 2k+ Z W|V#Z<ͺX:!pЩ-? i\h9tD4[ g~W2 KNE(s_ |;"~qUDtr L+!D Ju rV!gϞ tjo&N>=N
#=
&2]]?WAI?pEag?sCr2n="
UG܉ p`U [x-vr)E.)'Y~d`kG* [] :nD]yF
b
ZYsLΖ[ cgC}h'HÏdO^xa o]&MҨcqp6߰NyيFٌ4 +wF;紶wYB$suN o뱰og|?K={fq_uKߵ'V/;J glԦEt? Qgi
d>N6m./Jo O} A %)A2xRۋV +zd/A %!17rcloTzukh;I۴3l/F 9B@GBXkFuF-g<Ө xmvCnt 4mu\tt&u.u|}|ar,\::^Z9>
rữ! 9Ӏ::3V8(h ['[b g@K ɫ3Qw`:txIVS D{{uGzst̥gc0[y$
ؔX@؎A% ;5` ;5;=1c&r[KPO2JH[SHoҫR x4A9A`<"=O<:^Z\\#A F@>؎C[WL
A=nؙ;66QRmUæu_4iվՎ /+OڱD@T**O'L"met18ES9L"cStp?v6ئ X9^" z N&{C{ }y
if7y%
Õ%5QD iJ .=#Pe~'Qywd2Mi UBӘM F]`{WԄB+YMb\~#l?{&Av(m;z%MIoPkK:dpR~
})d:XdPskB,OBR 0_{{F*:⻋} _ܺ{9}/nH5 n74}v}~ O+[ 4kfn
!҈A=P:Vj4kdkkX;h[ͪӈp!\Gvqxw|π4<7t&tx7\ :5Ӡϸc65T! V6}_ O:t~*bp(\raAXcoBۢΔ<P[js@:gϞ )%:#a/0::7:] #&E^ D `lUc6 * J-oɪLTbw61uzG K6pE[V ת^d,3%_cBg< G%*) * l~X?\nG]ٛ6:]9sfHE}]m^~ܯɒ ګl:[W>E١ OMNaڽ*5g( +W^?U$8.^mp͝w" ALN&OWp2s(3tUNM!n&l;x,OWĥߋPr0z-LS(Ү]&cBuVu2Voۢ\Z3/BlAa7ilzS?8n7UzMP{X
w5闾Vkg'e(Ss$iL2V7Wz* &7:*}c/mtMM8UmmL~pqGA3Tbz&0ԃuX<[? A AtmiV{! ljޭh@m3hw4.\v
c
g @i1ut6 P;:E:[Ytr</y A0T
|QљF
O@G@W[缷7 t 1/0;V ,sg' \jk,H'wA`{X2H'43EfuF qur ɺ[ĥ~Q$#V+&n5q˓_7a`s-Vye lA(| J䱈$$f~BM*7!lN[I,[]0gڭܱSj?a#hюe*Qv7F? keU.h+͕Y?iEJfewUdPZyTi&X
$>i)bC4o`_ P"6՟ D;db[^>:.- ?v]qk/6 QlVؕ6~ܯճve69A] !m[س{' svVn VQH{dspDy(/sC0כlgyڡq˥˄Qpp]Cw^/M&H/#ک 6]&%H?zH=5sMa8?^i^,ĪɟTZII&[0@{h>Dfz}}g9! 6EB
jOz`aݸ[zqϯN1?v;LZz :
%5HfGǴ iVG', T
|ԁ)f8a&]
=0 J7muoE|[:tTތc-f/#x+LD
N& Cuz cЅ)tZa7 `cXط I٢{RgΜlYS
1[b0MP.Hˀ4 ip1ʉC:3u18ƽ5zN "mcs`Gh"@\e rR-)w.2}jwYer",m٧Akme47!CDl[H2CdIbg\8&4GA_"f[A< ΛX#h?L zJEW>XIgNݧ @,lD8< qxcwĎؽv=XY
1偰2JJωxCވ}[ .Ҹ NG_Lfv^PN)3wBJƘ5w6AN=o~=Pro Nٹ);MeϔŞ 5_[ZLQ(wM^:[+ _|l,<(5.3N7⠫O N0Oȗ++[h?qiK+3qA A+kkޏ
0$A ݉ GYUWQ@M5b555u
s90͝45u15ἕl؟8 w© H!]pƾU::=Sc 3VXt$ى{_٥Mٺ <RC::V"j e+:&lhѵg0`؞șKج2}|3 E^[f)b](}c;0'ܨC K}aJ k@6*=6Gc` IkPL ed+^Q\G&([G/7!h Ŝ@Am+}2v{Q^T@9M`HO~Legΐ5mLkrp1aP~lV+گZ$UFů4e2{mQV{T2kiѷ(l|<w;` A;
y=C2u)Tg bCȝ1Rkzaܪ_Ƶdw{}rW.G;ȏx*sLP wQʖ"?%ȽtHC[Y ܔoѻ~gtPYL#(ܙ]ǟ0w]v =OzEou,7> ]:t=JgrCwwgvJ{YR[m#Li#R[]-| A V)A[AH@
W1CLg 6t
\h pvg"
yR
JK' Q
U:ĵ8 tw"
ɿn N0"{ FGwNf:(#%@Atƹcl
GuPD pvXGo?~5 a)*152 6VǘăB]97ELSOs qW[<9Ýp)MJ;j#A 7bl'?Wok/j'\eIٮ^ȿUG OH
`נvg+QmlNhH 9d^[<ƕe8[u7ϔ7JVDv|sgg8E [ҏ4
RDMlk{&z5)fN]tF"l7N4)&~vln,dlOܸ.bMzE*}rm{P$)CEH5|N"0f+f!l{ ;ߞ_ًF(jOq$n)# 4h Te(azl]P'\8>zBrV ݑ>mQzSRmՒ"haBzK/"<hM:.A: ;z,pu۷w^F@QH i uJKdv͛"A tY|TB~5 "VCld7GvjY H ^:En' Wch'L䬸ƽ(϶+xבVV:I|po/"L^uZtt.~`<9ת_HUxV{&F_
A߬^3"Lq tf$Jm}FGuf A6oz7ojvgIϤg0X4taq~vD:L(Ea L ʂ*Ge @vQK2G2~Wޤ{w
NFlR~܆eKl 360,E*'Q٣vos J!^xa(Ӥנl (>GNJ3FCz
7 C 7u%]Vwk:M]"Yw BoJ~]:O
H9k;npO0GyvMT [;C:v ]~YY(le.-]~a xm~|LsN(`Ko/~,~1 w^Y< ~A:Kz0)]%~C%! X&'
*Ml6bcqyڝ"i݈O)_MqokzSى67NjVv"} 5{G@/Eݘ1A1LA FA& Y) ƻYN
ߍƬ::
u8u64u>o :1xfPHcoIn :-il K:9zzuH5.9(y2@ UsOIG 3kZgTbئt:tkAHMR\f
szIZqzr6G 06h ̮5ZحAGgvٱi6ZoamWͬv_ >8+ P ( )F+gqOyzW9_ k #)}&2N٠AsDk=gkUx7 5PT Sh|+I& jK6-{WBy'" _ZEF*K[,rT"΅rr 8\_J'+bgէ?h ߞ#x2kxN>sPOsSZ{C<~&Ni flO<l]JgW:W9 e2<ؓl&k}[q#
ڤ-e6e wx` :tlT[zß;:M wd[~[.> 4:m8ȏ0.֤79*<hwE䬱(lf
OkYȇE7č h'wNg.>l?͐ x A 4
29#tհ6 A7!t\r_Z'Sͯ: ::)g8XԠNl5{::CHV
6iUXOX^ ᙎ \ .7:B~mkU&O
{3{aԚ͏W[H<WH\&KKE@x/&b|RV+ԏ~.asIwu/e_ )|o
h-rDWF}F @=V vX.R~ [CB>s5Njww<Vq+
#|R(S } 7y$.ev5, gzAev2G١.>GφNS{VBYf\ȟvҬ=鷾Ml6r6qZaSm $ 'kcmA` }WtlZ;l ik"<}_v@U_ª3cGڴٗ:ڪY0[`=s_8u'U>CH2lYY#/)77MomcS7} ;-z\\̻F^WH9NȏrXt.t٘xJx_=v.lDit9J:>enh+ r'D~qڷQ"l+| =W?=ΕNI El?϶F֮罼>ܠ+M=*
k] 6b;++IZ vfkXpPס4VbAd
^
j@!65LZ@=S1
s
~Mu2e Y i^NNgV"EX:K:jLHΓ9I1ؔ;&:]:v G6l8h16A?E:: zdBA'&;:p蛁Y6];&?_P )M`k l'}3ˮ-{v60{68 0PzSUi.nG+o
M_D [oDKVʨӕI&q`SG@ /b۲3KrJ9ew'2D,C(2ABbpRci?@CٷO<u35Q{{:6*τ]}ohժ"E'[9W*L42&O:w./
P]JՑtL?6~"1) ~&#܊YlX],^6&
dH[D|"q >66-8M!c!`a{_ՇW5~wQrd60+egΜޟ1proǽr^3C~Eu1aCaӽSQ/RzZڕ&;iT?'dN[MGg¤l-ƘQ~Kv(nu#~G><w&(͟9
J\ vtFNb
h6:-έ<OaL
h-iƺD:4MYiLｃNO `LntHu*~on DA'ـN<=_0)fW: rwPMNG] t#崲 F@d` (4 f Op / uٸ,F9@G9W=C WZ+=
mظU/ʿD{RfHU2VIJ){"A lkmGL2hȄCm v
`-;+C϶ٴ8vxƆ & qh)la*?)AZǽJr@4)ln`^^ a D!<yV1Θ@OWHvhO{d$czOE;& J龸\IAY"6^WLf<qNL<O6 :v
Wq'^{&rlQ W|&9\gbĉHS~I2c3L|wk"N@ͭ -Qz3mDzGLVfn;'78ц+ڠiՆ gVʒ;̝V>1}CcC5_4=bq><6rχ@c7S iw A 5B7 FC'AC^Nƻ
t K nt64'IUnGseANx4`RJN Fu$
"A L
zk`șygwh҉$v3DA` &0fpIY eju:`@$h@{ F6lp!
Ԗ!N$xQ7o ?ʋ Toʩ10(c-ln^"l+M<\}S97Yl 6cv'S. "F
fTF-AhS# [ۥkO ;ޮhs(;]ҥ< D9 1!_[DVe3 ԅoy{#N؈HM:H$;[hg7:i".rZ^_BwH]*cc+oG;u9Q#ؕٶ zNZ? @ IDATQ:4J l! uln"˕ V/ 2m>w3`4n'{эr̈́ G#r5*1^kW읚[
g;lRKV7<Va*g# SgE]LUl w&<#ڐe'mƎ A0 ݮ&Jڧlt; `cҭ{/ޛTytA ݊{5IwA ht:}S@NƷU
PHlq3=0tu(ulu"9P#J c
"yβ{ 2SWA $% "Gg:!1 2@GGo fO9Z` HevD<҆%pP|g N>3D)G4ܨ^Si&MEԪq} X&bDe?Qՠ vnj<Mkc #m݈!SI8 7[ܓ ~V)'[+/E(A٦a+W<s~GtMG@!vmO7D:Iozo/.đ Cr?¡t! mI-Wa5kŮ{ bP Q3?n؊"l֮&?h"H&F 3yѧjy wO?G gm; `e0Hx2klA\y t:(jG'3>vO`0A,e-
:,ӄGcp',~S=cʿ&lB[>[WyO 3
A`7"n|kIsA`!ã3oƷFh "A"3Z%q&F)a%W,ot#
"MvHOA FU(^ w\O
;~XC6i퇱C[Qw mi"A
XiI M`7wZU lWli):[# uʵIfǃ~Ɏ"AN˙N:&Tq4-n8F&:7G~_1[ l8FdiK5}?[6MB@R"v Hȗ;q[mxaiwUd=ϬEҍIUnUYZ[*J\4)l`E&^0K [.3L~uĕg=R' '|ҽ 0I2pꞲn m;MճVr_~L>ϐFm>ﻈo5e7=tSzMJn1*/{iַ5 q/ I;C蛸=xƝ< f8J )7aY%~Wl w ^> B @uVc^FC\uJ :[u ͨ˿ˡ3#iPI?ܥAR&>HFT6MXqtI'ѧ|wE}7oe$`QH;;K?oc~EX-A0rAFF8M5C E@
DX*ߖVK"Qe+Jk\OtS } ϥX#Mg
_a!
q54.A*g
'z
GAaּ~sCwIcF[xovo J;tJV;+_y?HX+ C<=d1aLCXcFzGG 0<_s/
ܛxm/[}?A @ڝ >B@ u(+nW @A zH dXQȦ7^ݍ챲N>M'rc2 adVVV>~կ0AEn#LCv ܛ|7|jZVBwM 9mWmQ72- KVBow+[IhvE ;z].݆!h%;iWec{f~fz @A !df5ٷy>` %Y A @wD`x =AD1 . D`H5C iw>z[/+7 fowV`Hޕѽ v@A =jfTG@A @A @}v g[{B;uo;跦\Yno_ZN~<q <0.-/hחֆհ "Zavw뜃@A ݆ B6n{kIoA @A @-*O<|}~5ȿxzpu-[$~Ǐ# 3ն\^ >>1vv /];=ktu4 @A @A @A 'h( i]YZm}ir}ye PmI|}B;~h@ :箮 zjDtvu}y]z@Z['"9@A @A @A E`_^ge6ūo^:"N-;zБ
پmak<^}F[n^zgCZD O i':{e+r'hs-*}QFA @A @A 8qYﺿw,Ws!Iэ-7- f{~ON, tlc'sjWʞ> Nڞ
rxmyxZUzxZgtb'Dt[<
A @A @A !`څiRޏǹ6; LBJe ߮p|;wBNd 7W.\뻣.Ew; Fb ;~<zq_i}Ez
;> #}c9,-7X:A .ho_ю<>_\{āf 0ֻ?X+/(n߮9 @A @A @A#`w: b7ff;/2;7?_5 ځEh$5nr =O"=?9C]~sեncxyvxܓ'ӏ sIEv<rp$6uyщ['Xx7.t?{oo|c{8ե-~ x@A @A @A c9!}fo ^*#IVXfwuk++miZ[xh;Wn&o,~_j+]қy]br?; }z;UAWηg z
{<L;wkSe/m {c- 9~<2No^|vM;Uג @A @A @A#@W<c(VDg[$} (fJk+7ک6>?9-n7/ly#_.{o 0VNxP_p9?gݾ"h7{3ϊ^*]dZ|{^@k&`ya~a}va]7@A @A @A xژ;l?6I)ʷ<T߷/ <oTzsl[^[$b:
!;K A{?}jԍq>emk8؎ uoiǎ ^w"wcJ9Y* @A @A @{ y7: Aމ 9UVZ˶ԉtf*Akf\XbQȱ}l7vma3
>hU8ߗϯt @A @A @A |to_{`wܻ}^W>#h7fS[}_}u}&a [ڋo]kK7C6d_5'ݍ>cXu;*A @A @A @A i;v;1~B;`껋W^ -''N l Н Vf> @A @A @A ֊پ&vgf7ɃЁvr{r[fggoɍ;'ډsÙ~{{v3+A _P ,--/W `˽ͶEpG: A`7#27W\i9+I{ m ;]pa6I Տׯ_P$; 5] >|J;./-']kWWo7./}cn]/xt ~_<@ מ P XK.&YA E @ A ouBoD A ; ;
%}A`w" ZXW;!˷kڍvuiecGיNo 嶴~ז /wbvuui+@Z{?<@ $0$A`G!z IL9 ;9;U$!w@ z8y %QǷ9-Em^Yjk}Bt~xR}+hom\p㦻mliu~9 /sss< -Ԏ =-w{IR^FN]k mHA~"1AT ;N~ID?SpV۰ 9Hkz溤t7Ӝz.%gzg>>J<p㳛]_pq^B sW rD ˭qn)[ GJ F7復fݩ+<)FA Y4ɓ'ذڳ $cA`!cWǎ @z/IJܸ?s@hD@ aQAj;q&{6 'a& p?P$ݎ i'憅dâ>F9s3\bp` @8o2< n%"f~DvJ9^zps{I ȱةK09wೝ}W$ÑCsv/Z:}Gہ|RygSI0z ol|&9nWֻa}Cn]A {7Du /
ƶ8>A q=ۧ`3 ,s/NG`RWS?7G?w N- hO >fϵmѹ~̶ {
f[ummc kf:669ɷ"SG X< RߕkKCyn nHrX;||k;}`{ڹ}guO@n">ul'O=|`;qd]\\j/t-vu}S k?Ql'>ګ^iG j_ۅo cN rfa'f l<bu;b> zЁOtb67[n-lSI
f/C< @A @A @A& ;މt؛k;zo3~lO J VuV"Woܚ%E4ז~<2 94IjW:sC~~J{VގbnD壝<cz'//l+`=/t`@?Nt t"vyt_IWvsZ;Nկ ֖|}{<vpÝb'op d#'bhOj Wڣ'>u|x5ty7 7mi]#h sO ןϋZ+Y~ >uJ_Ri|ĞvOd. @A @A @o V:vfV +,;ox@]dKWn;O ?Է]갪
W\'lC3Xm ?z` e S!i;on'+<Po/@"鿹E:fjA3 ;Ԯ\_mW;%huP=1 fr':z7V++D~tvڍn'Bt2xAz+>o>vcz;W؞[ |'w]W/7_ 9~p~{G=?+rK?6"Dw8zv}eNvz;Ws +u A ?ԉ=h~µpGTf!hM@A @A @A } stH0DXh흥vmjΠvn3m=R?m]g|zs}Bx?Ƃ to0;{{ba:=d",f@fEfr'@3J㇯^+L' 9Ҟk0}bڳm߷(z}iXqj[c/6ބuXCGr_|Z_6E^N<y@\n:y;+t7: Vǽx*}}fu YjlɃAq&Jթɧx+\MRm9!eG5Y%8 1i.n
n$ƚz|WcU-y"- 3.i 2r`G!\f2wlh0 eFJ@$ H@$ H@$sbd裣!
8VNČ́P[(v`l$kirLI YގW~V_8Q"㣨q}6f2XFv*aĹ?p.9B%Czc'1{ə`5 L {:ߣE4E^
, <2x ;LXƃcƫ!2p*~dYb2kՙj"f.T&2h,cR,?AfVlXyWu9 E"coXzǶa,sP(XΘr;^L=-̹n5
ݚK$ H@$ H@$ %]Lz,BH`
o`F˷L:
`bf$x,87'O*RѰsl"ߍo O=>Hy,ˬr1km뫦C@en { L QC;lRf~ ;GvDzM
Xs*LJ0cYs,#K,ٽ<Wb-f:o{5?hW؋=D\7f\ _pLyo""GTr0wC;bfR 01qfReu S>Hpo'ho*@Uib$ H@$ H@$ H@6KDzr쥘8 "Cfc 6ؿ\Mh6 \X* خD(3dWg"-ǟ|{u`3#GcdqC12Qjf*Ĺk! څrfBdg4}t_v
Vg]Fm&-{b8U<9 ߔ .NW9}:߮71Rf P̨-yCLۡXz|d%_{<bps:߾ 3uB ٯlWq^luwp[r8P:,3E5>aΦp2A#EVEHK$B2zqz#ƭm7i$ H@$ H@$ Hg
֘86 Z!1ru>k]+~
DoF[7@$./f6y/ =PfS·G|FmteLy7gZ9f6MwZԛ*נŵUj
V\A< ѽcG!22+!` aj[|C! _>W}K%?[9{:w\+
TG2#7yBd/_%v!Nlٚ!x,V'KAB?z{4XD2z)kRH {;3g_( |+9i{7xPm7i$ H@$ H@$ H' p_|61o)4f` am,χ"I ˪dONϭrE\!*-1k%9 nh;s
!@GpuG"̈́Ȳ#$: 3L'bX۱W/qDEDeaTDڕ0b}ԕkbpXuJ7fY"CDdGoGlU?a(S؛ D>!Ά+f"_٭ċsWW݄_oT(n9LRn$F %ܙH' k7n]& H@$ H@$ H@@O@B$E3: Y!}:K 8VTb2a ǵf"D68XŊV,YK Qk "B,lfP ͭ;O_5 (3oS$}Q)#ݓ{WZ7A3aclX.:`O<g:ߡ]
lXgb Bz9? vKD-aq%쐇/LU;đsuSDD?>?lnãb1+w%8߅ B- 33g>\T$ !?\r K!q݄j%j{h'/M$ H@$ H@$ H@=N !n6C SfŞoNŬL9WLqRbZżǁ8eGBD9T ?aC}MyZ&DHLYvs i3>Jo ɏ䏛?8;U=~`"f~w@|㕥ɥj:f>4moƦ .q 8 Ď wc43T/\ 5@1s/G~'ϙbp̂=q
k>qI>j);82j,V[j8HU|tk)攚6 H@$ H@$ H@$&b6'%c8م`,;4 "ľtt|$fpecܥ)Pl:Z]62Cq!,7ƒfSo# -*ތ-#fn Ƌ^
X~uògB}"Z& _@{}n j,T 3P"cDf(fn
z4e
%7_3
?ZWKc>ߚYfV4]}9-RnXO K>WoZ?PL|3xÄ{5]@uYj$ H@$ H@$ H@U`|Ct6> z1ĽFcR'fS|Yrȡ
DPYC0{3.HȜ!Ex ;b#[)hkqW;lT@=6_=ux{heX8ι(C<M90q|,|1[绰G㱴k!.e6@廴',Wf/
?/̇X!9m .3b< YՈX
"ޮ吆KY#÷)ituijZ `̬ĵ1& 7Q5s)n,4$ H@$ H@$ HV !<P,o\ ^kg)".UCٌ7 :Y| u5>CZV[MwX o
E&NS&Ì<pAHdmK!vf6nH'o, OLZ P^ٮۮTC] KA 1[y9ȕl>ɍ|L!
5Vb]<8Y1tv=(&Ǣl6~gf ̀e|?8Vp ^Nr1Lq/
ri˶
]&G$ K`5[ H`(ZʞeDarUa?_MJ@M eFZvv<zIbکcVvL?Twf[ìS[nl?WiKv͒{/eEqbR O,p81_v,Ya#c(j-H~|s6to|of Bp?a
Ǐ%x÷n>-f,Gdž㻶!F-WbfVw)[ڵHv0hns57! 9Z ۳ 3-B|T,3<\MYΑe¼e?87]Č+X3>\2/֯&>2aͰqc4e 3>4:5}c13f_UmGD,}qj!x^ ! `B.
7-! wrd$2K=;h# M$ H@ @
ܩXXNMMUofg}j۶mv;F:D`qq:{luʕrs <xڽ{ws .jΝվ}J O?e=c HwP\t:w\#vB=\_o]p|r7ǫW#5uڵRر;?9uK@J6ڙ3g-xll:tmu,}7jϟ/vGFbhڅP+nŋK={ȑ
7;K N{8܈/JZh >|Wa]z{9Av ]aH[)vKz{)<8}'Mچo 0yIs
;ٟo_Ľ1}혒=14Xn-K^ !toC!l&VnPm\[fBý 36w Djbv1KQx""3p"[]9"0/B+Xx3 Vj
536G}K :[ B]N]ƹ'gk1ުX̘]bk쐻,ը;36_" 5bw K!.4K9P: ט){pTG#>3Ûu{=-UMJՌqr2Č?ei`u4Nv,WMh$ p2Z;O4:-8[HC\Kq>?q$0 0OtPŇF.7?| /~q}6im<G:w+/| =٩}y`؝%@fĉe"KOX "o꣏>*Ww'/A ~믿^<y!$ =3Φ\$ I EC}C{Uwz#nc|<G xrH,30_e9HȀ=\i]H@6q qk"#u)/ ?~g?[wأ˴O^hQi=m2z>6__+
b)u:qqKyi&ã?+>""8!EhHxNLNNٳH7ͶG4ַJ5o`K˗/ };iC^// \vwI'nFLӅ?քu?GkݼVs5f1^r}fC|t)fe^ u.fSR/GO\[fy6c2f=
Tgb+!MJ3ܳ !1 Rփ} 2+ ՙaS]fB|]DbBBpZ+1;1;IJKչM{1fr
:?5[Mݢ3 %Cx-"mC }rxO /cO] K-lf6uwq{/f oF]č"h҇`3]^.:'Ց|pp- H@T8҉su'6s>*vqv8> KQr~9>?뻏?x H@ xFS7۵ݶo+{g:tT. _me:ً u:LȨ is[ٻݺ}eЩ[ lEg(ܻ JLf= 2c QeoY
}^z" 0SN?9g H`3T Q7\OZ4Bk^ᅩoeW_} DSgR ru?P~I\qP~+?ֳ~M?I
C<V6G=_K-B{z *}|i?QO#"rѰn8GL qe̪%Ǐםݶl;SK2A;* s*'}]n vx.>? Lەg
1 CN tÓv5aviB?%/ ~h:8_0vឆkYyc㔧P㻲#" ڥ34OķJYx*D `o"ދ[%{m%">]<ȸȗXx٫#';;BK|bK\_ 7
(pzo~|Wu!A٘;P#Sk ].zW㰚ϳlh!WTSbsC#>"|^ qʹ?mZD͊em$P:5٨u1K(RYBd/WyveK,$ N ђ_.ADGe&&&JG:|JH( BX:}اcLg`';U_7'|Ooo e':l% \#NtH
vc/I7LX-'a §;bttRa(&L#\pߘF7~~!x`,#\.9$I#F2|җT~ 1,Q 6f(p GDa7gy۟Aol7Ad\W[ m_eb^|3<+0?b'A\3?hP1hZ,Hp69EMM6}w}=+i"<N{/OU{\ %v7d↟ącY2ݔ _O<qvB'3c 7cǎzQ'?_(
yJCǏ /q|ភmXUY* {NR y Pyy < ?Oh e /X,)DFLx3Cz@hm'D8G^WZʼJ|iwONN87i8G|9? 0qm%Ίp`(Y7KJ5 ,"X><ƩyV] ߸Ysz=D [
er9~0L,c!+rxeo΄Pz=k&~/F^哉<^M9b<asc&.3sK XRL&v3f"& kZ;#F azA[j5DjV+j'+4r/-kqLcٱNjq H`KCXy#F畎1<HEo0Ȗz 7xt3y^x|h?2BA:\)2I'N 2B$q=#>1y:~.r/@! zκ!{t^ 3H` pR8t
vpGXƐ7 q& F:+B|H sNLX!"%˴I~:Nc_
Rt S#D{͏:e0U 1u^ 9}O ݜq uI I}O yn%nU{;<?ftc߱G{:Hh7`xVA=E Ì- e @6 FD gxy2(699Y#X<ibp|3)=!#f_8G?Eܓ܃GH:q Ba#d]$YO6KzL[ P҇E?+he[~v~ fcV('pQv(WOa()z0%inG'Xč>wViegeykL#Î|nsӏ>.mVOHmMI;g >0c9?p
?lYw }g]]^z-.8]w~ A 囩-[(? nr잺R p"W-goqtL%ԒdtdF
džbe l9or~SFL'7b @4 Mn% . @=DG7V41@,S=Kr 7)@D L: C-Yf@à~0+* 3ޥxBgAI
Z:t#\2f@z9cH'ّoU9:{A$5438@ ÉЉZOr@#: w:1 XAzLQqxY'? 3t t + ?'|r-m:~AH`+~eL?(gU~s_g; Qn^>e0g 10`uF-
A `~'IP@8ɛ3Cxv K!.7UpO}Ev2^LŁd; ,@{6c-UhS#\qO7)viW#\ޠ]sYhO'z^@9 *{?.h?G; ^gp?/ff NҎ` <?Z]G} Kq2z9m5l#}ifIWԻȞm@ڇAC @ IDATߍ2āxNݔFC'~ăd)qC9$'"eYYApK>v3q_6}G J;'/&&\=^h ?i'c=ܧq.$Wa rB<6r_6X@\|T:GzzG~B ) H@(9BLd t@`%63!2)d`B|`FƄx5~0 C|SLO:tLc 2{$1, '{=t$N abrKz߿ۿ43OǞ `rY.CĦCI pr t@Yz3' HR M>9o T`.i%F~ 뿖-ӹV#@yg 7(8 *tCH``n >^ .TG *s4@o. A0xLf@sIg.:u])lo ;E.~d=ṕV%@YyJ ;3EZO;!/ vqO2"oG?y
yq9//8"K8O[vF q?@ n8}J>/*fh!'u"u,gÖ)В vKaf)nw7e?D+6OLnA ?
?y _2JGO!+?҄ wY~[
qoM?62
"7232#2l= ,q!}yaL蓓:yAܷ
~g^P_d;x t@
NB@[rtH@#:w 2#Za*A-BH!ҹ}饗J M:H*e0B Yt:Zt9mh:vt&laB vt!_~6J:yp q=a53C'pb *' d c
F8Fcr8NXc ̠ gI>1/IX#F2 \ğ{ Sι@[+
~|.%D$л+m3YP`/
91i'ح?ӳ]] 6-B<i?M}a$\^
ef"/:bhϗ4v?/Hpq/"FJ7ik@PËH 4!~;u݄Mn ;g^.JahQnY&_}o4GYHqEEԤ,Kɲ~FIXFnN}K:n^t`~icxu;h }nqǖ0S^3GxM! s}A_;))<,! \'n }?6>F^H@Ln}*m H@6
:yEq6;@t|Z[l(Ӊ}{,GnqKxt:1tX r0tAcЅ}dx4Jfr\vzu?L} 'dFK n@s?3DLs
s iE+LI 8Jq7 uqu% P~a ^n d̼:);np.
ܦ=K?r[$ $PC\y_.G=@ A>k mzޥ
L C;k9L{{=<s + a1~8K7؉~ObF'L$S~A4VfΒSQBD xYcDfyZ -vpC8 @ڏڕ(a|*\) o
-˺Y>[/^_wK ~#m]p$/ q"p˿3/ӎfz f`8/ŋޔ{ˈ!~54
(+% ̈qvn% O
~K@ *Ed /(0ssEPgK'wcR@a`e gd,[tT4ӑfЅAfҡt$gXy̶#i/r
Ni=Z?NDŽV&}K
,vŋ 1Vs :^r&VsR}KYG} uFr?SP ,vvsvgu-O؊-0pCg13N`{e6#0# WO>qJ ?nSd_}$>KcJH~"R2ՋvXV) !"~2!pz iarA 1H0M^$-H<f١ݨ! iIe2DŽˋS,lZ~FD%}ДLW)"f?s
Fo)hcu}q1!{#8S$ B@v$ lr !:?tz 3H"mi~
u Rr
H3Lyk*[ytx7u@v\=^3y^ˏ&3 d |s.Š staOǙ]ݤs7k6;0J~ R1``
uYo#إN `R`z3fd$ Og4u3b 㼔E*N@G | Q#@Y#ZR5=}P m<ϱx/Y;8{<1N[CJxa7(x)yH&?y0"")3D/V]Wi'wm7CG^z2 §YsO{nAڛ<+Xr
1[HH?QCEc7v鯶w=;` <\$-jhmu{kܐK>em<3n% tm'i$ H LѡtBRZPѩd;99Yᖷc;:Kaw>xS7aAC\N#,ob褲/trE7: ^aGZ|6s=N{f&XQ0df*gRĥu Z43M{f<'JK=_/w(C })! ePs3EymZGZ: Ĥ|Ĺs0vdg` qq" 4<h}K6< 6>] /cJB/ov RqRܧ}ݎi{>8E ,͚}$38=Kw6yuapF<@~ncpO@pMd^j4gc^VHb$f&Zk`9`DŽGދ?f2Ø~=}l?opk80F@J@ ~;)G?-uW@ϟu:6_QG VQ(=$ H`u<|ㆎ +3S"oӹM% Ybv1L `SŒH?\#|:[FdR'N vx;% 1
8Pa #.LߤǽvN7V:؈G ڐ&:āo4'\'yf#ѩE,'θawr`ᗿeɏz<rd lEW+ 3иo b:9V{;A}099Y5fp/28H{ jqqRwi$ 4L@ ?#f _i{1M E:E,N];8إ-@7@./RQi s_mO2+f"-mzմy4C6qA$x8я߂F r&HڍFoB?*yQ=CmMfR$/[9G:ݶe 4_&福)/WC9A{z2ÌaA(G<'Hg݆ ;"
E)o fcHY0a|@|f y!u
Zy=@M;KO
v8rEDy _+å[@xѺ|sh\2$ K ~tiBD`@O:Ktytr/b:at^9G
v ӡ
$/BL ,5:tĿ/$" G?*a mt'
̚%Pv-96 0XBgY5OgOC8 ɵV5BaŬdQf9':ĕ;B !a* '
t_~ʠqW&Rg:J` >bzsu1B p3ý=`EC̾E垢.~=Bs{5@oils*GΡZ 5,<y i(9z;GLV!C>`x"M0 D+^bF/\<yE9_#l} ^Ң_A> m 97[I$E)S)w7!?`N P.(vv5i0kiӑ_p}F u?K^4^` K٢JK6DŽ]d?
#,SS }B̋ Ww[m3<z/Dߜ% Aߒ&ܰӌ[ݯϰ5W<ȟ'jǽM_q(< Ym8vܓğ3~Rj zךKUb~wupl,kڵzkB_b1Eq|̭ >8
A7D@S`ť+_=c t)l4m oR2Hޥ8L <40 '] pN]ڥcǀ^c
o !tX`@ ,vx3AԙI' ,""Xbwi ?1x` i!mC qC\ؑ&NGN3` ' 08Ogay8ikFaI# UlS,f0`@U1%?8g>k:tjI#2| xO>^ҸӰo2@u x :{{r=Ž){/7G 8 >u!?M:Oӛ( <gh'LMcO?rà;/}RP/'mk=
3CNua)<o)7ѹOyGϸGٯ70 Gp<m }G6m?wц ^&ާ͑;~v i֍< qKo
yKSQVny<o~
u& m4إ@>S'
̿OF6 f I{( MvKڥwcڸA9'oΏt&3Mă{Sgy}~~c~=;5g^*~g"ĕ<& Q#y60I{ 4l3;'NV#'_|%W}Jc`u[lWƹؔ9ΦE;]h5NR
VQ/_pDVb_1X<uudT!wP/P.
188tk]y}}Ulnѳs3` TV- l}ـ %ϖ=[c" ;,OHw&" 7fᗝz:xө9hH:
{tif#OOe??%{l19B8O # :a\9 (a08߬_p"' pPG: i {/%L^vfNAY ~<Ip_?_{>p/q# ufy1mg: nGZ{!]/
j8gyef#A[-Ʒ92xEZrqpqoqO`/)K/l7l0L|tsM[k<y>Nh,5#أNsm>3噏[. vӍ&@l7v9h(۴ay6N+ɴi ן#i{{ùls?f e; L Ŭ/u>V0mI u>ag{\?MF F:v-ܒYǙ>,~cpC }H6zm5P0Gy!45:7#M<SS6(#]Np#Va?➣s6>\gIX3
u%Vvc` Ɇ'/Q>Cش`[\:?o_v gB@M_lɇb[|9L~;yxslj8ޗ3<T=c?Ss zt&(wVO ] /G|; ԋCn}{UwRA5 H@? ҁb)"t0ؑh Q8;@l 0 c:qbpY:q:Yc`1= I bnKõd }Kt1N}lv n3̘q08d\D<q Fy fd?7pM#H;,ܫ# q.=E ǵfޝ$xg;(z9m H*u 8Sed=uwK`+m|s4wI#ߚ=[3Wb|%Xo٭s,D^'bT}Ȝ8>Ϫi)^c?}/ 'ǬYN¸<f7i?Q=dQn0ccܦ˵fO}5u?n(gl3wL<[rw7C,~vcC1"0ic!~՟ s7q-O03K +>"mhkSd~ȟ7Wn"0m}vY"}G/>yzr1iT6J FG^ols(K@$U;C9 Ag*
v|=Χ i?Syk/ZOX &97vq<qiv>ùSqad/N`e9ZvO^mvmvFOX/c
ff#v"f왛~jf/f,=a[fKmSNO(K拨sGVā_=龗Y6 d;
?
LU=r|;e3 o'<=Pv7SXLδ6_iĵ1z̬##աsG0oaZݒl*̮`~wj{09~pu%HX@Vz. 5$ H@]KNR;&e'orrNLn mn a]H݇vÕ$0zNo滩nG on8(?sϕ"z i`/E Ӝ|mUյqAtp?br S{-l5@g (vI@$&:M `m0gi_;RmӚ$ H@$ 7o?wAeIV>`˹2͘i$ H@]H@ 3$I@
: N8@UrxJ@$ Hwd?UޡcJ% H@
wCM7$ t CG$ H@}$`>k Hh8c^mcy$J{ڬ\w';Y5ˀyV$ H@$ H@$ -4ŕji9ؾj/6Tڃq/ήėhTqܿTZU 0} ق?(n^}ހ@ VB*v ke? ](nu= H@$ H@$ H@$ 2I[frk !ֆ~mWa/lwqoz2M hB/\P]r|'bϞ=I?|uڵjbbBm333ST{-[˗/W.]*"paRNrX$ H@$ H@$ H Cׁ0c qr0~̎E菙q "l8Yέn?@XWܮRޫ=ɓ'VvjKD3gtΝ quj( .-qO?-".Lj̴MS{wGGG#;[ H@$ H@$ H@z|P4Xt)&SO,.nGUE Sm/@%z!ݦqcX<q,S\V s!;^Z^۷0>Tm۶"ȦHK \$ H@$ H@$ H ̈́f%v k{4^v9a 堋X{%]%i+Ǝ2ro0{F͜v'hcYfbX/^XDYnVEF`;) =z̸-OVvyV$ H@$ H@z BN>]ƔsСCerzTpX4n -+:u;fX~GdO}[ ˘(J G3hW-٥@rOsP&8"-߿:{l---7--y\9ol(h$ H@$ H@$ 6f!-c,m||:vX /T h9X竗^z
&/bO ?.a >|<Ė"y̖AEhf8 ^1h6pB~2Ҿ6WK[=
7&-[H|%QY-kF K@$ H@$ H@@w`ʕ+"" ?~:rH0_կ~U&2qgf,Bm^_-f/_\;իZ:u3z葉1_9d gm^"i|HZ;]&A}fMcǎ"mpԊ$ H@$ H@$ $@ovg)ٻ[fže&""""-LqOV_WքVaoϞ= n{CY%)ތ{$p (ށ0sΕ7eYV%!I2Ljmyk$ H@$ H@$ H@@hO*O=TWs M1?{""eeYbVzd|e}˪,k'3%l wfH$ <X
Az̞L'N'?#в1ߢmuzI$ H@$ H@
ƒRgf,zbbr 2Y4v9F`eYbt5cof o"ܹ\?_! 3iF ,ho$,"-y`psi H@$ H@$ H@0`LVO?3siƣgy~~̈̂E}뭷*f2nͲ̠=}t|ڷo_u~l5$ @GYĖ ; ziypdy 7,a|@え:o*,[B7o$ H@$ H@$ fP <Xƫ-KL1b,b3gʸ5-bw]N!kǎ } ߰}wmrYq mxyN/hyl߾7eyH˛B"-o%pðCM.o!҅ ʃTX}$ H@$ H@$M ?^} _~U/2̆eIBe3c9cַʘc=VٳaGɲ̲Eo$ <\=#F <Ge+j>a9 k4=\!r p Ϟ=[ɒ H@$ H@$ H@2#K 9rzX3̏?xu""Ȳ rWƫ/}]#r{]?2#F H@ zB5bѣG˃A!-$fv*1ob-,x1ۖk.]*ݻwMM$ Mj$ H@$ H@$ H@-#8mf?ʌWf2Ɲ3js"nju3 |/
v.F6h͛H1LWf2;3ceaH˃ 4%#ن ;.(C" H@$ H@$ H@ covӟ]]b97d^fblƶ/_\ƬnO8Q] 3$"Ʒ 3W# H@@O,U˛E<xPq myĖ~1˸
q%cG# H@$ H@$ H@`<AEL~V=3eiW^yɲ#~dYn<P3l(3?s5$9@y @imکkJmu $ H@$ H@$ "4g>7߬eߕO!2+_rqLMMU'O,ڜ{G_|կ~UkG }T>#~__.C H@xzR#n%/ H@$ H@$ H@ Xz//cǎUN e 9RVFp{7Sfy=M{իW\;zh0R406 _۷o/kvJ@@g @Y& H@$ H@$ H@h B7bYxii FGG˯vW>>@"ر}'7gq ۶m+bo3 _~%q_qӕ$ H@$ H@$ Hc-adVSL GM[sʯVU_% H@$ H@$ H@mXOHmvϵW % H;띾I@$ H@$ H@$ H@@+
x^$ H@$ H@$ H@@ (vI@$ H@$ H@$ H@hE@K@$ H@$ H@$ H@0; H@$ H@$ H@$ H@(ж"y H@$ H@$ H@$ H@ &@az' H@$ H@$ H@$ HVd</ H@$ H@$ H@$ Hh; T$ H@$ H@$ H@$ "@ۊ% H@$ H@$ H@$ tm$ H@$ H@$ H@$ Vh[$ H@$ H@$ H@$ P0P$ H@$ H@$ H@$Њm+2$ H@$ H@$ H@$aťeZ#-N`yflW%orb9f1}\b1]}<,5C#x6 ?$еguM}km$ MAfSdhA^>ٯ pi <4χހ%:&R@E*z
m .lXFǜ){Az\F؊h|n4g t G^~,,,TKKKݒ4! lR;0;6ˮ$ t@sPvo=@ .|4Y4n&@@4W
Ưo``UYPJ $,Yr,s:PK̔/ ɖ3 p7
c rw#.]T1$p իWm o/ '@'_@f&|>n\2n$I h3R<XPJR"qBTAٳKw89Fͷ_5$o߾ط` gsW&DI@&$.%@}ӥee< HA@`x$ L`lll3GϸI@$ H@$ ܁@ sk^$6ڶQiQ$q67L$ H@$ H@m7i$ H@$ H@$ H@
,[?
{mOd$ H@$ H@$ H@ իW"n۶itŧjvzSLr
]&O$ H@$ H@$ &<f>.\P
V=X# {OΜ9Sٳ:vXH{3smf'q~̝nP= H@$ H@$ H@$ugϖpp aaR|p9 9f^~h'T'Nfgg&q&m#{?˗WѣGKr lM9{K<yCʹfn=w+[yx$ H@$ H@$ H@ b((CCCd ~X---4Źz
, ;v4vq_կP8K\GuѝwGvZ<11Q 9rNS|!?}"Gܹse4b̈\ڵǯFZ/nh{1M$ H@$ H@$ H@=A э"}E`cΝ;K.Uk*@RdELcl7X_g\Yqym "g?55UZ ,KOcf,3) :y]#oۙM~2kQOI̯Zpzm/i$ H@$ H@$ Hg !!!!"]xڽ{w [ [q{}"#'r7L&ݧ&of1GsG,!/?K #R0㏋PKxux{2~h{9M$ H@$ H@$ H@]E q - B+bܣ>Zf""!!!q B "n
|?h˖0YvYý<$V oYÇs┍sNr~\, D[f2|"(?,mL^b(o rSe KJB H@$ H@$ H@ ?1~\-jzDLKQ#!~+_fQ1lAyM "&oS{#緀 `| ]\ ={\G>"lzjThopO$ H@$ H@$ lijauy̕+Wn͘" "K!#i&DP{B@e+'(B+3iRSef3y t{j߾},Owfϝ;W`Y[Y Ǽ mc֤Xzwv}$ H@$ H@$ H@xX]xlID\3D8m jP B;yˌWTf*#ڞ:u,]`K:ߥMy %qY.w
[pOYB~~, |I~Wh{5M$ H@$ H@$ H@=G AG vUD356tASE<!&Tfb'&&?9="=Nj ;_!"G~6#a1۽{w@Ch{(M$ H@$ H@$ H@M 1o)1fk 1; ,i,XfҒrEe65/gr ;<q!,XW #CнvZ}3 ,5Mi7Y' H@$ H@$ H@ B3 1 LˮNx%~\_5grq;/"l6-"NjrǸn
,3j 9RXF= M3-N
nqFwGo|s+ H@$ H@$ H@IJC%m |WQh'|4=Y;+߈ef?^Xfb]38F\lgӰT1dsmgH;<<|KY[=#R( ӺCYYP(cQ qGAk,\x
.~0 -j9 H@$ H@$ H@$)hh|h(gϞP?fe
9<Xc=V {Β;v;}{-+f*'|R\,\gޤ-Oc=F5k( <XZ
Gea*o 7ME #Ȟ<yG"r-`#$ H@$ H@$ H~@ ih'h!+;XNk
e۶mkBH~$ǎ +yLWÞ={ʄF&bƏb{~Y؛!ܣ o[ߍs C$E42`kA!|-^'''K-nrk?
*
~駟."->mB%Gx̴% L- I6RF$ H@$ H@$ l "bku-p~=GqGEC{ kw&@ޡg6]p`E\h^̘E+C{m̺eRc sMs@D{
أ>ZfRYC=uTaTof"fDa
4EC!tRy ;O;vqM
=,qf*?ej7=0J@$ H@$ H@$ N@[h)MAAݤ.ض
ѣEE' D!vj7N QLRĐ/D; @ IDAT)3s hU`|f5Z/sσkkt8D= ^6@H KaD0 ,< iHLۦBI_{뭷JME,Zj$ H@$ H@$ H@ (+)q7q{p.f ;XY apntt3GUOt/ |-"*?,m߭EhSS)h3p(YݰON7iBK 3q 2yh)y, H@$ H@$ H@k h4 ~8VeR hwu?ʅ !13X=쳲h3fx_|n162\Ѷg||MaZηIZ
oqpga
ڼ-(2kEA̓|;1mBKE8 ]⠑$ H@$ H@$ H@" Z3!9Rk
wh LD[ R\Vnó>[V2
`^^.fr y Y+gR>'2O ?^q.۲Y3{;)J2k5 (odDW
3 Jen8ʛ
)H~% o F# H@$ H@$ H@:M O1E'n@^N@IM5qx06M+y#Ѭ0)X]} e731*yݜQj5 kZ) Y*KFA a[7\ ~Кn|<- H@$ H@$ H@6L 9L*kG@K"vvZH)ʶy-r̯Qz^km:%̖͌ÇGN Rٱ \{À\gYg+3e?Z W}=&L$ H@$ H@$ H@xr v
_[@O dӬٳzf^
lQYg=k)0==]]zu̾Epem! f^tE% +FR K@$ H@$ H@$ HPGlVٛ3c 9ٰ;v(Sŋ˒ &ݳd2߶0Y$ H@$ H@$ H@$znm's.@lׯWgΜ)" 8pb&-Yڵk |P0{S dK$ H@$ H@$ H@\zBe`~6̠E\EEѣE'O,K|e'''+)v:wO$ H@$ H@$ H@@O9ӕٮwʎ?8x;&_DUY-Z;ʵO?|A)Ç+f*)'. H@$ H@$ H@$ p %<Ho߾jhhdBDWDVDTDf"-/#bX8
K ;vڻwo1;;;[.D~XgG# H@$ H@$ H@$ t?hF
(+3 ݻwW;vX9ˌY
$ H@$ H@$ H@@dYך;d$ H@$ H@$ H@$ ;迓K@$ H@$ H@$ H@@g(vH@$ H@$ H@$ H@#;"҂$ H@$ H@$ H@$ P G}$ H@$ H@$ H@$pG
wD H@$ H@$ H@$ H@!0oE$ H@$ H@$ H`3XYY꿌S U{-{dK/4n KmH$ H@$ H@$ H@jff(?V^0"l85n7AkR}
K%@k$ H@$ H@$ H@]B bTR1",&Wۜ gz8?ɬj "ڇߠ% H@$ H@$ H@
7V).ہpY8~'qncUՅo2ڴ#P+#who$ H@$ H@$ H@زUjd 64 Gjq)m,r\ε&nY mF|qi%FGX: bۦ{u7J5ӡկh: H@$ H@$ H@z:8WفPZC
q~·Xq_|K B˥ a ]
mgWDg
F~ H@$ H@$ H@$ H@xh eÐ$ H@$ H@$ H@$h-$ H@$ H@$ H@ `$ H@$ H@$ H@$ (Z$ H@$ H@$ H@$ <
H@$ H@$ H@$ H@4N{'GB sͶk{纶^Rwj,n!
$p!)ҜBS{ν@>R!79ES$@ !MHhBȍlKd˒K3<-ْF\k1sM q" " " " " " " " " " " " ڼ<e[Z^%7J.G`U"jYl̺t:|NtzŖҾ>mKmiWiO]}6Ĩ%&hGy<yd_&˪\ʲ囥]ĚW|ayߣe*/RAAED@D@D@D@D@D@D@D@D@D@D@v3M@HW~>ɭL ne *ȷ%:s'y)ԲIX*?-#G+JD@D@D@D@D@D@D@D@D@D@D@v5M Q""!,2_̏x _|R :; ID@D@D@D@D@D@D@D@D@D@D _` 7iLh&5fD@D@D@D@D@D@D@D@D@D@D@D@D@vi칸<fbv P6=v!x.^sEzE 9;X[a͍V\.G@v}TKD@D@D@D@D@D@D@D@D@D@D@D@@zi9Lx? ܷ7d3L}L]fK+_^l3s 6 ~$>VcvPW" " " " " " " " " " " ".^cmz8r&(3|x]I_qkjRS<9 a"e v|ppCXXH[A~ | p ,mُȕ}yv
r"4 7'mzz6H¢"ڪ
+*.{7>_\7B.Bv}蘍O+,VUYi+.&m~nv'\W bn1f3v`UU:q,|vcܞ}R#
(S8
wAJ Eu9뗅YMk<Pc
dzW]:IǡzKv) xy `Ņށ ({$D@D@D@D@D@D@D@D@D@D@D@D XJmͱ<hƱ6Q_cmMVV]t v}
ɗ \DVV[ |?7`ƍ)zJþ5]mtt2d_ "8g抿.t Ԍxr|PM߆jt% rkCFgHXx U \Zgk >O\ fwg.ža%NJ _돀D8` {$nAؿ{c\ ͼԖl#e㓞.wjkk*\λuA;|}ԣ-
<-%ϗ%R1%bڦ\|.<lhvARVAЖeO^fCF%aKAoȥ 1p[QQf]ƒAlffEՄ(Z[V9% c&wݕkq~ð*{aO \x )9)LSv犝|ڢ}<JvlG5Zz++uIIRf/K.gg<*z_#˳6_g$-i^<wΥ^~lܹ{!ݱ_*" " " " " " " " " " " " 7g=0՞pK .CK9ޜJXAyhT zD(E q[DLb<\ o{ښPA;0xî%
Х 9vY\X夏sEoCVRLDdNysyOKy]jE.fl^L 3|&'ylu[`Uγ]-vJ\sZ=0!ЛPh%Z9r%z&JwHl~Υ0¹ݏ-Ϧ<Yu9C;7?o|l4'~ ]~5|H@t.W
_
Bv# K\biȑf\EC,S9fvBO|] b䪛^^
x+6Oe 9lC(Q>Wj cwz.|z.R7# } .12o 7 V\f.ڙs.g\i
S\ʦю i
270^ )}溽:8I9H|ܭ i_t| kOs9;uKRS5 sl7iٌvW" " " " " " " " " " " ",,(
l?+"TiBf}ò YO#;ie%]4s|_E!GZ4
}"? <64%ץBfڣ ә<uWz9 4j=M3sƬﱣЊM[ϹKa >S;bs%xxd6\7 -MkB\sW9_=%<ݱo8\k8 _NwS=쭃
3b?kϛGIn=c " " " " " " " " " " " N{TlmMG7-"/.jCZu JyUy]e:
0?_3v}~[76x:993VV.rW\OzzZ sZh#-.l!:Lt-2xy,zDcSvA;T !
إi% >s4ƞBܥk!m9X/wy*+=bz ,=q.iԘ`E] B9vQ;|c^UCzj w|ƣg g|ܽ%g<]ED@D@D@D@D@D@D@D@D@D@D@D`@\.MI9Lzknz=Iq|\yt P"j}['e=umY6t&&߮yzҐ"c\\R5##'=0~
.<
ByqI<}
X'-t!TI}ٞ>,<8r? mc >jUI' I-I $u$-߯ /]'=җAΖZw{>މhkDEK-'d*s1[_t J:|;AE"ʖ.fܵ.J2=[T墴
_6rc]4[~'Ƨ,
DMz#25[}UUUx_)O{_.ϝb3.ǃ
?ϣ]Ξq9KZcOE JR*' 㝇̅''\ey)6ӫ4یi''gV"OklǻZ&_xjND@D@D@D@D@D@D@D@D@D@D@ )m\̵xjROs<"c+=̮92VsT*mxd:]po5v
z? }[hW BSh.ӟW6ʽ ~<pI[j37|tǙ=99ϵ.^i_,gXΏ ;l]m
\ G<2Mbd.=:gR e=bzӳ!zfzc3W#>c>lE[5mlWvkLDχhŦ*k<XQV Kvh-*ru pyy bc 葴5Vf ^'7߁ym==2Vk^mMO $.(hXBg|XsVnYðGLM| e'25`_x U*p()G[S('mĬRE.n=z+GUۍ>ʡ-: 5Vn CGmw"g;CZp! z#A} MEɍRED@D@D@D@D@D@D@D@D@D@D` u7{jk<@+.ņ2D23?<u!ȳ"L<ejvmj Q;6>cSS.
<֣[g+։mA"kfBcC]]1)"_>7Q6`W\s鐏57eشRJzdR)6t3DfY>9{9p9O /lº`-ɾb>1Y89g4٣.ˋÏ~׃= 7V&
DaL)dՖdX s{\VZZl7Ǧlxx
=6,k)vI:R!76[sc؍voSҦ烝kࢯqdHim^w60t軤ZHs Źѓ M]6tmʘ+w1hUa,aҺ* o/X3ClWy:vHuxƂe _Qg˜B9WBe%Lj|eeo
O)ߎ\.+sEŅ.?ׯ{NwJcc|Gŏ( 47}E;tvm"6d/ r1,a #" " " " " " " " " " & ef\|V\ i=5펠 QK2'&kqaut "&^N\˾o6YIq?OM q{=O%Eֆ- r,{diqq<.֖ 髷wuL6몭Byޜ~ȴs_y畫 5){#d ;㩎| +]>~պHkR>7
LpyGM usVm
z/AHoA?QOSp***WeA|+ncccv%%t555>wͺXO?Z"t5ƈ~G <xp5zw=m@n</M
hI
ѬV3dt+[S>l-, ~(ͣ]- [esȴKc_YQ#FSv@ltd"̉JR4u5UAƑ{ۣ]=v -j&\ʖ \ξ+XIa 9rǖ c?{ea3/^ k :d'|V< =}V28MVD,'v
b¥vwg y 9\7CLI!ō_.^Dĺl^v ѷLjw6 s 9o]ڥߘ^9RD@D@D@D@D@D@D@D@D@D@D#*j]\+QEc.oxTܘ cKKJlɣYa~pB+*pvkg$kjC ٲ E.~Cؑ/Ic{|lvS>ʲ}s)t0_jb6wq
|ܴmՂGKMw晋9j2Dm~~{tw; y>W\fg.ܖ5y> "ڍ:lkk/5wqn|$g-{DDv2w`}먻6oE-_haYq75*\R}PB{l,.nKr%mq -E@D@D@D@D@D@D@D@D@D@D@ щ.e SV=/% { |c| 'vIZPNM'nQ㠰=π
52o}тC(
'S6>9.|9cۢc> t>O9VZ킐-8dg/y3^ hv5oEv%{#] sa-@f:WvHna;DILUA[egGRJt*: a{ʕPavOOhV>_y}n[ˏyNUA/qcM[ǜHZo1㓤!C[X{`/˵v^v Ej%zd>siwxt#Q3u Hqsהyx0>s6A9F ] )+K-]s{etII;| {-{KJo#µwUj2+YO9 &u/^겍HVD(I3deX"l)ɰu/#|OD#GB͛7ƍAFAK{VQ{웱̄v﨤" " " " " " " " " " " " x²Mxl]UZ۷S< q"Ksyz9Ԭْ"nkr$TN mL?4j)̻{}tVιu__l$)ѨOHSD,QHd!ʖQT)RaB=<|rG
U+RjkkCOݑc_/>wKD > rzZ~&q!zَ;bE!18D 9{ u9;K"gG<%s!_R4H>GrSCu+6vi2= xX֖z_{#Vv]D"E\E"7\A#aE"MIW|Cq,>/ht,lEVTTG۬Cƹco2.)g۲^'r;WE@D@D@D@D@D@D@D@D@D@D@D`?ҝJYI<>k~Fcg=rvY ?=˭B-DtÁ{,svufpR룓\O+kk9s'@d7K>K#0,++ Ea?"icd+K-۠n|iaˋȤ#,QfD@D@D@D@D@D@D@D@D@D@D@D`7Hy[avMelssK6zsʦ<6Y_YRRh]
HaZX瑴U5+$-nk)pش57Y~D0v[ |HQ*ѲQ.(3D4l0ol|i9>yC }H\J }le1=HWD@D@D@D@D@D@D@D@D@D@D@v3,e#F[Xkn&{XU疳(i G5 ɬoʷzJ
82r DiS tqNd*] 6%ٗ8-ii4ĤZ>wjvڮ" " " " " " " " " " " " 6˽y|*mnUr(Zm?wUUevGκ]v
<sӁjm
\Ц쑣VWk cjWuӒ=Kb ԄHS$LxQB-/Rlll
zP2g*팍 9bmmm 抍s&犥>(4f,7RbGuE@D@D@D@D@D@D@D@D@D@D@D`yvcܷh#z8vjGxʲR+).x( l*++-reV[]g,*A\"?Ik\SSS644htj-BK])u!Mr]v-D-ʕm̥%]+WExOݑ D}Vh}dҘu*" " " " " " " " " " " " Z*H~op&6Q6 i JwO[3k% ZT_alv
=qmuq;X04#AO"tHW$E !Jt+iYO}RJd,:ڍ6M˺jhy<A$.7$*˗;HY-/-Q!2m& }IL kmmNN ut
uv}֮NIKCUuvJK> ~A=hnxг2 <-w*Ѿ K%K
GQ"FKKKC}-"uHR"lѰ---AKZeS|Eƒ.B:d"dYO$,c` rDV Bq(*" " " " " " " " " " " " EJc1;nQ_UVZ~ֺ<lkk_UWW$+dEEn"?)uʂ̍E"5H}GDe=풺=_K-}ERuW"Zq:Wggg #gY/B8ǪuQ>SVd9@-g$hCiA"]y!4)˸. Zy%5^\ l7G}LdlԏuY>mfڢ~^v }N !v[zQoi'j|]$hׅigU4n3n'. dF\&[>K" " " " " " " " " " " "HycIݻjl ͠6D@D@D@D@D@D@D@D@D@D@D@D@D@D` $hIUD@D@D@D@D@D@D@D@D@D@D@D@D@D`3HnE!" " " " " " " " " " " " " AH"" " " " " " " " " " " " " A`3Q" " " &l ᵲr TCD@D@D@@^^ZqqR]} ." " " " " "$h v!k%iuulmQQZCCUTTlE7jSD@D@D@D@D@D> H'8&" " %099iAVVVZMMww
G`611a/_fP," " " " " "u$hZΘt:mMMM!`AA٢"" " " [A A[^^ ^ 288ޓXED@D@D@D@D@D` Hn9D@D@01yPJ,sIᓮCm& 8 IA{p D@D@D` Z9Hm\XXhD"hUD@D@D@D`+ 0=s1 <$hqR-0"Wfgg0> " " " D7 5*" " " " " "A4Ֆd@SgmG21kt:eaPx/lID@D@D 7y@]D@D@D@D@D@6&Us" " " " " " " " " " " " " " ڵhl2 MD@D@D@D@D@D@D@D@D@D@D@D@D@D`-km+++k}""` =adɷS'K|f&6Meӂ 4tF U_ۦ˖K9ͻe[>zaO}6!&hqP)+W*? [ ǣ>E`|'VB4+ԲxKM[_.m
my)mydK[ZBN~"" " " " " " " " " " " "{ l Vd"-90ѳ7e9z 3SԽ%bS9Je]H3fKf:$k I xħT*en ,HGS|
<|\Pp? ,7*B`ffFGGJKK><=`jjV'r`TD@D@D@D@D@D@D@D@D`}jb}M }
a|f=zWI;88hmnnnMi겗%VRR"coիW\¯{묭ͽ:ن}.]dj{ꩧƍ//6== ?VYY
U"FFFZ[[!OΝ;g o~Y? znC _?='x"aC&evG '"; \vǬ쿞12{/y^h4jE2NNN& .ؘZ"gϟ? h_ء]f===4Ω^WF!q611-Ry %&pԩ c[Q~ m= +p.ѵHV7G
?zuuwv]D@D@D@D@D@D@D@D@D`9B#+}f?mА٤/2 7__ofeME)KTkmmj^Oo_e G ydNv[>G92Uo7~ H\ij73)c\={ֈGG ÇH ax
Mn@ 9rLR'?;yQA#QDIuz">f!-(HǏG9}MT|UUUSHf0<qjtlr'0~ ~{_5'>a R} D\?hr`wʕp q$s^;::=-ܮ" " " " " " " " " ;</@.30G͔G=g^Ys933$-oyKNT$u/fE m ;-f`` D
---Alu79B/ݼy3iNAtK_dOww"KDq\hf\ mĺ C2e)K\q m: ll) }"H4 T版 /s}Cl~;"z96a 3϶d;k NY~!4:
}13LH˵H]xk^c+b9̙3FT8ac _B8lg, ~rwE˿ D9O&5?x|g8 >p !kØi[d17ɞt <566~uqp - V Ї//yBBoj9O~AS?\c ^\?ѼXw9>YD`\w+fiڸ2ݵE ~u U!,D!Cl"2 #P!H A[?}; Ia8k%k_ZD
↺F.?Ab!ʤ . x!@7q?xKⒺ /c`nY"">%y%łlF0iVAj?sΑ)a,%z!M=q t h<.~Gzd22p0
) [.vaa089~d%'<d~T+_J^ʵ II86H# _C.%WA~S
L\O~A~s c/Bۜ߫FDsL\פ:я~S~o$>9'}f"[96u{{{n u A"r/߷X`ϵŵ cqs!lg~&Zc"Yr^7,DlNN6-E@D@D@D@D@D@D@D@D@v6 ڝ}~4:$g_ͺOzKٷ'k>
JAd+r"H@ B)ncA"RV$erBA/}"iٟ:$\{6BP#1D1*? E 1.JLe[<vd
D|
:bܹ
X ǃtc|FPGά%F/c}_
W~ :o~WIѹ[
b|ePÌLD*Q'y - @^&BN5_5 @ IDAT.kKk GZ"9w:<.E5N{AۈTƝK.Fn~;vF}gSL:f> 76RyO+ {y˘y9ks\[|W,{wyKqv [V8ZMΏ3 *?x{~@A>l$%Xq1ƶ$hwD@ 2\54կ5{]E H!"HA hLG$CB"
)/}KC"
قt
H F CVC"Ef2F""NB!jx/Q.EТ.+^H7"H{ED HEF%mxI 8vƀ e!q# Z(Y8qܰ=Q%Ѿz# }WФ%f1Xe/{YXO~睾䘹noxBdi!9'k=Dpr&yMi+rIy /~w¼֘ɴÏ(:mq~TÜ#"8^*g1 Cl ۸(1wLWʾ/ics2f(+Po j$aB}V"k5ۿ
__
:i# HH(WKG@v3X7OjSOg\qIm w $ q=K e=bidT#!8-b"}AHW$
mHRҝ"
n\E&! )#K$0D~C */be܌cA~"$z~&؎ L$'}(Y8^ ُqYǒD2N
ǏG.lҤ \36RrqSN>x M$ ]q N\2Nd+"Hu &y<tO[D"?pmsN;W{ĵ@\\o< IXhx '?> z7Wr?.Ïg;{e.pߚ0&pm(h\W!uþg|D ST|*~1>я{>}1]Qڢ=cO" " " " " " " " <iϼ<㸽mIo?XP";zf@F6fPT" saĊɂA R(AE o_ ̿D$9 %FhRl= ҅H>"nNQf6؏~VL0%}>H1|G~ه 2>i7ZvxE!{D6c HR"v?r9 ÑwH'z$bԉ} ~>ӟt̾+
#K?ҏuG qOJ^5[,ÙRp p|i
"6ʽxB*tϑ.g-pqDrMp=SANd Xsx8w\& cd_&r7zى8nD s\jv+YDGP
:1?u=&4mq<}c>ÖB*iǓm'Ǚ" " " " " " " &$I<8#gK\$? xf,2r%#<e uCY^8y?Ko? q2:+ߣy*}f , C(^:D-cx bC
H SXM$̟I (Xؗ?\E
!hcQA>Lډa%UYC A<~B:nxg# Kr|q]\RW<N/s"o>#zwcJ|86 :a@=X? 7CM,m%\ӈMAR~#o29d{cLng=%}{eT3<'߿x sf<
}3\ ?;B ?wx묵 (ת" " " " " " " V̟ypƴ?IЃ0Eޝ+$S\7z!*3ϕs@f0XC1n f "vD@v< 7da8W+I(>$U+(RQf(h؏y%zvQ%z M{HQ#HUK.BIa HY{A1,R}zuhcsGGG#~sRc!r~}ꩧ#Z3L]k c^Oxz$-}'Q]{#Ǿqlu Y,D3_?=yOuj8NYyy1?|@~>Ant,:!c=sm^ 8/G<2k(`'c"b.̣K+w=.D2sv7mϧ>)} E-O$V~k^z7zǡ" " " " " " " {@f~~?o<K{+܃ϩT 2C&v}\<7,-z'<ٌ"AՆ!@|?0z 뉔C|!(D !kL۠$ E萖M,$HORW,D "H L*F.!xw3a '?C!?BE*\bDXkI-cM& mQ?Tp@"haM%=#HYLM0yv%oypna;.x=og $??wppxӛd{Bl3/sֹw?I(rرcbƈz$&\)>ZklqiD"^U
BVY=;whߏ|dcçO?\?c <
Zq7}M]E@D@D@D@D@D@D@Lgf>K\j++Z~|1*ER툀C">P퉐D1O$&FfG`>r#M^9H]A"whHYP/}KA</(6dq X)a1 -?IC>D"}6т'N±Gl9rI˘ub, /!<#cD #ɐ^Q!O:x"6,n)gR֘c#jo}k;%k}{#z)a9k(ٗk(o!F
cx¹M|^i;9no|2Q?(dHq̍K*q"a? R|[
9~IW >TED@D@D@D@D@D@D@v"s8Srܛo?}<1K>(A/"+ 0 B^نD F!H)H1+_5c_Gc"VYGA,!H$#2 !< ۈCF1~gHz"q|_-?AuB.#ɐQ U_U!q961)sLḩD.cϾ<<H(k?Y"S0n>O<g QH10 xIKgÊhqm?q[ ?^`$jI-9&bk-
sr#}`G}#m#1F11BB2 ;c }7,}mp Jt,>i+>Cxqr&9 b -E@D@D@D@D@D@D@D@D@. ڽ{nud" OHL!GzX C"{1JZT bqD R(Xֱ:}HSDB$jo!ØB6(G@;DGH;
tx.4 #2F$$y-Bc dѥD\d5F #H'eQa9b sLg
b\ox9w< #>R9~9WHZvx0ɱcLx;u9'=3WWZ.Dw"I7 1W("BHq |qN(DK#>|2|;Ar}P+kxF=\DqEJ4;s(7b 7pFzd={ x.TJ'Ft'V-m<^Ϊ(" " " " " " " " "$hh " [M P O tQx |A "Q #.XvqEyG$dd<LH>"}! ;dDbd\c ޣ-9)O a G_q,m!xKrG")pmIᘑD?xN
u {zz^4j1 99G~!e6 \ED>SEe? fT'Q+_JQyH{W" ߙ3gBa2Òm#yopA
ٯ}k!11X5
w2RZ.q9gD3]z% Apy?po<M "grR w$5FƐk 韶[/9H'.{m}}k>RtB?D努%bg=cfƖk|kvsmd=mg'.4-KY X G
"}'>d6"$noxξs~hݤ&/bIM{s#W!u3s9QFPI_ 4)x;BO2SHL pƇ ? \}s2.~8ADْh_ H\ 1O߹
6i?Q8DfvND@D@D@D@D@D@D@D@D`g1F DQ.D9!4Q6[.uV "(wvCf"xxM<u[qm(+PJU)k"t%
ڏ~.i;</y/HI/ %̉Ї>$*{59K3Ѻq }0T߇d ƈ %ٳgCt*/}i~ @0IVMH-Qe
c,}ӟL-" |шYxd7ǂwkooB'O0 7)ݨÿمsJ ~ÿ C?ǖ>L; s`2e2HZ A8kGGGCg fpzɇ< 2YC8cDkädN\;HtWL1~<5) i#q 2 6g?]擌rR"UD@D`?@V^{i LG>HTM ^ߒ^oܓ/>|-mbZwvגA [O(9bw,X?3ғq'ĿW});ZmB^8xb:㗼%<!sI'χ}HÝL ِvo}k7<y1.Z$nRD@D@D@D@D@D@D@D@D`ݹ掑]zz{{0jyLzH()&y;RP $LJٗDݸq#\ Ee-12.B//9ь㴝LW6GFFش"" RF SܷS Kf%}Ŷ72n{P)GG![nQHZRU
6[FÍ̿\4\L}~:_16!3}+mdɃbt<$FH%ҕh<>p_x< q|!K$.)1*Y%BX P#pI I;\(#mia L4&B K4N `i?؏{ Vnm#T|uX2o/FX\'6m߲ngR5g z," " " " " " " " "{pw Ǟ -ѥY$xDЗA,0iK-P1 ly( "zY3 ]]]!&ERֈWX XH|?x*?kG"HC@k(D.A// Jd->qxXo'{e/YJ{5<< I}pE1B#!vh!7FEK-uC(qQ!CNZ@nX%
2k R3J[=[,l#ّ9EC.BHJ==\` 3KHXme.]朥 rim]Ƭ"" " " " " " " " " " " "~ؕe1 W7>w[ uDl}JD)R|M-W)3)2JE": r6F&X0Q,!Pa"sAlOllB9/m /_i%qnOE@D@D@D@D@D@D@D@D@D@D@D`c1k-]Wljf. Ç08{
[B@vKnn|!BׯU"PDEn@^Q\%J J*dA"_){d.K^N\%.c >Ƙc}.2u"" " " " " " " " " " " {g=Ev9?V2,c=WV،;c VR\"kk}^j{fַgpP\xF#taa!Jjah%a%5υD=qD BgϞB+ Hi288R
q~ i Kq *f+Y%3gB.ْ^YED@D@D@D@D@D@D@D@D@D@D`ٯt }s'>^ ?NrU/ӗ Kvupؽ͘-m<mqKAki:95!
\3cS^+,(V+}7 -1x:儛qOZxg Fi%hw.Qf8k%i{ܹe'_/ ۑJlC:| xO /y.Y m%m3.R'Sb㸝%ǔ>D yn3y u={ž3|h >>Z@&5h#qFFN
d %Yov а695e#wRZ\dVw^p'/J;z՞;qsANN n͍>}fe
Wr;<R<o*fZ|5-eZ EvE|%2\qQnT Yk=6 9r$U}!KҽqFIrcd<Qe,_c{L̍2|I]#@3
K :;;x S
ի9 E0ٓO>;| pر^\"x+CG*B[Û j)8JVNmeُcMLjkj
u.kݲ3.`Ϝle} 9an_셞 65<Ź>sG Y_굸C㺙^ ϳ=I+A+a
7S~/)1fDiMpG7n+)cnl"JA"[ʁM_\xю ? nq ,٧_ġlq{l;.7~RD@v3utogQcK ߐh4rY?K544gO&/#3sz F
RM>*++ Y~-adՌ%ۣǁo {']tRZUUe/_ 0# F2ψvs'/M/,y<k:Pg Lي:}Y;y?O>r,HG{.H#mdX|#g?u.
¢Y 6%"
9{%}!:ϥ/Ҳ H" 'm* 7"ӧ/ER"V7)ܜr7
0{nU$?7Gniflmmm9S >B{ R T{u " " " OAxE
:A qE) gQ
3~*AXP 0 hJ-c>>g_J]L{DRp ؏\,%'NGDp 82^ vttXKK&unD-"mıeLͱG l ? .gv/Ѭn; ,]Dl^h(er 琴~8 -cἯUg<6)T_cI/=v
ovhHqW"܈DW"`͌$78)LI
pMvrrc}nfqCoܬCHZR-#i R!nV./ rG6/UD@D@D@Da/qg*" " " " y3K Ѧ 3|D(Y3 > |AaQB.Y%)o<#<c 3τ im&B "j HggE<xc) vG"H3G= GhG-{* A8q*+<R\] imS8?wUmϝg픏+6s1!V;y J>/%$qRY7Jnbx/M1rs.ܴ1<y2=uه,}g/M};::' c(&7\mG;eQN?'{&lxߍ< k-0Ƣ>D@D@D@D@ >θC#y ,A_6!<Ϝ9s|? \!EFYJ.m ߪ<3#gP! x Dν>{i995 k=.zۇfbUkn9n=5v~y9sc
]ךc I{!E[=r.<rGΞAκl0] nNtY<` m> J$7%.VntSf7I~KF:>#Yc'mR?RArd}rq|q\pUWD@D`7IRa<w1h" " " jD9D 쮣hE@D@D@D@ g<{;[}<Xs+ۨXjwfvϡܴ<KѣGC;qPqD87D}!x~_ '㥍<bY{.zGUuZMUeHA|{#={ca,}OϜ=c%r!د+bg} r#g{ `wW=vˈ+rmiTeXXr]'Zg&=:k=w6MD@@cę/%0V X<8!VV" " " "s *ys(.$%yB q?)l|
I4E+G*>ُb?$T l#Ќ([h\_x1cו+WB[+ ³bh Ԟ<[=hA$mC]=y%[վAOw|bn:Z[lίsv%9[qOi|X_{L>3mnI@D`?~ a~ *" " " "ۃU큨6
jSD@D@D@v.&B4Efa "Qy`eD< !b|&1")-KR#Ye م>b?mK~
Z[[E:r䈝;w.A fYGd/.☒}Ji&r@>>UVYOLjd0pn z$m^*ψ]J/ْG^1jS>_ 9{٦"F+/+q9n ;be.gR Qv}#u<" " ; 0Ic 9P
JD@D@D`]r @D@D@D@D`C;OLDd".HEߋ%6JyR"hB-yE,}'H:%vI-HZc]3"wll,lXf,F..0ǧp)#ăL 4r^Qloɤ^^ Ѫyy>MfqI.7-#i86ߧeRe{$KpzZ9[阏uىV摳dW<g:(]L P4t H I,yС 2' @gUE7s1e)4֑_Vbސ.D"c .ʣs oَYgެDfًm~qEie.;bE 4>o)O?R5շ{x$]rIG) Cx5fr%3ѳ垚yـ[v+:-" " " " " " " " " " " 5 YMQC9]c7isipBld% dϲ
zgYeYVV3O.|
/qc2̭qQEBԴ
]Ő:8y*?eG=
D V\oKW}t5d~3+>'_+IkLsJޜD$#A" " " " " " " " " " " " }E"B Fd"WQdR0wl[[[H-L˗/vh
iA"H)HRk-h˾N
r+~)|Ͱg-XD0㥰tDqU&
{?2,<epV{ QDf ?e;Eu8S?wˌ>T:\oe%V"k׳w"+|;*{pD@D@D@D@D@D@D@D@D@D@D@/()s΅S$ D& s"HblCQzDΒ^ ѭ b =A cKޗi<xψZ/)s%xGZwG=vӽ슝>{fo.."g]2`}CǓ,~mjzz.^q[b55NK%hԱkM U"[HL*ѳ1%D"M+**%bG
Q[!uNzdU)K}ں$EƘZɓ'_ml!
1!9.^{,=-
R 9sv[~^={'H'<rx7;Ke\bg.Pi)?L?GnON-V7D CI JZ&X^HZ&%FR7J[:HQD,r6l?cIDRh#Wa=zú9> ՍM^{}:NNs-v+="k<9ם5c?c>}Ku"gM
6h}]ʦZsI;|Ӟ]%ty ڽvFu<" " " " " " " " " " " @Q`"hfk(b >q}-W{>q?$1nmmrz.idu`Gs}v"rv&Y.Ң q<;`y+,Rv#iGFÂB;ҐcVv'~4&IK~^]O٪;qL[uKv͑8Ep/X]Mު]$G˞~gV^VOx:把r(Kۓ'|gwȖKA^ ?pw/9Z l!u {攧vZ
O?]Y^l^Dyggg=ͬY6+*} c7)O\__m8b+n x$;DҎٳzþmHL
-К}hՑ@M\M?{ dWR iFF(gm$ K &8`
ʔcgvp)S6lbXQ9g(MQ ]ݑf; O9O9pIdYVWUu-U jZsvˮq߾,#: 'EBq<S&M+, aiٖ( ihϬCM3kڀih 7$ H@$ H@$ H@ 5¹({iه}m<{.s6q xxmX`nXrq6v !Cuu w`hmi
-ÚO<)\hjg5is$ H@$ H@$ H@$ D T>xx\8zd,aB^;,,ͮZ %Ri'O 7XfOڍ2f&S±'H h$ H@$ H@$ H@h:~x055we k<rpګ&5iS'E* uSÆE+
-`% H@$ H@$ H@$N {V=uJjq!C;¨Q#%"&q%aÖуxHi٢0~Jbho(~$ H@$ H@$ H@KHgΆCiDZC8p"jz6\2MƎ F F5t}yiEO#G-a#C۷$ H@$ H@$ H@$pV
I !]{Ç^dB m Ξ? &N Fua{*L0Ǐn!wm,+eb-~kkkhni CZx -|/H ?vMS?-G9G675)}9o]Y{# H@$ H@$ H@>CT9{xbF 'ץ`˗Ln)WNeFUY+h;EVM%u qGlDu+F0$ H@$ H@$ H`` ƌ -杏\=$Eax o<jHo7CZ# :*~lk Ķ
/3B#ĸ--UaHuKhZ ɏUCCUt&AUtnڀ$ H@$ H@$ H@DK- Q>=lzpWL-fwn%0 dq/ ߓ|5 g!3A. H@$ H@$ H@uҨ*$ H@$ H@$ H@$ M@vp_G/ H@$ H@$ H@$ "^mS$ H@$ H@$ H@&@;$ H@$ H@$ H@zm/¶) H@$ H@$ H@$ H`pP K@$ H@$ H@$ H@H@a۔$ H@$ H@$ H@$0 (% H@$ H@$ H@$ ^$@ۋmJ$ H@$ H@$ H@hw$ H@$ H@$ H@@/PE6% H@$ H@$ H@$ nՃ{^$ H@$ H@$ ,ϟgΜ gϞ
UUU& 2$WWWwsyĹZ[[0vܹ0dMmmmݬy|$ H@$ H@$ H@@Yr||8W<Oukcԃ]# H@$ H@$ H@ ÇO <`-C͞Km(Kѝ~Q9y 6,ɂu輝MMM+A[ ڐ$ H@$ H@$ H@@^sWq`] s%ڮs$ H@$ H@$ H@$ "`;S˹_L>O+\\|X>+Ϲ$ H@$ H@$ H@@&@O &x8q" ;v,?>Ł 1bD?~|=zt͖+z#GLKƔ=jԨ..vM%q5'^=}멋sΥ444qQ17.Зn ¹m$ H@$ H@$ H@h) Q
a۶mСC9y0w$rwѰ~tnI$-
6lHv,YBI ݽ{wػwoQ,XfϞ],Rvii68kd11bF yX6`$ H@$ H@$ H@)~p5o ۗz;v$j" 9r$߿?x"z"_.ԔPYϞ=Vp uʔ)aŢe)O=`8ٓlϺ_!>:u* <x0y.]43}3% H@$ H@$ H@$ (IbDXD3ftxx艀I(M'OLB*}@h=~xKnx"22/YX<gIxRvkjj۔% H@N @ IDAT$ H@$ H@$' 7ɮ٩L OTBq=XMIx"Rכqd1F8e}&W.
S(cB3>h;}tL[OnS$ H@$ H@$ H@@%@g/ #d1^y٢xr0aK*R\TkiӦS}#vG |wԨQim֬<bsZiԞ$ H@$ H@$ H@K qܗF N+x5ZǏ XLP'NϢ+>9)/
!9B*#θqR}쐇p'o^[nK9q65.-O#mX$ H@$ H@$ H@}m_5_,XvN8NZjED$ Iѣ/(kKEA|P<ts(c<r6 >$|+$ H@$ H@$ H@:++e}0x<y2}Ο? 444$ڥKv9F|EX9sf-7bk1!bvJd>vg9֒b0yEE{}ZVוWy H@$ H@$ H@$0 < f}c
}:\x)ˇ쑊PV+^cƌGhcZbB%1blN|9ie˖o,Ԟ9s&yf omEWoi i2sk$ H@$ H@$ H@^q)w|S1|X
zPq2ݻShaVB #dvLjiӦAZ9C<NQ<%O1q DxR>,,".^ZfmZDẺT_l Smsȧ|dz2a$ H@$ H@$ H@"C{ƶ{©Ƴaʤaa0v̥}g_ m_:o| )h*&[PAHĖ
uYtɒ%c7۠;w&]cTYRQ 1؊/kfO_ʲ.v
Ƌ6w+ H@$ H@$ H@@d-mwS[Z/.-nK\^ʕWVr|{t1EaXmM^?vdxc57G53g ø ikS);eh{u^
cǎMܔǎ K"i%|-b6[LhoڴiI`œ!/\1*W =I1cF aÆ0o$bxݻ7C t g$ H@$ H@$ H{gwZYR; }-De9=lT-t>$16/D?wG4j+-slHCI^ :X
mу܅ eRFxaaѝ|ég #G ץc=3hk
cGLswї*soӧOOޥ7oNb,J>^PM4)2D~X] jE0,Ξ=;Co91)# Xn ~Ǔ$6bĈ2G$ H@$ H@$ .`>?GdIA.;3FG&g,KMd= Ų! ݡYCCC)G /zH38} 0rT };Å0MrWJu}rR n1a᩵[B-m
G$^vwϡ
;x$lٶ;.96,[4EZ}ODzOK1(vw =]^ _}~H"]Pˏ (3q$ - <~4Q E$." ڳK + xM^ا<2?G~<)uvvT$ H@$ H@$ H@ ,yyD GEଯO)sީ,Y~PL#2wyRyZ 2 !O_Ν;7ّvs86gѢEb~KKz1z7Yuj(SG
}ٍ[aaղEa3분FE6j<LiwhXq{8xhq!<+uÓ6uh6ki~Uq-ޠ\6LaaW~d)o]+o' ~里 ď%o馎2-ru
v
o>!͏'}utmyKP/q< #I,8p+ H@$ H@$ H@@y̱#=NV8weZF= 3;[1gOKs ǫ\s'#Qހ&mQ&EE,H L6'B'_hh
AP&vh7zT>cRȨ;zk> }QBoK8}A[)k"t Nge
O
[vzr 6`^hn<i#
'38a5ays ՝++T ?x`Ó_8> 8~r*W bT>9ùR~,F>O1 abS.J@$ H@$ H@$P s٣+Mg~ΝIe Mx"~q<@KٜEy9W+!i-Sюf 6gΜ$c6;zE!'} Y_}KTN<lyss_ӖcK kmE4z*s0 ZH;6:E9fDJQ##\녴(nڶ+!,Y.Җ/vkOg7m
{ l\߸U6njݛ6[~vR֕ԕ/pWʔk\ZNiޕ@˵Ujc H@$ H@$ H@#<;.Ɯ<"'[WZ#⁊'ٳ;8#X{]{Mfh5(M6.]mًMqs9hcʑȧ߹y\c ' 6' =hGq6z:'I47ҜOo](L:Gp=F0ˣ,b-;xƳaC\~.[<7ϥׇ#
'},c015i0PjK@߯ } ӡI@$ H@$ H@*N ڳ-
#r"|%!"8>vRY{DPB
xavHc}Yld.b+e˘>supkCxzm8ۂ=3gυ 13(V Q#(Ҷm;H Bz̍k&!
⚳^ =W.vBݽfho(~$ H@$ H@$ H@'ȊW,"!"fa#ʲ,&*.\i/ueAX\1:{آ8hѢC.e "+ݻ:#qI:^dQni Q %lHFIƅ{al6= #Ge C Dsxƾ59wqMڡaA}]Dɸv aC0~LX>̛=p<g3{L$ >H q}vI$ H@$ H@:L% 9r$ 'NH , )I85kV@o߾$!+"ƒD F,E>}zL&ehz9q<>$`Y /cDfz ۷oO"-/ul;mc73XxMל-zζlNn]8̘:9r :V, j+Ϟ|Tc\cvGbDOs^{fcϾ,aU<alX|a=#<g{Պmo H@ m;<<̙3'=n$ H@$ H@$0 T⹚WL㓅[0zf|!Y;|89Q#"愀zС$آ8˕n߳g&qyM\6xR<ƅw-4 ay' 8!#1,kN:)^0۪̌(zkL\H[Gω!cI{6m1tqcc{g7vӅl/54>z..Tx_gZwߥJzn;w a]܍bŊ( .'C
C˗/ f0G$ H@$ H`0@LE< 5jTSGīcB9;[DXCDe
q˞/-' ii\EXO{Iل3xbH/^$8P[nM9r@oq jO E,&O7GiS& Ξc(aM7#dtO^ /"mp F q\زsO_8;t01a^>̞5=q9[Yn uօ G o[ T>c)[zsM HXf̘.\@箒 $ H@$ H@ Ô0ĈIhEleތyFZbbG#v",!yy[EOUN&L$qI ^T^'ųƓrúx2&DdbbX OFكFȧdӣ({уvbdwS°(zzy<iXpswDפԆlF, ١UaRgW.[̜z -L /~!-ܒ ? ^< mܸ1))%1၄xPC oPo`u̙OHeD #acގ>6 wBYٲ X$b6)G{<,Ht<6$ H@$ H@$ @:ڲG+ެ̥!2WF9(d^<G >>sDleܜ u\\9,e8-}"1'-`q"2F֨e;ke 8b0uJ]Cm?F/ڦ xv=jDX<v/pMzipvkk.3ж
: Hx{;ė/|aj7ömRz* < >)/"-uVZn5kքM6%NАBÃ٭ޚ ֮] 8 |xXZzu 2C;?xzX⡉^!#ڜ4iR# 8ϛvϢ2u#H<J$b!>c x1 Fc:8a90 x@dɒ IcYrezK$ H@$ H@9sn8I03; $>Yn
b>B:aGcvO;טc^;{ <ە<ω,s2? }mslhmk &Z xfS8vDk 1,fLiQE-Md.-#t5gϜ
-%1皢|pBS9b8|U+W~H@ oy!p [;<I;H<4Ƀk"S|ᡆxۓ 1b0uZi{ͲC$5桇oQa ]ޤ7ڲm^hlEgk8 ; oxRDg}6=j9oۈψ˄D ytnѢE)C=[Z :y3I@$ H@$ H`NC漘ˎ1gΜ4w|\JG #cΌ$ݨObp`N:9qRn/ŖO^捹bK."-7ΓϼyR
5Emª ¬CxMZT)q勢Hלk)v~g\7U9_Ӳ}0&,7;^o_J@[)ڑ$p x@H$`CQEѐ}<@YO2< F"'yx!$ HCoy{'?IJ.>-S˛g$6(<|~Qvy;
63[uw/e<! #/<]aYO>`>a7 {<&AH> rX ބ~F M$ H@$ H@H6mZr 8{0cEN2׆CEgN9=;>sh!. ء nT+C$_n q5 czsO_ä_vg?]zHC{UKnԨqǟjքV.Ha;ӿ1# =v2۴-w(cYs6êkbִ-c9k7l¢OځzMhoh.!CÃF
\>9!nٲswygzK
nZat)t u͛f}_?l9Uywb>v+ ӟ4y2 7%?a
L<<-]tix^ %$1*ôZwuW; r/~/})w] `$X J0g\
ýEv$ H@$ H@@0$"dY 9DUR>G e;>ǥS(PzcSW8c07Ifq0 8۶Lm 7]{G-z. uӧq6yġω
'Ú(.75Ź 1p6Iqs }}ư.-.]47Ko\ht,@& rxW%f~5bf>ᆷ- &B+N- ᐷ%;^< k0,yB$ /a Lu}B&beM h Y`>#+v61b09t>G3 ut/ H@$ H@$N9">#?s^+הq3yٖ-YL[7Qmy6"펽D=iW.^q]t9*ƭa(!C¤rP_73z^a%CXeG8ZτMėE1#|m&KK@< B(" =DH>qlFb1*sŔ yRzry|PŹ\0r/o,Yq˳_qg&wV>"#fVە6$ H@$ H@`
)4ןEp/DQpXM|`ahij ynqߥOgo
sa'V,Msq^zHX=i[Z-¹)t#_ѓvTٗE
!1C@@Lk? Xn۶--tOzO=T@ wqG((Y%nB_|8ry/g/W<l%>fqY.Q>)w"T*z<|'^EԎ$ H@$ H@q gei|۵Y4r0q0i0"F 6}9&Z^
[⚹G禰svqayaaXMun 7jdX2nAÆ;R8E3Immi ˗ԇQ{ɜ@H
*: H`@7o^Xvm И i}XD=},,%1V^ ;X2uuuӝ;wٺ7 $W6"c Z֔DʱmNdiA4'Dlua0L=;c$s^HScӮ$ H@$ H@hAeCsU|3IFQ;,,a~k9*cg;W?GNǰG:abǏ הsfK pǎ- {ًϜ
{d$N_RC";$ \e˖5k$3]dIvӦMIE<`̙3'yh"=C,bO<[A6Rk^G7+R~GL
f=Ye|ɰy$".Xbf4L`EuvwĒwaܹn /"00]g9 H@$ H@$лWüN8EQ`kSvR(ro^>}H{sa羃m`
Ə
7/_ל w+ߖv|L]l~ 7-"-ۣ͖bق0Sj WL+%xie$ [5yMZ'6 Q9|p!Ύ*/x ¾} ;[}<HCunP C"P,9 D?ry.D^oi7e[wbS1a6zk?~|hhh(7gym@ [Vxի^q Y<iLs{W:aO`gDZJ֞$ H@$ H@,0מ$J
xTWǥJpBc(rQ߭+ |FEO۪vc$ʎ9<A hG6Gwc&xW-wk' HNӟ4<IDB x̾%/ K.x@${
>`HwQn +bK!)KÓ0|r< r>9?IX7:?Ɗ}\`qtM/P+j,|K=_ < ޜ s D_ݓ>nn'Ҷ$ H@$ H@@er1Iĩ8Xz%dt\ S|q}hik
vc$ȕK緋q~KߥQ#k&ms\Ƅv^d~X0wVKz}ӵ9*-)ح͗x
]]J` c"a11[g}Ώ|#7EƀxݻSiqƅ3g&!b ^?&LD u'@@J;#bu[s>!rء,#mS:&3^ѕH~P9W xg.穏x>B1lDy$.ϋ!xz-mJ@$ H@$ T :gϞ
[nMJ3ÖW_2L |sfl0
8fΊ.9np'r͙d{7҅83+
V+> :~x/
r0e*bk8q2l۵?LϙϿ3gυ'EgǕ.9Hߥ ߓdì
Uă6k
!M3{|qx,6 D!1 "->b_lzMI&'v 4? udv8CC]]]Z5w4,/C Y~gm<VJ1FRQ[[& H@$ H@$ H@7@V%ᣡj}ңWQy8jN vW;,
e+!}| kzT u|ek1ᒗ-O^I#|v(E(.5'ZYG@QlaIYy!=9+ պ:RQ۷= H@$ H@$ H@Mz0!
gcѓQmwH_]ǒc c:=*v$5 דp 0} =Q2-=kWh&. !:'wzbڔ@o?m~[a{9:
oBm?^Uk ̖a8,n;$ H@$ H@$ tN`hf>9GBh3Wܺi1ZaFtJE+iFzDE ]Q;dَ^ I? m{ |?қ#0ah[[YڡPm _ $ H@$ H@$ T ڰ`0wJ-o' K)ܕ{hS.#E㘑.q.-5 vfۢ Y<CkwH[E1jh Ų|hڥ?$ H@$ H@$ @6":7 _gm{;*/UZt. sn%0
HBmډS٪ty!jq(VU?J7I@$ H@$ H@$0(kوvv| Htv{=% Hhjj
[l
7ͷχӧOWιs3ghĉaݺuL
gϞ-krǎ a]1}KN<y]رca۶m&1qsaSnc$ H@$ H@z.I@DO|{
wyg:th&$N4)\_Ȕ {,o{[!$
.&g?ٰ~ַ5կNf\p!]>&fȑaԨQo߾| ̘1#<<?τ#F
'O~BbE>'üyooge ;vlXre_oVx ^p&c?~¸qʎÆ
8ϵ~sȑOM6w a G?Q{^^tt H@$ H@$ tB@0fK@:D@,
_?? Heuuukp''I [nD$ԩSNE?;w^J5k$Gb%g7|s:U1 u[[[^>_s
˖- /p[Ϋ(گZRL{
kM,s)__Ku̙駟N 6IC{ꩧ³>WAyʽ/No]+V?_ҵpM76 [0'w8fJgwԩgϞ
A{̘1#3^zux_}w4͛C}}}C?|p=/$ H@$ H@(tvp] H@ :GH?x#RĨ
6$1nKeC,
a<L GBx|nNZ<Bx>I)|ի^<@(8Jm'8o| h#/bˢ]-D9' [.qᵯ}%ެKƄPO}*Uް0{ӛ` _Xrg͚x N_-
O5b$,Ho~×(ɋ1vgҗC-5Ã!0E/J(-OXb<SaIx #sf~0ĸ =qRkN|O" cxEFڥ -:߱:V$ H@$ H@$@[Iڒ$ 0]%?D%V֢EBE^CB߾oL"wZl ovXxq>' ݣGvXyxix"P ѣlV&$2FD^9Y:DRƅ :nOw; <H Wʝ?e~[ց%2c rѢEɫx%#}Ke}0˂k^;G8ēs\9x x6vh ;8qb*9-^xZ ppS*t z(VO6C/g#|S`4կ~5ڙ
.-oyK@߄ƫKUg VExEC P>|x^|+_ K,I- >'~pHc$ H@$ H@$Pi:U$ H@=H>zjⱉIZti8Xhh|$!z!f!+w
!B#n!."d!^Q lɛۈ[.^zG$$qqڶ ǒgO<o=Ky^MH^▵I7nܘ;DY;Hk"Fn-%]wݕ[<- 2}͢jns0'uv:cG 팷)N6 u{]*yl#"$ð4QOڻi)">5}S.}MڜY^@PEԬx_rNxq̵G=uyI 1{$ƃO}Êz:|{?,{>@-'=̙Sii<$ H@$ H@@w(ve% H@7 a=ITxS\2fP|epFy_a9gdç-M>Ј ؖOO՜_%!B(B%'} 9!!P#D&G<5,!P~Oxc"W& 9S:&\;Ύq|Cpx#jE$/<nG(gFE<~Y 닠]` cW$"v:7*} o}[4?`IG(˿Lc<]Mmmo{[Z ׃\ 2;K5+\CAh~Lc'nofknۭ$ H@$ H@*A@! H@%NI^uSP#Hrh#x"PCF8k~ma/elCCE|-MyYfMrېq=9(k*$`ǧ%"/
Δ%y%#zeLcHR$M:5 WKؤ\3!vwfD۴M'"В(1أxL M<v} N ^<˱fe,\?
F EЅ?ۄ>"T3˿t*6l{qqG4ۙk#Z# \ޭ$ H@$ H@P$ H@lqΝI << Єg%%B. E Es IfԡZCM"r6 }$q1 Z ć\&oinS9<kĽRBcq3`IcDGt;>=/ xɄeܬ8E=5Hh]<? !v]KõuiA.ɇ'!|$q.֣ e8Ή5uO4ÿN~aʔ)Slq3&U^ g=ۢ 61fx"2ce/{YW\_|Fq ~0L7!k(®4>~ ]
+c$ H@$ H@@\>+U)ڑ$ H8H@Ѕ'b}|el% )ϥaCbKbE˯|+i}CI h*(-% ~6 /[*f]bLKסѰJX`<z iӦKsa0ECF{GR(i} Mܩzfͯ}kI\)F`FP-<gnjx 4!"lb 0҄MP(7 x"3b͙3g&1 !|,_
ܧ0!p u2b[E6O*, a_lp/ZlK }1I@$ H@$ Hh+IS[$ $pw#4-b'?$}KBƍQ%"ı(^x|~N"b x;?Hkt%ǫoDڡ<@ZSLЙ@5PJPvul}7 ʾoLxG|_$2fطgϞt ӵS>v'ݕɌP\#kHjc|q? K|>; s|6CkwQnS> 1^Dc<F6^w_ϵ9ų5/3p$ H@$ H@ [4Kor6 [xy@ >|t5h/gb$ H@l"*ޏ뿞D0 Y[Dd8)˹0B+ަzk@'VZF<=Ss KkJ*y˳&}DC>$x)ތx,v& J茧\R6$"=I ! Ncx'?I6-B"^΅s>wޙgl\}0E'B"Oݢl?H be\űN^wq^
r=Dc-dØup\Kb##ۣ<ו#܋0B0\f,.by H@$ H@@oW742!0_>$m?忕x!$r*]P-G< H@@ &'a\x(@@cÜ7%w6aϳT{oZ\^(_)a+Y&ޏӟtw
݄ GZMmR2{쎱߇ ;v$hK_SyRTlq5yM??&hj r۶m 5 <p vb\Y,w4/eK˔ 7Rcu $"rs>I`}_ Ə Ž'7cB|E.zG?J_G,/ )5F;x|V\kfޥׯ K@$ H@*g^Pf}c? ]1~ Hy97暈m T r Lsh$ F G E7</ [ s+) ^iA{^,7,V};Y<]vh3?炜cUƁ"!zປ_\Ű9-qQ1AKJgVPo6ѹ4aN<!^f oy[/ţ[#=w;|3 ַ >1 ;veG aiv(+` mÍQ"s+ԡ : ֭KЈҬ-r @ IDAT ka94x 绀m^mo{[zɀi y{^??%a룇sWEV$ H@$З7=/3dfncyc'ۀ
p y& d|ODL]%ZՆ$ H@D Q
lG#
އӧx䡁)?D?aB YyD4I6 f.6F$4-6 5>XlXJԥψDqZlD +w֭o}[0x{%.x:sͲhNy UZ*9thIhIexҏI <ޥvʋ\9f\ KYDSdÊ{&_b42ן=/"^C_%z SXN] '?Ź<u7OuyYo$ H@$ ]\W|8Vr:#Pmg͗$ A{M-B׃>''HD)B".ꕆ'FCX:q-&@!aJ~6<b+6s7Y',fwx{2 !Tߟ8"]Jo% hѢKYƙNJ 1}$>$m9Q!\/~1PvY EEe+VH,k2tf|+1 /&)ùWfDgΜ֮]<Y`Em=#㍝Pdl1 K_R^W0 ѣG!>l}W"T`>>}{Plg$ H@$0H俥K $w@N\v3h$ H@7 b {3qW$-၇iO+ arrl{/\+6sY} _l> .Baw=s2 iM_@Hbe C%x[2b#eLeDI,"`N J"(c~&|>hӛ
Z,7*᧹V\{ە*Wh7.k~Nb5"? x7+鮻JhEE$qz P x"r}+_Ic|?kUY֢eg6^ɥ*2 фiS:
& H@$ H@$ TmjO$CX0/}K@w*b ^a.!N!z!eE)B ^WuIʕ&D4EG/'. S!+<,!P"TS8\ G>T/xAD1G Iw &oN FHEh$]zp' ,O~2<66w?#Y&]?N<X KE$~&y,y hWM<W*5z, /kr=r }iӦu\c`uk6"7y|DlS0?nc9asÆ
ic^b;|=[n#\r.V$ H@$ H@&@[iړ$ g$+~_Ma\YXً P".t ?h}(b u4D CУ?x/ڢիWr\pa?Eya}ܳgO,_*T DܿB]?ORbZ.e.~*k-4;7%e ء ^\ $!of^H7
I>}.y"jN7S8k!_lem# ~xX#\⽋8 Z" rޣ ^xp=~i1>
Ȍa/Ξ=s⹚' #26-אu&[|m9\jF;5(O& H@$ H@$ TmjO$CrEBX?䥈$c G $"* !v8DS&)\/ \(I> Es FތE+9J.ڤe/*v`H JE8y>ń,DcOQ̠X}YhDGL@DD5SM k/|! r-<;A]:lpM 8ab7."yg }x&^c~Ö>W l>1vP}+~/b96>=gΜז: 83SI$ H@$ H@E$[
ڎ 8I?O<hmmI1#ČxZCSsVZBK,4!я~47v!tq3 Q VB #eA|9oQ>9TBel+@#rE[]'uN̎ ;$ ,Bti(˺wLݼ,b5e [Ä;9EdTD,`#]-qChEd ! rोM$[5 ޥ9ZÈًcT^_kllLޯx;NF/=ϺHÉcA_a$ H@$ Hw7'щ%1O|"<cofem~ٚc>ej:kqZffxsy& d a1~;vĥQ=n}WeG$ <(28?P=&;{Fw( DדMKؙMjY[.6Yߴ.3 .] gg}}ě/yG̽g[ś6\?l>\zû3$tcqt5ٶ[ H@$ H@$ ڞM H@@记ԙpu-ݻv- n(ڮng:V]I--.# űS=[ H@$ H@$ s{^iW$ H@$ H@$ H@ $@; /C$ H@$ H@$ H@&bUml .\aweGq'Z[%~YZZ[ZCkkpҖ[cE ;, H@$ H@$ H@
%P\ tc T\墶47f8:Ĩ;H[$[ @e6Bs9 ۖ$ H@$ H@$ H @8~t8ul0fT;ft? rڪ_8aذaaСa([t@Qn> lss|!l9f;UK$ H@$ H@$ H@@ZKF5lھ3ݰ3& V, gY%F< hMMBU刑#CMMMOW Ae?{28^j8755?$ H@$ H@$
7OwsrxyΗ-/=i/b:y=bY:+-?x6< ߪ!Uaa\[NUчȱ᩵©SasA,:ZTӧ뗷c<VFoA;bqX& H9+RѕyN$ H@$ H@:#p6=}a*E> ?~|3fLg;)pܹѴdI6 N**OY"^)]p! =z4E St\{АFqYbGck6'Y8]M v8aKcHi3gBKNcpy0n0::]En7~Yxlh3jd6e5ۿS=th\P*̙9rY$"-) cWT'wݔ$ H@$ H@$ H`@@p;vX =zt=ꮨݻS" De˖#G۷'Q.D ^ӦM ++Ç]v%1I cǎMu>w7dG*+6&z4Gy,Qׇ Mwlר:
ԵVňMaaxgL n^8:Ym斸b9w!4GNkW+{67pImw'yG(W
3MI|g;^يb~[9[K{C% H@$ H@$ H@$08 PՊ:2zHe)&'"mg LQi+JmO[ }ڲeKhllL4iRgCb8|Qo߾ut Qq'NM6qƕK+x^8!jl!̞5=X0TEЭIFݸmWxz0|Xm}P_73ܶzi7l
3N
#kQoN7 Ξ !ai2iB=_v:\9^aHlBK=sz7Jv*#ۄhH$ H@$ H@$ H@n ih6<]pa
1ާx"|N2%KP1" '"URxbƥɓˆLΝ;Ábqaƌ in~"q1!-ݸqcp3s̰gϞdq\&іqر#^:wl059vFpNx[TB/\h
6mlstՙ뒟ܺWꪰduNe(Ƶtc(w(ZeŢ0-WkB֬ls,eX>eR5
nvX$ H@$ H@$ H`xɲ+krvi mݰaCIRg͚Z_9`*O&`W䅋x"#" #{YKr #( . A R_M9Z1 +sWt9y>aKHυ脛D҆˧EA*̞1-=j9QSsuj{qcG% c'U{ic%a鳜
֜qQ=v2 x͚1%,[7 Y^A7M9I@$ H@$ H@$ DNB #p ("!l"?~x
s"/BkQ W.+%DT֯E;wn!i?{ruiG?'L>,QDbD2?\[<!v.^b5Ó1D#´]5]|u!Ls[\og7Qd
Q9p8{իF]@mxaM=~Eq6
q}ݺ(rIu~dKc[A ^J@$ H@$ H@$ N Q,"!rr ZB#r |HCuI-eM־Eܜ9s.)-)Jf+xϲ>-ur9O}?Y8| ߺ3<ל=}^ϥ}eL F
o;_=4ϝ aZ) 9z"6Җ=QM+5i%0; O=948K{Xܺ Hm=-J@$ H@$ H@$ F !!5f
WL<N9OB ={v;Gؤ,b'ĉpXʺxrnʕ ޫ˚iƔmm˺xDS kkd2y\5fMvgzN-gY E+Q#]43cѫvƻpi0u=5Q`>$~V ̚n& >x/WE6% H@$ H@$ H@z (k"z"[.y6+ GC<^|DQ)Sr|<lYCԩSuf a=U"#=ZLH9-*,bkccc?xWe<rnݚk
oܧ@+[w'rl[g8[naG{hN~Eq}MQ=㚴Qݽ`r] x=ƚ6
5ԍﭫ8=܋}h{mH@$ H@$ H@$ ^ xG3f$SUDNOY^xh8ZLR\6lkCCCkɓ''L+oe\#FHb0YM?S|s k#[=myi ^hNXx~/ijgMkU\[vK8|!kt)7{Tchl#kla,fkk@;$ H@$ H@$ H`@$iӒJ>"(:sB4)-^$lyϼl.y"R䗦\/Cݲ%/uSH^<s Lb x
>F]v?n Z-ú
[Ƴ2q6"G\`vXtQl;EDFC¢ys=i0[S]fQC^nk8xX q钤$3lXM?gFXdA4فhud$ H@$ H@$ 2"&TۓoEݿ
<f̘P SO}֙E<_7.Ps<^x[N$%/# ;v,E^dIZ6[Dc֦}'S?VZQ {{MƎ ! iH :m N]s- ^ 㚳7-kg v ê]x595^в% k8<i0rSMF!w(N,UI$ H@$ H@$ zȑm) 1.&ewܙP\s!v۶mA/U#+K-][ֿ-=K[7oNb*zĉ'E &WaȞ{ |#ajbxN7*L21"Cl9,7\ F
b(i[DH~I <@ gΘעR i;:S,cVI$ H@$ H@$ lj]n]N 8HT<X):uuuaӦMI%1acHZ&qmiyg85͙Uٮvv-\]`Tm
/
x/l/8 5ݰ6RifRIq9~:|WIy;{ι ҖÅ
X$F6YIΝ cC#d>z9/X=ڴ_ ho]0wKg%ɑ=͑7\Ⱦ > ,c#waqɞ<{a
%Q3=jOD@D@D@D@D@D@D@D@D@D@D@ ҵ!?E"+RAJ5K,0w-###!:6=sutt4qHR6Q b!EN.WQ7j&cGZ垞mkl c3ٰv泋~
ȥf-:lMUo=^!;2nyb}nk|qo.KGAҺ=^'r)rAWuy{!ͅ
o{'|psW$&ҕHY beQNt* >!=E"hُe_/b^ʕ+9u d[D"Q&wjP'a;翲nS.6'&w7 =g/9˼/ښ*g{j}}Þ< r(c,175ںx`zV]?}<!hcvJ8m*/qvlm6g,477~reFuYuY)KVT7`vq(/ol䋃/AK-" " " " " " " " " " ' ԑQ;1'ǼS4䱹Xm.SOAr^ l,s~ Zzv}; iMy 79qlbfv+2:{:HťemO=.왧AF}q57*k\do#msnO? ˮE
xv*l/n5mVgn-~r>aZCD& mp}^nC5ʓ'OBps~xX&O~|y
=g}Cz=qo=NyъڃG#VZ뷮 [#`ܧ 9{TR\.g][
6-;~>.iYKs<[8+c\C[ i綹'%#\3k̂e5;l&+m,UQ9f 4 m||<Lom /Ub~xrׇ?dR/gؾ&OrՓ. 'N{,fqP~)Ԗ!kk>촇 mmfO_MzZwFѭ 1{dHk<M
ŕ[9rS3~鼟 |Rh ;?FҮz\f`]f B9o,Zf쮭SOxb95Uh%f5M~+-˾y.S +0fӖWY YxX"@c;E&FNMMᙔHS$( qL $kGz1|HUbBAtIDDx͂hΝ;!6ɻr?}^xqo&pB]D@D@D@D@D@D@D@D@D@D@D@N:Q z klSՕ!..q tΐƈy?_ie%~ 8@P`giwznkN5Ow<}}EkiB&N\9Oa6eo٦7jZ4e++[snM_\EDm|`ayuYZR%ÄtD|"_z-[24F^|ؼ] ҕERH ; @ >|ܜw%r]]]lKA{Q3d |ԋVj"u<F"_cv8Z1<)w8yυ q;63;bK<rG9y$i4c?yv!;f+;* 7{Jb(3C슭sʖ[IE+;sݬGѺ i]³_ Yoi$8eٙ
K:#RHDK&^,IIENNn(.jkkC|Xi X}߽{7X' f܂%17y >d@AlcnܸasssZ"PgvsvgMN؝_^` W\XEy
t 38M[]۰cVUYf_^hUk8o;قvSO>Vī<u|塚oذѱ3#x Y!T%g?sE_m`E}f?Xiy+ɅQE5K'ʤt%}a?ѧD<::v}}}Q/w}/8酛<9t0 p{8 gvUb$ϧ ;Uc=]glRkokW
{dݚ?m=Z;Vnos[v3\ArpsްtDΞ,)tso4kÿtAJlZQu,nÿҴmLwd))v)ɇr|D>~8Dٲ # <yd&ۈ%ԩSyg GB ڤB:icY,X
GÖ́D#Z{=ND@D@D@D@D@D@D@D@D@D@D gDUUUor)97ʊr;)kw=%rrBvw{M=0ϯ3- mLA}X{04>+Ƭ~j7W/]_}J*=mrieoG~sچGxT]GAF:ܹYcˈPRG'`3-w]h-Y-#LI QqeDnTs^ݭp#a^ơ"" " " " " " " " " " JgGGaZmSNj lmm#V=&ѧ!nmzEl {C+Q Ir&}Rᑴg%o6igۚԱ<fwv, W]xa5Kyᒖ @Φ w[z֏Y~EL+1Roo2 Z͕i>j[-U(ڷϿ$%1Ҕ9_
YI^r,27ik+u_H"L?nd rwz'mw}g/Bh_:^0 8u~1j {r$6v[泼vj=NGvy:tVrv@ASUIGj3+t^|ۦGǦ<Mo({==q)Okٹ!6;7j- =ï gϞƮ^-w'B%ݾ8(ѸZa?w\n}nuho||rLG;E@D@D@D@D@D@D@D@D@D@v!qFR, "Jmmk
6=3o+S fR-:;Z]Vmx-j w
#nh~ā b OQ좵Ҥ .UbZ#3}>P;aGryDGf< r֣hmمp / r%&
9ONuImL{˷ kdd$Dƾ ۶6kjj*JxF2¹mSxxx u hW>}*Lsp8
|N |-X F3]YYn-do* Dڪ}t84-- 憧7_ 0l7. B"*<ʶ^k V!#hsO`_ 'u/QWR[[* ?Bz䙙Um]ܡP&|[ '&&$hw" " " " " " " " " " y Ĵ ?m93𝞡mPE=;JKR>Wk]x Xr,<A63x#<>'l)lOm/-ѷ%筬,]ɤ±禍n73!۵aX"PwjR?6 8eEE]x1^YYc{QR7Aσevv`u." " " " " " " " " " @Lk%ٟYGGGx~-{}W@ ڐCZ |'Rz| S&rOnXf]1XeG=eCR9%=%2mE
V rcn[*guu5}; ''' <1_Bn ?DjRkg/hYBTn,}D-~m1ܶ." " " " " " " " " "Pr_eHo3_wwo_|#Nd
ڷ!W疥}kgbŅ+բ˄u啣r]n:;"Q.//-..Z__;7(# Bj}}mD0oA2+/v fڍp)pUUU 2W|1>2ks Sf2Wn=${Nʏ9>-" " " " " " " )w_E<ok7"iO$<VOӡs#p2-szt+bv#c=XpK.MKm3s!2<! ƍb͞ZKnd((v D #͛7sZ*3NN2zsssA+7== ~w^kOd0[ZZύ#?nϟm%" GG{I~=C߷_iϞ=|AvvvtgΜ3p8H'Iqe)sϦH=sKT n닖BԺM{)<G¾x"tX X]] #0BAȌ6,24J]ưSk '?_TpNw 28w?c|%
Hn8F 344Xt E@D ~P¼;ǡE@D@D@D@D@D@D@DS'c#'?߷ɓ'at i˔|<8H'O"b<MnEY}>lnåG `\[Y+Ȣ@$rT<g!E"HdĄMMMt ?D랴|ɾʷ?m[ Yk?QYYYe[&bcpp0ڇ ~i
Q ?+WrIe8j^R scQ" " " " " " " ")yvWWWx^ ̔ ޑd|UIm}2C6 L?
ѳF˦+<uٲVB$A
ͬe^ѹ
L)Yw="rS&ͻP)2}QD"n}vBgc/Pwb5_,>Ɣol#1Xui.2(4.b ]pIwLƤm" "p?{H%wIڣ
KD@D@D@D@D@D@D@~$3g<[gDl:NWv 8 'Oк8et]<eftj¾f7gƙmI]z J5OmCP
ypҥ j={$ /{ɡYD遉FeS8 )\7&ڤB u#r;cx'4UD pb^m~a"" " " " " " " "p|ܙ !#+fggI%p-&YRH5͖lsi6& ZiuG" uvqNaۦaL ^TMw |Gě
E~rr2Y`%/ic-===An]<gWdRh{nBc˭:р|I"6D1y9cEfJp<i)IOD@ ? Ϗp.yG9%" " " " " " " "3[^Od
ZDky6sOq<mrO[٦A{\Ua=Qݝjv~ѳ3 뙓-Bȍ )˼<G.K kQƇ縡!#6eG[9Y-4.%M0Sa?%یHBc;672hטqKT.빅klc6a"." &ϽǼ
[D@D@D@D@D@D@D@D@D@>.)h0+qA]͑͵[ mKږuq]R%VrkƲVk0,7^_ZvfYI_
B ySID62_-X$(yE13 iP;#Dr
D*Q9ܹHQƳSm& ) ߿ 6?l¹ИGn|vGC" " " " " " " " " " " " "hAkr+=}ٲ8G.?Z*b*+Rꭤ+ Wv6gGlmז rvi+;sRU^ m ((,9|7Hle ىݷӐb]ER1ԄW *'8^$6v.t@1N$Nç=gde8h'[В┕6W|.im#iK'EKwx:| aoL~g2X9l<E#[g ]kYǴSvx.D(}@J>A[Ng~)Td\RbdZ؝ Y*WWWCv˘2NHS\'7Sy8co [Jedmm\_ɻ &+aSgڣEKH =%rvm̍-TɳfnF.u;K7<~9x9{PP툀@ Ѹ9D"eWlؖ9G,m^*"$pE!hi
1z OsZ܋^IUQ]ۗ}TY4[iז9FB-I PVVGdJA
L#g)1z6-wsAjXUUU`bwn3~G}TZ2J*<ݱ%=c٩G>m.Nffţc]ĆT[|nڔߐ*TZ7ȵ&" " " " " " " " " " " G t eY5Jٸq^|g[1\6| T) AxlI]=quO]<v{D-˙58jm[yclT oNd4㪈 $PH~OQCK-j*Uҵ>XɦGBE҆V %f ϛ $@4_yNvI,noӂ <Z>$eq $" " " " " " " " " " " " "Pn6ۢƤ' A Ղ8^(J @ IDAT쉀0|8 gD@D@D@D@D@D@D@D@D@D@D@D@D@D`O$hID@D@D@D@D@D@D@D@D@D@D@D@D@D H~8C " " " " " " " " " " " " " {" A'L$" " " " " " " " " " " " '@*ur^l#-+M[[߰|| |R ⊀Wؼb#/mf~N75XV(+GkEAU{" " " " " " " " " " " " "L&Ҕ9mv{mlfm@UT[!JAw aG.E@D@D@D@D@D@D@D@D@D@D@D r_3 (ߨ[|嫛^veyuFG'mrfβ̾WN3~ڏn OҒ
UOoJlna =Rr"i Dn7[[_?*dr|i h|
d| MٞFb *" " " " " " " " " " !@4̌Ά*++1\Vlѣ/.X^^n
bi<x+ XorEI{UUUv̙ UTTXsssc=h٘o-ثIG.ye%VQY-immJJJ.t{OغO_pi;26agۚ_gfK?u%uI= 1 e$z Z e?HneucKnM_-,^
%ƺe|}cÏ˰/M2^w똣 8yDd"Ƣ<E"3 -tf666f/^+h_|E > 5یbIxi +O62251 b{{{=ò G /c谞ws\߳~s!ҵ[[B=ۦK!"n皽UW٠K{5إMKozt~e. 3sv{= u^iލ
tOrM6U@#~w9C}`i.-!\~vPNM KuidpdҖqQ[7E}$rI/ n*" " " " " " " " " " "P ⒨V"L---VWW"*HZSޒIE"Wڂ,MԯLrE& rvee^~ 6lgA˸+/U f D>{,lg iKD|2>{N!^lɮ]wVs <gõw9{C{؊G~~] 똲~fzZMM #sS4߾8D{0̺l3|fvj#_p9;Ć =U ݺ9e|UV|I{`hQ_a]>Yo*?b _YDl~u;i \MAV7F!!-MMM '6&*X"aَ\eTOmcJdP֤9>il^"k)E ^EJ"XL&ʖvf" G,,s K$-Ѻl?I%f!Y9^I{9ژu}Qw <q1kl6{iyu Inc=vn!W356xVW(.UG iX
Z.QV")6o߄ND@D@D@D@D@D@D@D@D@D@ދ Ϥ۲G*V^UPsv"oiYDpPꍏ^"gĴ1>EynYFs<}06֗|TE(63R7FEK˕q/Rߺ ]'[Y[=.عޮ!YCC]]qLǷ%kO{ М ?rG z4⑳.gd( 9\ee ?F[.h?IO |Eb3`Db (;o߾ H-Lƶ|H7L__diK _!YxE V Slx!eqp|nx|13Ma[Y}NWQ; moqޮx \֦z꠫ؔ[3eiO}#<uwM\Dže4 _ k嫞E-"A[ WQ " " " " " " " " " " " ΅E&ѪRIa %ioooQ]4>1.mE&BKD?>HT{qE+16foKme2eK_
,繸h?{h=%4NY QZ[:ާW10>{K#/]mjf~R.O[)Ѱ^gyy%4Mfڅ얜+*9 Z(@@|"+A"O S#ӨK`y!<c:a%
A#caXG;B>ٳ ^植%_!x_z"pmgΜ ǰ ?~l]]- b<!_8G.gcZc9i/xz-!SWH. Q#/s*hׯg](?I5{i? v%g ƃv\wYK N
!DaJ4'O(EFȐGG10BZʜw
ʶ(Yy
7 Ŷ SojjFFFlff&Z cA"3^}KnLi ύ۽[h<'aٛw ӌOְYkR8V8
>\`Hk<쑴s_SS3>'[H啵xyeY^<cϻ 27X%hJ<D@D@D@D@D@D@D@D@D@D@D@>y" ;>>8 ,mccvZcd /E"l'&&B㉰E|D"RO>
qvttD/3.E<#re "m1[O^.-OkX v9ѫjyYGӾ-tק%G##l#ad / ˖HkL:*r味)ga-A{8)" " " " " " " " " " " 24AKz`E"8N`) fB4FFQ;c{-T1,s rv}}=p<bgHY2T`EϦ- g_;.sAΖ<YDjw ZYi ƆSG)b
EOٳᗖMyc+ =} m5!1rj¸%NF6C" " " " " " " " " " " "p *D`s":s6WD(xx}pp0 *(]a mKa"Z [h\.s_<6J(j֭[A _z5uDS%h%{>6QLNyZ.>3r27 VV^NsXN8Iw\n;v1:i+m|]ƕş?R" " " " " " " " " " " "p $,TD2o,b]XX2D"y={+Ƭ#cYoiiْs"Yi3Yk?Ի~ܹsa\KѣGcʌ&6ϟs<q.-EhnZ.Oq8,i[KG2[r6RgQ/q]㩨M/Yu>lEEyrs.KՉ|jaVD,(-|=}tDZDJ Q
<! hp6W& yqz|>p>Kf d99KcN}vOG;/{)᧷l vZ[]iyZu\Γ蟏OG|ܗ,Y[\;£g;[u/k[6лp0"f;;;#HN$& _WR#\- aI#<== "[~"Yi7)~ rM
i|ҥ/Q דr9 Y 6y^~s;I#ًW6:>a |y߮^siW 6ܼ<&{ e<ahi?7J2Y~=c7nyzm1]M'O $Ze"eBE,#8(9_čhq=Ga!?dvn>yL0)ɸc
; kemfmqSD?x[juŁ^+MXIi=vr붴jw} = rvs?*=s:DmN؆KکVޮv+uV$h|D@D@D@D@D@D@D@D@D@D@D@>y1^(f IL#@1u@ r^
S7w:6Ye)V\/wܢ--Z\qy\=v|/۱\c"gIk<|L|O]uHg/C$gsHYIk ?iչ HܺG6MxT⊥<o:ҽ,mszj\Z EOA}{VVW<U1?0r< j ]|PhgwgC$kv.מ(AgT(" " " " " " " " " " " " GEo]]3sVPktk5ZuMTV ;9K,rΐ9Uݒ.c{jf5[c͍>n aݬe\ԚM Y<1"%hoH ԣfzZC)ro7g.=7ycZG#oYKm9|z<rb^Y[ʅ[ ǣc>' $9咶:Z4V?jZD@D@D@D@D@D@D@D@D@D@D@D@ޗ@MUww)k HR,/,zZ㡧.gGzZcW味=r`_HioH-Azxt,DzPM{f}= ay\K h " " " " " " " " " " " " " o`Vs{ɚnqyŦ\.>d( }=!q|r6A͍I槌ݴK; DzQG+AE@D@D@D@D@D@D@D@D@D@D@D@D@M
uvqN77ي2˃=!6ָPz”mk1Dfyyv VUY-qۮh<" " " " " " " " " " " " $%.;C,ĝ}f >&2+~@&yXa%vy)
9iK," " " " " " " " " " " " GAԿ+6>9m%L6celݦJJRyjk#^]ξɸ9iS gl ;"A{!@luVg/lbz-Xc)ÇY Ipetɩ=O\ft5{5ml 2m-gljj?Hi$ fi zApW" " " " " " " " " " " " :% WuzH-\*+es1)A[WW&" " " " " " " " " " " "p Yyy!Ç܅ =aR%8< 2_J- a46E@D@D@D@D@D@D@D@D@D@D@D@D@D@% A.mC! A{(XըK@]&"" " " " " " " " " " " " " BPZUEO Ju k82$"" " " " " " " " " " " " H@~/--!<yX:G!;??ol6 ǰS >cT01nƜ~ve2=nKӲ# A{G 11{={u vd"q٭[lee%/myyˍHݣ566fn---o]Ow||&''mmmJKKFo E@D]?X"ѳD"f)#<Qw|X.%%%A#h N
Z"߿ eK ێzOD@D@D@D@D@D@D@D@D@D@D@D`H O( I bhV"
)9u^di ڭ~_Dɾ|cᘃ,О
ѳCvww۩S%5sLw{E@D@D@D@D@D@D@D@D@D@D@D@N ړsH3VNMM/^)
633!-뭣4ϟ?+&rhSgφ>vAbbL K[aܹDz?kf io<r:"!{ƍؖv 3Mgg9s&ԫ璔{_D@D@D@D@D@D@D@D@D@D@D@D@ u=hR'Rh ]CVVV Q~"]c4,=|6DR_p!SrAbJ`ڏ"IX#YϜ7oW^-~ؽ,_UU
!N 8eY"yIbZI@d^2j!ѳQz TMhD|ƂTb9YVV֑XyIX /Gb>}H]B10iٖ,9Y=ΙHa
2{0vf[, @<'gͬee㶸 c?
~
s'ayŢa#_yE "hTnZD"nso|hOŋ!ÇCD+ 17ҘhY/$-ѱIqhK
ks !Ea(#1$64\h]D@D@D@D@D@D@D@D@D@D@x3e
ϛeϥ C羳 y Y$yND={?*M \5 7b#GA1O+B(Z/HW"5T~ pnԧLTl`m.Be_
"X#wy/E;5>," " " " " " " " " " ǝ Ϲó|x;6
ȤeǓxl+nLE6H?E>C;/R~pqWL*3yƟ#y=nv',7Cd-m#RF|Q?Dن=n,1Kd;R ϵ|TD@D@D@D@D@D@D@D@D@D@D I<K&ȉ{Y8d;l-^,{I2˟yu=;σA^"m0bA2I8::6V3* pЛ@s<Q'?v>^xWrF`NF"#<~a ԗ'su!>_?#E" Ai]:[ sIYO
MĄuww;D:]K+ѱ|X AI}"[GNq| 1y!6^zNm7NfH_aǴ pMIAy tCQ" " " " " " " " " " ' cvz
= ڢ ~D"7yU__oHQdӧOCd-/mɉd?HƑ O|Qq(ɓ tʴK}֩Oda.P|gϞs #Coݺމ cO}˜c'3ׁl=1}' A{LEKHD"S[ZZB'*˗A"aǏ ch+X#6
PA>| %QɂDܲ K{eC51 e|ǗwGd1,xp!"k@ M`˰s Bsrrr;z5
ZDBh"h<R# .ϝ;8e?QN__}Cӳ&u؎0&B6vʛ|O,b l;suuu䩩 Y1*" " " " " " " " " " " " '"hO;#6Ϟ=kmmmR3 (? b X%1i}I6i4ʔ[SSGꫯD([=uTog|˜_v;(hrJQ80VDًFJ6һL' 騣h"#XXF.W,lOۑIjM$o,h<32FΑW /}ed2q>\{PcR;" " " " " " " " " "W< x-NRL8L;!>(
Eq$4ܭESdԧnwڿӾd_,n]uGE@D@D@D@D@D@D@D@D@D ~&,nmC|
Jū fG66 z'I'.[email protected]: "_ D55/8"" " " " " " " " " vߙ22[sOќϺ.ti%d|]h.z A{?>`.uE9cD~ƿt(ɴa8| 5/S.i1 i?8wcz9XYbaZA{.t'
3*_1UníT[{/" " " " " " " " " " dc/Fllcf}gմG/Y?JC-?
.jc$_j0h?hMTE`b6 8 s?}m9[UmٺM;2<@]٦,/Xznt˝?K-,Zտm[t[ M8)@rښUU[Eyy\}r K G%d|X6Sm=c_ثC[uA4uYB[QyK ,O=}d{|n/惻P`l67ѳ|r|'.d39n
=kkmKz6֏VW" " " " " " " " " " "p lYQ6Uis5aa)SyWyOeexnОn =`ىq[^YrlA[ZZkQ~k R/wcl?Ywzq~gaye"[aQ^^f6=3g7?ĴԌ-,7/ZCo/,k#4I#A{R)" " " " " " " " " " M^6i[U"i׃AFar,QuNHԦO{,\Z/u)iW+s{AՐ2~:0um^oܻƱrsL7
]yc>>Ob_XثOO.s.zhMSiKScVWSe]9RbOp?csdV퇈4.}e2PW[}|! !?9I5$" " " " " " " " " " "P.2YpirY DB'$6]*_WyX]nlؚGZJX/;cqqў?n
N>m
F?655Х횚촹9 q\ԏnwXobb"WDkuu={۷4ϑ{uh%a2G[p aV^Vϱl](B 9;;QTg|v~{Mwi#cSL6 K?G'Sk]:gU.i(?_b_^`u|.}.Vg" " " " " " " " " " "p| EU2͍OEVUUy #zf
zZ>߯ p,2vKKKŋ f\#$(i ^w799oE[GGG/_ c{uy啧Dw/Y+Fe#by!/^D1csq~ uڵ'i3~]g|Tz:B_4r{.qb|¾Jne.9]{9d몭캋z`\MN}q킏rrscbl*<}3Q] igVoED ~)2_cLavi>*" " " " " " " " " "px>Y2E(Bj{aG-~9xv̋z;]x<ϠgffB$*===&Hڱ-PM'AjD"sP/ְ/9IO伈ES/D?c%ӧŸ r?00zr:ƶSUl.h5_.<_ܸrtJ"Ϭ-ww]xzJs3ީvjRZO166>>kxxK˂:q"~O4`Zjjjzg/Hvl(ʈ:|y:u*C}2"J~ɝh!"k9"2y!xKIL96ja"rgn=lB:(Gy66df|3jE"Eig "7M; !ԧW^m?+]"`yNPU__v-10&,iisݻw8q u?pN$ 3ʣNoܱW7ID÷?Ͼn mOVsњ5>s٦gl??|WVgk[
9<œSG>qnn<tk wa & #N _b/o&|,//ٳˢ*T_~ ˗_L\Iv|.]|>%ė#6KFED@D@D@D@D@D@D@D@D@@ʟU-3K/-/?M"lNGQt+ϢyL!kƳj"d)<w~ax U\q'Q,>Ƕ\ȱO< AHgΜ szH_Rq$+dڊca<#Җu "!ESbGx ז*ٺH #c.E~Ukmn,\jOc|@7>UOoLaۻ.i>ϯ\|\O"g~!ikr=?#a#A{B/q E{n`t._|ʕWe6vvhz.\!_*" " " " " " " " " "12b|@0FFqq#=d;ϩd3lm#L;;;ëjO%[єAGX<%-㘨Go #IRg[?nc 9 (g `iI̍#Y砖sGҮ/
R!vy:8sI+ct9{}{1* >sM
aq&TڑX'O]' Fl睛 `va=.%Pl_" " " " " " " " " " " Uh3i)Ϝy #RG@<f 66J>z(DrL5ϼϼ,}qQReziF 3>,ѵD6
cd\ԏO=+9{ocS mk==3>d_vN77n_bØW5{
HڡGan܋{}N0yy
T6͍uܵ}9Q$h8_"#)dȫ*DT`N#c\ yHS$'"9\)HY2"c$pg{=
VR3Hmjj
qJ-utt#Ji !K~o}D>~80&
l?&ʖ<HYƍ4f@ x܊ZG_MگRYki {_^VOm CV JYn}lˤkb?{dkv/-w,29]H :bu " " " " " " " " " "pTK"DslFytT ~s6t">lybv+{1h y2C~ǻwrO]O.[E$%kDF %ҔB=SHU;w.},e:533mhA|2 DlX/60ٳgzYc벘~ϣ/>e|W-,g:ښ+EÉ9>u8HnN. gn=7veu? x0v䬏_:iOkzc=k[)+ 8x8"* Iʏ`B\#x4d
o9+w!CԞO"Mqİ?{?/X{S+ɼXqEga'9 - 90w,WJ >[ epn: A8%Ɣd]_z5D" 㡯w? q]q}ƹ=q痭ѯ\sd454u:|EI _:4s.zc
<y s [yh,'}Z#" " " " " " " " " " C لB:IdT<^On1ю:7 mq#e
v 7bmi}{^/_[MEٻu?p o||<#|oGMK`mL5LwĿE
`YFIgTMFmicrO'-/:<< v,KQRzAEY˜Ŝ9>1mmuIiK,r+>lc`G4׳}{ٖ6U˞C.~j\_>#[^ےAҽ#MlS}ymк:Hk> j^mߑ b7x#
9~a QFD@D@D@D@D@D@D@D@D#@ yb
bPDWgD rzs<i T*QF{+ |n܂tC"Ṷ11鿑<;Gd"hC"_D2W-GlCv#r<}O!ʕX3z겍xx
!vi}<8~Γ1uX8R!.Js
sZz+rr6ϒ U tӪ*lpV<c[J8rq,p؋]!7NRpDw+ˇ(ƽۡL
& ݎ~Gg( Urvo0gD #\{-<}26o3KVi;V؊G.ޘ<Z4~ F <#g\W\k |iG+ѩG~Il]ZZ
c>/U ?$orJxO.m0,Gs )E?|0SuȘIZ|>=h_]hqצgޜGhiki}>Fqd~<Ƭo[s[QQ[ޮ1|}J &"l:t܈%̵kMt8_T7w 7na($\v֭p#W6䡧 };Pi]D@D@D@D@D@D@D@D@D }GІ xƋ^mx36jUu5{3EXzs YIpוRs})[ל}D2N>Fv$/Z?sy8
No9_m800 ss&ڗ / =Y%:kWS3olkv2njBvݸ5d=߲ľ-P| Yʷ_4>wmQ8#A{/a
*7B&&A}'L&Md=/Z Qc{ɺQrMn8ڥ$
y˟{Ipͷ̍˗ǩl!Y> =Ss:趕ՌyE,YG$w]XgD @ IDAT ̳pN<:#/Y3|@,
[҉]XX<[|=G={: C$Op,~rj˔,ycbRb0 ؑ㾖o>l gNOlѵNzg=l ܯJCT{(//ڝOcӮ5U.ܽn1 bpN(* xetMc?mj#% C4,_S6qěl\OY oLDN.X13 n}zb"spd*Rg< dAR?>;Y{<>>y֞t߭Pb] /c'2Xr;ѥ3 qQ;_^$ |S=} >t{2;]Ύncߘ֟=uZ+[?XX\Z -\⟕+3"+ tNc9rKv
QƖoH .lG7 7χtƱG l#.s yɡO/cc!iK"w8zߧq^9c[s >Wh}y_{lg{kp2MzMNwK9&umgYddKl;ߐ JKsBPT UM^Q)^At5P@f$IwGYd5-#H:G{k^{kϷVQvڶ-%M+ ˇO`ٕGNEymV%mM<_m* A_0/lLst.!O簘E\%tLM|(#Eey?84
S0P80J:_e&/" " " " " " " " " " " A b]t9!#q]֪UA
a٢(b朦g_:bwOgjmyi۶oV7'! t*=6I{"h݊JÍcy(x27='+L5+m!bÞ y(zСpҥT8K600[GEPƒ:be(\{z#Vc)
m$/I|XFN08<lQ'0ڰ 2{iIX0O,% ^ZKA
.u
uqj榍 sAz -=/ A
DTo fANHy<pYmDB?{l-g3 Ǣէ2VbN9: 6+<X <֭[ɬe닜#",6~ʕ=+,a6ְ%ʩESrfav.{ycx.Ng> VD@D@D@D@D@D@D@D@D@D@V 0A(
"gl;C3%G}e 04ڸl-iub ۚm8$Ca_22S:0- NKK P sҢ" (uիWa:UF Coڵ Pۑ#G{(n t۶m5iIC%Oc9 z ta1yC;x)윚j,1D^;|pChLi/SB۷/5(@@c`&ձtL?|u{>Lkya8[[D5gC~VUQnwM΄z(AH%3LjaIoA_ ?¢X+X""""b݉c;Fu]SjUUUp\|# p0?v 1{/6S?@8ˆ~@Oh?)z{S9;w.LZֽ8-u
"_Dqy9X! = 3{SN"^9.,zGe-.*#7 Z-6gw6#̽-i zA_yIHAj-I]WqB'Կ8Z@r â5#OTI&9ukM%Ƀ.2<Gb2u eGݹsmmmSx<]@fϔ;vsL= =zʹheL [dS'\'0|\(3Ȳ%EA
c#a utl%2\ZF(
bsI"0-Af;tYgvb}vL4tiSV!v-6fw=vJˊm ֶ)7仓@Wp78Vln %(b&-aXb oqn<#S']R$ӧOG!70K <=.rG|D o}Ry[X,i2+2. Y&2ԗ-J'" " " " " " " " + c ?~ܚR c~ <x~'~bjfx 3
oxC/]PYjjW٥a B{[-7ڷ]U5+3?gׇG*ivڧB r"lIh wQzu۵*ZuUm˦)L+@[5g~FY8V2x+ 7?"=Sbщ-!ǬCTįnXJ*n!9ڵElsSS#d"xR6bJR CMcʅa W6ڍKrX+;Vr" " " " " " " " " Og}~^W U1ӏ/ږ-[fh|'[8q~w~'k>3կ~5&
1F[KKK2x*Jݏ?ž~ kNھ5T_ajʣ`؎A`9:nk~] KمԤ îw [Wްw}- ft,ggL"0pX.s>AgK5s?`7ÏJ,K&yFjVǵb'9TKڽm[Ϝ ^hsޕM{K
FI9
#."p#5a@r^zxXvb P -&S2ɏ/\YMɓ_*0 <}̙,#2S@?#Nȭ}=y" " " " " " " " " Cq[VngWWA3e9Çݻm߾}Vlڵ|N<i_WG u1|3q !~P---'HeDQv,LeCZ<Lm<n (;?d߳.8{#Ů
ܚxrZ072H,Bmuy1luYI,'0̓A0h
uVVRl.مm!SОd v9luuXth2ȓݧ,-_@uU>< O܊|xxG]eY>h\p2 a=R?R|x L|СhJ|@
v\%|4 7lǽ|Ύsl^goF@c)}QDhzի `}.5$rgcň } ۿh˸(cCőO3+3
ekͪ2۶҆F/űʲ(dWXv.\a Gƨ=_?Ю;هޱ7Zb!teA
CǛ G;Tg,_{>Wn# ׅ K3?6fNJ?¶67Cҙ#fL6l敥; F2!E )h#bHÀ+q!`qWH>$@ź0?PO!P%i ,w4q:2p:Qn%y 'sٓޭI8e Gּx^{1m3,=c{.Q\`X6c%؞y8fXߑ#G~ ?E[ݹsg #dT?qLIW~Wx 1ZRs=}J3}4셳W잍VSQj=ׇtπ
E?d 20jyݖ8:\c6t31-SX,X],J*glS\Յuq#'Y%o߲1Y;%3, O9% vqyEi|h`݉PΥ~ U{zzJ p\>^d&GΝe!
{yOtԏgraKuYP> i29# 8>Xz E %3qA_c{18=1aG>+c=f?51&ApH}o XY z)LWayi=Z l Iׯ. `4 pXw65ت 2
w?h_yӞ|ng,>9xNї^貿(v(XNswbU"p/Z 䖞ڥ9W NDD~@Ȕ~<Ӄ||`-)"$q:89|CDIO|֖2bA)a^9%4`/=c:# f`c]x-ԕ69>~")~ϟǚF 0 "
qcCg\?A {_ >qF,e0HK /Dz.ϲOXey5ׯkUyݷvZS+wS ꮯ^e/w\Xw(rFًOM6ۧ=PF 5N pYc:Z9X(/,T7wH͝k35ضm[U {`Ȥ/`ؽ{FZM:CA}M@ LL]R z*4Æ.X8DoC eףHLlnn v|DUE@D@D@D@D@D@D@D@D@`o aҎKMx+o|/yjD>)wحlg7rKs:9;*gS= S-
'zPp`7azBIAT
AAɝmj2hcvBhP^Rha&B}p #sm
ȉ@H/R# Qp͚5sn&b##b*) XUǛ6mLSw?.&i{:ǯ96Sti5ۋ0)mް% b;Dm>xWu:h/" " " " " " " " " yzǞ1w&,OO ycd̾[aq#-ыQd*kWn vR}; M &.nXL[Iw, nG7ug+Jݯj~%浡J@lƚc:O}۱ WD@{gS[l$f
aN`dw+Q
GZ{j:ǒK=ǴSO7Y:08 Y_-" " " " " " " " "ts=\{zzl]ъ69ƙϸ Xc]zהJ<f{gOOb|792 k.wͪ+r{Ma}`T$`,ްK;]h.2{ !U듙D02[ aly(#̅ڹRܜ$0r.q96-BMyL`1ҥKẅwU{77^1=:|SS x]}6A2mWˤ1+>JsJzk۸:6 kچ81B.ke5,7)wpkc/ok i]Mإ`M[f?k_{3Nm\}챶c__yV (Rb,W|H=,`
c֞WrLY"'" " " " " " " " "4KQ46~c֒}en|Yv\b'g[Fr;zU䃛,m'a¸>mb7ګw7 $_Qׇi'GqO hWBw<l+/uYЈU!vʀ}6Z( >
ˍ#"$.-. tLq|t!Ҳɉ,>`Qo>hZg?A˙w}ǶfM T7ykfO<؟&(?֯aJ`jfXPa V֨jW X\k#ȕ<.\ iU~]K-).Ңh}[Y^l%ADi((+)(j@(UdF MND@D@D@D@D@D@D@D@D`i `NX o~;8%h}{$cYo>٩S~~;Ί 'dx]ī7G'zzmnƴWnomӗ~6Lc< DI57vҠ
ጜ,9 K~ T| xO~2Z"}ƻ6 ]"///F7]3]Fj+Kݯ,f+Úgs쯞:f;W??X֎Uv?<ioZIt v<(g/
a0
wDݱfhl܆Ca''" Y'0zPD@D@D@D@D@D@D@D@D@D@ ,n/_~[~} ~?8-2V9s'k~C __4Wl{X4ڛ7ڍnTO EO_\X n<NC\[YDq^{㚍QS-3qī>Roni8%radR∀x] D`4XQ =z !NG<<<lc2{ӛ GZof `<Hlɳ-Eݳg
ӧ0oOK\ ,O4x6{UķNpuW5ck'"#v"
w#4̢`·B[-T:k;ָ :{# )2%ɓ/Xc٭[Fa5Hַ//FYGؖ-[c bcJc֠X7e.q/
1rEej7 `[ڬ<}Vog_ZoUeQ$ >ag߰lG7a}wf}H=yr#&zonѰDm(8! S+Yqh{_hbϞ ȹGzlCqI?L9}x={-kXm{$IE!" " " " " " " " " "l0u?lCCCm6{fzliۉCٟٟ'> {ꩧ쳟=LCީֲ7n Ξ=-g |(bU|$===Q]jU:k gIQ5Օ[yiu^ qkX]j +Ra{Po~pqKXc7Tۃ-s68ǐ23~6µ! &g<(>c_{+4HVIm 8Ϙv
{=" xXɉ@:\;70 s" !/$O=& eyr" " " " " " " " " Gi~~jjj "m&5Xfo1qgg!w߾}:[w644>{W^m>hpw}cǎi`BϞ >swv6VɋaM C],ȉvǷOVk۾M5hPl_jaøl' vulBuzfsaG`K\Tf~.oyؘbܙq,'I#phAQyH<t|H%20K ?z [hXS3\ {Xݲ1ǘ ~~g6/Xn]rtuu7hw-.A?XZ Xf M yI]NޱVY^֍EDIDXËhO'nãQ˷=-%%% (1xamhWJ] =
'6NJ# رcqz~vQ G y > P~U+ 9?1vС۳g 9r$G\GGuuuEvVE@D@D@D@D@D@D@D@D` 8`̑#u\8`250`oX5 ~
P [/Δd*kAzft(: ږnaoh wƏ$@;_J" `e˖) Wu)?Qǃp[KKK| Y~}ru܊h;jL5<GtDֹ{M7r_D@ V~%8K(.XגqƘ|k'.S*TUU٪UbXKhҹ@ .ҦIO,|<~c$#" " " " " " " " " " " "?~6]% vqy4L@
j[S Xou>o>Ҋ@$fJJF`xxFGG˧KND`ݼy3UVVdQQT<#Qw&:
X(hFWv;{544x6D0vObɈsUUUVSS3%ى'b ;vXccc,ҥK6666yUWW[iiT^ GPfP+_X|܍1H
cL-2vab0i%VV\hVXpwÙ_ڄծG'y< . .^EJ3g֯X^r%)5 \|4ԩSzj+))mӵڿ[.] |uuu뭮.X;FY.P" " " " " " " " ˈ c̬cEE2j6qqUVe43׆
lܚW[]eKWig%ƄxxA5[I3BΚN% yy3eA(y
CX_Ǐ'DV>( -P XcӧO֭[c::S-uwwGK`Z05~c'iА=#QM!" " " " " " " " yE1Hf1 aʼjRTHJls.mնsc%+aBF[ 0;62d
0^3 Jw܇rKK@_#A+) fc|@7Z[[[@@%+;{&X""2U磘{(pE}ȩRNLߜhϞY f" " " " " " " " "p 1c lǘ$rw`0cwƚ=yg}*7o[yeU0-B칬V<qpl@jdž@\bh
W[
ʨ,qVthW_#*"Ln۶-N]?@WmX"nٲ%ZR+!J .>X3BT>HǴLqU-x\& %1 0~,1*LD@D@D@D@D@D@D@D@&d1` ɓqIT(10d͚5ql^ Y?Gv5 c7_~ٞ;W
N ] 'l]ei`Ϥ_$;'qxdN9g zː۬q} x^b@W`y<X"8FQc7@; +.>~0>[Yޑ>eOXL^V&yiZ2^ϝ;g/^Zv`
F\~9 0Hk1F 9:0l7q`- nPmO <oϞ`ݗlt<,36ܛgK؞&ײ&p9z6p}f{ޤ-N>MLqiI?PGw&3ll<\ӆ}v0 iuJh/Oak7@ϱh4ָa}@:\Ktq2
<|i\'6ׯ2 " C|
];\Hj]A#
kRtӥ;?[y"cN}߾}Q-]픁 XCWkl>I+'" " " " " " " " "0; =֮]cl0J{umqVgwg qv
Ƀ&Ư;[A>:1>#
K RdEg p t{
2Pqtqԉ{0][6FYbUT+AԭUSiƨ i{Xe6nic֯ϊ;:,T̞
*].{tׯ_Cխe ; $:\\wwwdD</}]Y~ɅPxPPU]Kvkjj~Dh^L0C>qD\'צź6K0[T>" " " " " " " " " " ˇ 1%/3^͘3QS6x9Ӆ[~tgϞ83䙰3cr))]<L%ͬQl@U<c.fD% "?Θ2sx,LAu:{RkBT,͛#mJ˭q{=Sn?o
òPvݍvT 9n5U6[.\q <i{ЖlWw@dWV./d `qy-tX""PrPvɽ]^^ _+"^K8ʅO/(tX-iJ'" " " " " " " " " "20q'%̌7326HKt1}Y1jƯSS<aǑL
1>
0F!mkL50@eZsh1JLeB87G(4omۂf ku!c;ƫJK lnhݷ3vd{ȿ6[,\g G7lg -4 Gl9ѱq;i 칃GvԸ.s3'x1%. Y֯nE:Ѥ(AW3gϞS2ɦàS߹sg(̽K>L3ӧmSYR /L^ 9&>xp,'" " " " " " " " " " w#2X21c툙YcmD.2 M\UfdGƩ|Y&NxcL]FKHKlq:M 67n'ԙw6[^G1EAAb4rf=u > 4d ZY1X jҐkKsY ]=6 x{. };!GCs/KGOY
+$f.S wUZ8u swx@ O<; 7N8tқ7o/ :`RرcǜIh^$S'AL[ KY^xp,t===1>Ht.s,^E@D@D@D@D@D@D@D@D@D@@KΦcqeL9
Hq1{0"aX2>^GqaU¸603hx7FJ8f&M!c=K<ʣ:/ԙ<ɛ:P?ꌎXK^ߕ ;u֞?x,NVA^Njq-cu?dW6؞6bUutt<;ttd9Xξx(}1}wǛڮ-V^V:ctyj\2ˬ^*_й@x8c/ 91u;|& d%fԕmGM
m>PPh txD@D@D@D@D@D@D@D@D@D` 0Z4,v#%#7m"aXjr<s.xݖi{t`onav<L`#(ftEX;WcɊ 5E@Ee|է*FDuqcbVL#XaZ⚚3/~qsCzĞr\čW?{$9i/aƍ(0uYE<]Sf 60=79(V/^`qE& 0w^ֿ'qscg t{)[u^|$.X. M:]~y'_YhKMXسEGڇiB9^ůT
X"B"D@D@D@D@D@D@D@D@D@D` -mVp'wmyK ڍ8M, ^V@-8q
>A u2, N.յV=2?I WQ w?&b)VKs q1x6Ÿ%_^0ƍ6-tLUL: i*4sQo6gy[HK]=h3 ѰKO"Җׯej b6=VX eӆ7˓jccqbnغ&%%saZ 0#+
z
Vo%{ ztt8` z:{wtX 9r$>X&;p=e!ξ+Q(ge^Bu5,//Di4e~
D}~Ϸ>J/" " " " " " " " " w%P^az̊&[Iyk?`WTPla70A
VrN YK<Jlxv߰
pYPTǐG-9xXbX8KX=cԌ?ojj #2fyƵv1m&OݻwJ$J #28e1`j .:8yP<ۣK9oذ!I<hkRw |,=7Ă? L |"9;)z[6Q*4B°nu6H{j_(rҷ7 'lV[ݗ#'
SPGM@w] ]_bVYE㤃Mut>m*/^ tXQ[: NzrL0 G S8nwɆ <,ER ^D@D@D@D@D@D@D@D@D@M X؍MVX H[x];ch< dy ]s "ڥ̆k$WspYK,Y1bfKf=9nglZV0nU,k2lKK5c3Ot c<<ɘ8z o߾=֕soY/QC`L ZFӕ{k/k=q=iO Ή+.g ؿ*+5\KRtt_uٿ5\!{1W8 *ϵ+ e0 )N,RJͽklkD رctl?3%s3e[{6`ħL;y1e| ͖w&xܹ3<fYya`%K8-a< $Pq'ڍ_U|7Ο4+
%Fkم,Yy#xVڅ7<a_D dQdưSǹ8@)cԈ#\hsX8cФ%MK^Pqs?nE0t 3MzeqOzfcy9|7nX.KF\v#GCOA5gS[\KlWӶ*V8W]Vp-KW,-[GWx{ Jus߹=X2F$~ xGNǟS//=^&&=/ÇOY;$ xX6̳Wgsi|r! kb^>r" " " " " " " " " "tUkX?j%G%BBl$L-ܰ:8ưoI\qqrư3q/31c==ihɋ-<ocp1IqjOٓ+X){&ǏЊU+We˖h9/#"@T闩M;S iOtءc'mFq4-Q֜ݱuݹ-k^otXqQhiרrۅ;ƽt]|Eq'Pr6yceo5LM=tt[nsTtnJgLg96:V 8lwɰ,6I~tLis?nNi;*F9Iv}%eQi
vaN+l|ϊ\`i`K'M Lַ֣u]7n 4IDAT+cƌ#8k6c<;#bJܻX9cqg g^iYC lō8L5,oj]}gdfdͶH^ R/Ը>, H^Ƃ5酞+JS ?5&ۿ{8 p]ϴwؚGvڅcI˚ / : ֤
K=t 7Lk| ulr_w1U)x訙?S3_ y"O:{!^F^6:3q)?xeeOp˃ {]''" " " " " " " " " I2~8eizv#<g1K _PH#wՂ=6,d6,DFƲXٻ@cw+X.bC' ڧ )qi ƑS⬕n=ԛs~ [fMA\%>X?Z % euttDc0gk֦{^Cqho}mmX`7l<XWvnba\: ̅L>Kḯ7nXך7`㣓K>R~QUYa[u9lRv˔@UB @Hs!;V_H ԺHC/ppK&N'4ټysl uacqskerY/x{Q !" " " " " " " " " 0ɘ.cEn(ǂ0;͍^D0͚Þ1aDI6]Ĝ.M\;#v =z4E:1&#OL/S oڴɚq=Z@zDXW)ï;.bգ,bb?]g 1:sgǎ q
Z^YKG 6S͗
3mئ
mg:lsX,c۶6ہݭi٥n+? 6gW0YA;yӪWW-iZ(-
:t.5x6Gz8Iԝ20bKօ &6x8>)0M" " " " " " " " " "Mw8909q1z5^`[R% n,m cnM3a33%*#_M04☴ וe{ Y\UI#f Xvm tq6al` }u.xf/qn :b f};Şg·O[K>r29;ݲv[8y^:|zх&> ׳bahIܮel$&i/L%y0t
=xڋB@¹(8B3ΰwYO<dPTxQELƜkmmFUQ<%=לmz {s9ҳm9p@SaR6B,2ԉlNe H v=0!mn"V}o6=qvddٗ gCs}M{>:\X'9u
qwS ^D%&`+D_yq$x3,/M"gLJֺxZovA~n51pooo.I){z,"~#.]Xj I؛tsǽNeĸ] [y^|DhJ5oZoܿ;WtD}0 sS0 v ^9jL/YA_ ܿ#3OV%S /0eZq1wuuٶm$f
PD@D@D@D@D@D@D@D@D@O"&cX,x=Wd't4o3x82ɬK^/Yv2dx.^\S_6cv%*G{yY[]Uak&͵iƭ{1r8y:ۿk{{:W鏹FGG\pNwGWyI]l*Ona`F#*BOݻ
)" " " " " " " " " A2)L/>Ӓ6(˸2ίW:ϴ,[ A !py~jXjWʊ.]OwۋվIXݭVW:'Xv7m\Đ {!X^|
a$;bg;.vf!z|Lv,vq!"3EȋK/j{W _=qZ3 X IaoW gqXƕSǜ]bR{A `<u5mksc5k([ xFsFeC-h=,g_b@X+wӆAnuӧ-»q#tH=Et:(@GU[x(;S+Ȟ_;1%~bwaÆ;^3pGN'?iO=T GvY _f?Lt4iZSҹ|3fvm?e/ <1M-.B]+n
lMZ}6o\_>|ִag^+ S%߿B$.6, r)reHb
___ {c;wZ}YP#D@D@D@D@D@D@D@D@D@D@f$Xr :tȎ 9bwq&8>n?c:3nX[kve
[)kn\oa56Z%%ֺecHSlϽ|.v8b7GF%[UVj hf5@ %"@ǚڡz{w.Բ_z1'S wժUQ% 3|1ar" ,ܴz]|QXYZ5|?M5n>[uoMmIȜ2gRc Y W>9>Lo#A7nFř]# c< 'LNB K5Ua*608dX6mazf u4Awl|̞}h-
~myi9$Ny2^xI4y|i+YfM{{{Bٓؒ矮sYn#1<<dEťVȇ([ MN]2:z3֔>4|ȉ| '=}J{d*Fw q:'"pn/=~|`}Q&}ŏ̋cē<iho&xi֏k^i'yf'r!Uec[sKSV}p[Wжl ;xڬq]CY|< 9T\% $x %)yc%}10% ͝}O0ݮ-ig~K0W˹ރ~/gkϳ¯ KJ˂@~I (G9<(Z>D@D`9?oJ/" " }ûw 9 -sV+5&F 2(3 3F~~L {?ts7k@Xh F%j6JC* FnQVZb[7qʪ*ʭvigʍ l Vf ֭)j^K˦J/5:G رclhhoG @Ç?6Y'| 'Εc i[kkk̇gKK ?~<L7o 6cjllS '5֭3gD Ν ckAmm={vO|ªcZ`*e'c[QQ1jʢ ꁟ~~wy[~}eWÆ
C|g7n ߴiSŢE ? /^onn]t)5~z g1ٳ 0WN\T?kBp
xfR===S~EC;hyvwwǶ lp0 T瞂31 qܟz·USS1˽ӎl~V>ld^r" "0 ޟ~>y)dB9$∀L"}y .Yqr5uX [2<8Cqɒ"
.صT2844A\Uf\Xy<Ը6ޏ-fCq//ڍW`њD`q С-#(q{8{^_
{_b8I?b(DŽ#{|{ 8䏟ϱI!C~ϟ+8K=E~ԏpI>rɇ8Cy ?G(8OwGχv=T?ey )~&.6 ~>?h3I?q(䓌C/u?YR
~
a/'" !@>DZ,4;]e)X.wHGmJ(w]d3 Ćs?n%,!>~<\E%P\ gԽz>~0q5mZ-[~asFvrW
D aaNhOJ+N_p.Q#O;I ፍS'cAɎc/?3I `&KN;ɖlk0ɶq[-&g利19S O>~fX9f>zTD@D`0S ~)'"0xnx~xv`fVZ,G}W>O7o8<.cl~qsca~<;`XƋп]kl,,qKR[SW n'3b"w 3 `.Ϭݢ->ewN;vE <ppO==^w%^&疣?ڔ佒\$ _'߂}ʳSM+s;$é пҧɉbwL!ˁ@M.+6msv< 'uϻ065d84ku`VpK䖖ڥW ^t9^81wqpc{c^V#1(<lo}/2D?L1-'" %7?Wo" " "043QRI 9rwRJ&y0f=#%o7p S7'Cô_ .Ni*e H]+W ^l:ؙ^xH=>X b{Zߓ.|L1ӳ| Lgu%T%D@ _^^BUZD@@6//*D)yv8tK-y3~+cZ Ny C|9! va*W /R?KcieJ 9yp?^V*-
?jdcg} ۰R-"=}GU9DXV*\D6䳣o\仓'%'c_qҟ?oe$Xhr) /Q?Ə`>8B.~pOKxϱt>gQtQݛ[B@\T4F3CrҪ@>>o[" :7=8wkT{X<]?o+]%:qӭ a>ׯK>O'7rq"''Ϲ@xEIg =>r7L?2Mw|q8p P!zd665 =ǝ),y^~X x6x֊
,Y6B&I Zԙ.랳PU1''l}yE@D@D x]^ND 3
ώ ̌JŽϳx+|y8|<>q{Ozڋd5;)eJɓ6<<l0y{'?GM^jgΜVQQqG4!sv
۾}եa3+KE ֳ n% pq<?" LGmLq<>>6<m>dZt " ềD8BS4ysͩϼ3T"Bw \!}d 5f0G9ݯc=Cln8<iX<hu^ċܹseCCC622PԽqVVVqO'?00`QM
~ڵk1ӧdZz#677Ǐi'SKY)sˑ0X<.{6 UH τOS,hD5ɠ]m F(%'~CM@'?{17B@fxvxfۍc9H%c|>N 'ss]-%Ӻ}9E@C@mv8.\@0˗ww[n* 9)y`:4yc iӦhˇu]8'HIqS RcˉJ%@_la1&Z3ȹ:B" yEo yUyUVD@D ߪwGByUX@١g.*2 }8s:֎xg<a /ݞ09# vX]It.\`'NvXƶpi_+sƒGmmڵˮ\2eqvژyHKLk g'Si`~Oy9c6ELC;?t\[135NŊ96E<{'.3ώLT Xg2V%"އ><n%x{Wҟ k/"0$. e+kGG={6Nk\^^n۶mbwL[b9L ᶪʎ 92ŋ#-nSSӴt _ߒ7k40s zQ^:97[<dHg'RTha EyG(űT@W_I!| ˤJ$5沼jg8=5w-ET{XLE@rܸ9U :k;~xE$=bla= K,a;~ZI,k< .krl
4555Sx10.R m)n"Y&nx.MkM8{Zs l's^liي'B{
C-3/uKfw EQ')`ڴ
nwI" " "a/'"vGfm{D}l_ty2 qix '$X8hmƴ8J:kc:bwxG %5KZ°eԎ8;88E=-V7o-[L;<KyM-@|X>Xv9%
{)zPO1u :0<kBqRޯ+爗K wIr"_^.Na.hY- 9 ث" GoSWD@D@D`1=A[e,<78v>#;+q\L{2|di+ɟd$jy_H=˻5Zbׯ/vDׯG?V1ppIݏhKx85, F`{~8( #!#nj|?
G??=uvbG=3i]\]eO;|]14BfjiέZʮ^M!nuu'mLCzX.בz.SG=k
ua}b,zki' M{tj .5;OLU$m3 EV*[o9X VND`n#߃scRbӷ3$Ó~Z~cWڞgǟ@흝@6T ^g|XEDCd-XSNE?B. b!;sgQ/SGZ'Bn25H1+"mee唵j2MO|OBE#bJްpB[B 34".8./b ;7Ŝ w_l7O>m]]]Sq]>\f}b֔Y6fZ7L x?3T+ QI OD`y_7,.oS9 3gb\ cL,5,y~%{ =?+gVGxnI$Η2NOnj 47~c:*7MHCE#;B7lwgK9aA
E4iZBEdcLf.pA͖(RsE"tsNfو0]bX~epe3(- I@L{7nhoo(LJ<dezshb;+ }6r^<y9X|(t.5 I -gll~hd9#ws.~"$pb
S#FAD$(z1io>e陚]6ځ%
RbS J۱~Ef#Oؓ'O`cL[jkYK Dj\7`]{2iț2/ג
+ilX{bX2 J/]։|$.,i~ED:G?:D={DKW/]* Qg4<ԅX2 3$Ɋ;kGDD0=qDXͶZS&B*\'E{= qiDl%?i+su )2㈋8g,87# ѣn˜-9Xh9~O?ΓϯU." " " " " " " "k䭸" ' 3\q9 atⓩ|Y7Ce]X"rrnӦMqc&!BeRsǎ z{{c[b+V,`;qsp?Ǟ: suibO<o?iuVi;L̹XLy(\r -ju:$LLݻ" " " " " " " " L@D|TF@J^=)֞.βjUUUI\g G }#*Q"G8zkR[DPf`uNJnEd$
uɆ^w_iS2,- i3uIuxwQsɰT?\;tҴuiӁyXD 2yv[rWh
I5$b ֑L$B"LK(&0u/ְ +CEDC(gC%-uADmkk&!+SNE1uWi
ۂU+hO-;c1?e7nPK8&' cġpq-Ydyڵkq:dl~LX&x===Qw1?ǚ0\&}.vݦ9gvjD@D@D@D@D@D@D@D@D@D@RHD<UDZU0o CDC^\ˣЋEqR"qakX],wRvΝQXM9^CYK y(7[z#uqaD]siXR72 panu$ճKzN<OzS'3-3u>!?oW2" " " " " " " " " " " " $N +&"B#bmۦ*J"łѣxQ|L#bI Az=sL:6D]6Epd
]5qXĭ0*2"-B2u@%<I3_Gٴ)/("4B C@łr#aD|tmM֗u2֭X1諾\pOG~Ihu'%*"&B""!" B!" pX"9s&
CD$jaA_JŊOI"%pky1
2V #mkkk,Dip]Y\˔Lˌ/\A<hB'S.SoQWFޙxHy b}bzq=<Gmrk0o.y+ xb>V\49%rSis b!~m 8DX/Fxus>%1Ex8G8 v""Hf(
ODڳ2}
0B Y HIdF#`H>0$ aF/Bh -bI7gҏ L I] I_r ?/))-4Snʁp ^`^a_b_gi?/ p&'pߡ<eI%ezܽuHOQ{;vF @ @ #볙 "+M=Q1ϕW$YipW {)|ܺu٦eg\a2RX̭l`n\s ~X__GvXQ-3N6:lZ :Mh M6wS][[pns,wifR<۰cm/&@ @ @ ̺_|-Ղj;?mǕ}ώqQ;z3E*:!w^Sm37^s<O6̈osYMXkNK @ @ @YP=ggiSbsLϜSMa6Ϥmfe] @ @ @?
XI۷o7o~'zrnugBk]I @ @ phOp(!y^l
OQjX @ @ @ O@ [ k @ @ @ '+0w @ @ @ ̎k @ @ @ P=` @ @ @ ̎k @ @ @ P=` @ @ @ ̎ktsssvj8q;2s n:f9n};g ɕVyn$ @ @ 0 > ctKw\9wkcT`~~<}\zxbh\vZyYy}~ >4ӧO'OʧOʕ+WJϟ?7GÇVtRIC|Ŧww\pu <xP`Br~i9Ymmn;^&O<g,:q=HԜɗ}$ϰ8묬&O>G:Nm cH 8F ?./_n85K?9k]sNm_]]-xqC7oޔ&~uye?~UɸH_ޫF3.]f:N S⣎jǣqWjJ\WHI _0ɖq)ga!cv7'F @ @ #߾}]_!5Q1ϕ{f 3&vS4q
|SkyeI5NuSj?SMq,m0N2ŨlTZ~Mm~\#ӎ?~G$N49stq͙ɓk:yl;?ۦ?L;qo01?q!9L NLqJmgqrfiskm3:u|e1Q:'q /yuIX˹ @ @ @Y@^xwo,.732{N#@ U ES?t:G;ޝ*R? o3X#@ @ @ Ltzw%]i&V< ڻ*}5 @ @ @ +@;]_ @ @ @ PS @ @ @ 0]馗 @If @ @ @&y-VvzIf 0y}
Yj @ @ 0}lwMޣ}W=$V5<8&Y9- @`:mY @ @ @`\kWWBcU666rqF? NrMѶݲnZ]kǛ1&Oqaa N@7}qqmO9q @ @ ̐@a7"2LL IENDB` | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/config/application-ldap-activedirectory-sample.yml | # ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "user" # ldap 用户 objectClass 配置
loginId: "sAMAccountName" # ldap 用户惟一 id，用来作为登录的 id
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "userPrincipalName" # ldap 邮箱属性
filter: # 可选项，配置过滤，目前只支持 memberOf
memberOf: "CN=ServiceDEV,OU=test,DC=example,DC=com|CN=WebDEV,OU=test,DC=example,DC=com" # 只允许 memberOf 属性为 ServiceDEV 和 WebDEV 的用户访问
| # ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "user" # ldap 用户 objectClass 配置
loginId: "sAMAccountName" # ldap 用户惟一 id，用来作为登录的 id
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "userPrincipalName" # ldap 邮箱属性
# filter: # 可选项，配置过滤，目前只支持 memberOf
# memberOf: "CN=ServiceDEV,OU=test,DC=example,DC=com|CN=WebDEV,OU=test,DC=example,DC=com" # 只允许 memberOf 属性为 ServiceDEV 和 WebDEV 的用户访问
| 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/config/application-ldap-apacheds-sample.yml | # ldap sample for apache ds, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "uid=admin,ou=system" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:10389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "inetOrgPerson" # ldap 用户 objectClass 配置
loginId: "uid" # ldap 用户惟一 id，用来作为登录的 id
rdnKey: "cn" # ldap rdn key，可选项，如需启用group search需要配置
userDisplayName: "displayName" # ldap 用户名，用来作为显示名
email: "mail" # ldap 邮箱属性
group: # 配置ldap group，可选配置，启用后只有特定group的用户可以登录apollo
objectClass: "groupOfNames" # 配置groupClassName
groupBase: "ou=group" # group search base
groupSearch: "(&(cn=dev))" # group filter
groupMembership: "member" # group memberShip eg. member or memberUid
| # ldap sample for apache ds, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "uid=admin,ou=system" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:10389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "inetOrgPerson" # ldap 用户 objectClass 配置
loginId: "uid" # ldap 用户惟一 id，用来作为登录的 id
rdnKey: "cn" # ldap rdn key，可选项，如需启用group search需要配置
userDisplayName: "displayName" # ldap 用户名，用来作为显示名
email: "mail" # ldap 邮箱属性
# group: # 配置ldap group，可选配置，启用后只有特定group的用户可以登录apollo
# objectClass: "groupOfNames" # 配置groupClassName
# groupBase: "ou=group" # group search base
# groupSearch: "(&(cn=dev))" # group filter
# groupMembership: "member" # group memberShip eg. member or memberUid
| 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/config/application-ldap-openldap-sample.yml | # ldap sample for open ldap, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=org"
username: "cn=admin,dc=example,dc=org" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "inetOrgPerson" # ldap 用户 objectClass 配置
loginId: "uid" # ldap 用户惟一 id，用来作为登录的 id
rdnKey: "uid" # ldap rdn key，可选项，如需启用group search需要配置
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "mail" # ldap 邮箱属性
group: # 启用group search，可选配置，启用后只有特定group的用户可以登录apollo
objectClass: "posixGroup" # 配置groupClassName
groupBase: "ou=group" # group search base
groupSearch: "(&(cn=dev))" # group filter
groupMembership: "memberUid" # group memberShip eg. member or memberUid
| # ldap sample for open ldap, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=org"
username: "cn=admin,dc=example,dc=org" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "inetOrgPerson" # ldap 用户 objectClass 配置
loginId: "uid" # ldap 用户惟一 id，用来作为登录的 id
rdnKey: "uid" # ldap rdn key，可选项，如需启用group search需要配置
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "mail" # ldap 邮箱属性
# group: # 启用group search，可选配置，启用后只有特定group的用户可以登录apollo
# objectClass: "posixGroup" # 配置groupClassName
# groupBase: "ou=group" # group search base
# groupSearch: "(&(cn=dev))" # group filter
# groupMembership: "memberUid" # group memberShip eg. member or memberUid
| 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java | package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAspectJAutoProxy
@Configuration
@EnableAutoConfiguration
@EnableTransactionManagement
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
PortalApplication.class, PortalOpenApiConfig.class})
public class PortalApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(PortalApplication.class, args);
}
}
| package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAspectJAutoProxy
@Configuration
@EnableAutoConfiguration(exclude = {LdapAutoConfiguration.class})
@EnableTransactionManagement
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
PortalApplication.class, PortalOpenApiConfig.class})
public class PortalApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(PortalApplication.class, args);
}
}
| 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ServiceDTO.java | package com.ctrip.framework.apollo.core.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
return instanceId;
}
public void setAppName(String appName) {
this.appName = appName;
}
public void setHomepageUrl(String homepageUrl) {
this.homepageUrl = homepageUrl;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ServiceDTO{");
sb.append("appName='").append(appName).append('\'');
sb.append(", instanceId='").append(instanceId).append('\'');
sb.append(", homepageUrl='").append(homepageUrl).append('\'');
sb.append('}');
return sb.toString();
}
}
| package com.ctrip.framework.apollo.core.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
return instanceId;
}
public void setAppName(String appName) {
this.appName = appName;
}
public void setHomepageUrl(String homepageUrl) {
this.homepageUrl = homepageUrl;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ServiceDTO{");
sb.append("appName='").append(appName).append('\'');
sb.append(", instanceId='").append(instanceId).append('\'');
sb.append(", homepageUrl='").append(homepageUrl).append('\'');
sb.append('}');
return sb.toString();
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/NamespaceHandler.java | package com.ctrip.framework.apollo.spring.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.core.Ordered;
import org.springframework.util.SystemPropertyUtils;
import org.w3c.dom.Element;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
/**
* @author Jason Song([email protected])
*/
public class NamespaceHandler extends NamespaceHandlerSupport {
private static final Splitter NAMESPACE_SPLITTER = Splitter.on(",").omitEmptyStrings()
.trimResults();
@Override
public void init() {
registerBeanDefinitionParser("config", new BeanParser());
}
static class BeanParser extends AbstractSingleBeanDefinitionParser {
@Override
protected Class<?> getBeanClass(Element element) {
return ConfigPropertySourcesProcessor.class;
}
@Override
protected boolean shouldGenerateId() {
return true;
}
private String resolveNamespaces(Element element) {
String namespaces = element.getAttribute("namespaces");
if (Strings.isNullOrEmpty(namespaces)) {
//default to application
return ConfigConsts.NAMESPACE_APPLICATION;
}
return SystemPropertyUtils.resolvePlaceholders(namespaces);
}
@Override
protected void doParse(Element element, BeanDefinitionBuilder builder) {
String namespaces = this.resolveNamespaces(element);
int order = Ordered.LOWEST_PRECEDENCE;
String orderAttribute = element.getAttribute("order");
if (!Strings.isNullOrEmpty(orderAttribute)) {
try {
order = Integer.parseInt(orderAttribute);
} catch (Throwable ex) {
throw new IllegalArgumentException(
String.format("Invalid order: %s for namespaces: %s", orderAttribute, namespaces));
}
}
PropertySourcesProcessor.addNamespaces(NAMESPACE_SPLITTER.splitToList(namespaces), order);
}
}
}
| package com.ctrip.framework.apollo.spring.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.core.Ordered;
import org.springframework.util.SystemPropertyUtils;
import org.w3c.dom.Element;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
/**
* @author Jason Song([email protected])
*/
public class NamespaceHandler extends NamespaceHandlerSupport {
private static final Splitter NAMESPACE_SPLITTER = Splitter.on(",").omitEmptyStrings()
.trimResults();
@Override
public void init() {
registerBeanDefinitionParser("config", new BeanParser());
}
static class BeanParser extends AbstractSingleBeanDefinitionParser {
@Override
protected Class<?> getBeanClass(Element element) {
return ConfigPropertySourcesProcessor.class;
}
@Override
protected boolean shouldGenerateId() {
return true;
}
private String resolveNamespaces(Element element) {
String namespaces = element.getAttribute("namespaces");
if (Strings.isNullOrEmpty(namespaces)) {
//default to application
return ConfigConsts.NAMESPACE_APPLICATION;
}
return SystemPropertyUtils.resolvePlaceholders(namespaces);
}
@Override
protected void doParse(Element element, BeanDefinitionBuilder builder) {
String namespaces = this.resolveNamespaces(element);
int order = Ordered.LOWEST_PRECEDENCE;
String orderAttribute = element.getAttribute("order");
if (!Strings.isNullOrEmpty(orderAttribute)) {
try {
order = Integer.parseInt(orderAttribute);
} catch (Throwable ex) {
throw new IllegalArgumentException(
String.format("Invalid order: %s for namespaces: %s", orderAttribute, namespaces));
}
}
PropertySourcesProcessor.addNamespaces(NAMESPACE_SPLITTER.splitToList(namespaces), order);
}
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/ConfigPublishEmailBuilder.java | package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.RoleType;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.vo.Change;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.service.AppNamespaceService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
public abstract class ConfigPublishEmailBuilder {
private static final String EMERGENCY_PUBLISH_TAG = "<span style='color:red'>(紧急发布)</span>";
//email content common field placeholder
private static final String EMAIL_CONTENT_FIELD_APPID = "#\\{appId\\}";
private static final String EMAIL_CONTENT_FIELD_ENV = "#\\{env}";
private static final String EMAIL_CONTENT_FIELD_CLUSTER = "#\\{clusterName}";
private static final String EMAIL_CONTENT_FIELD_NAMESPACE = "#\\{namespaceName}";
private static final String EMAIL_CONTENT_FIELD_OPERATOR = "#\\{operator}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_TIME = "#\\{releaseTime}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_ID = "#\\{releaseId}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID = "#\\{releaseHistoryId}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_TITLE = "#\\{releaseTitle}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_COMMENT = "#\\{releaseComment}";
private static final String EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS = "#\\{apollo.portal.address}";
private static final String EMAIL_CONTENT_FIELD_DIFF_CONTENT = "#\\{diffContent}";
private static final String EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH = "#\\{emergencyPublish}";
private static final String EMAIL_CONTENT_DIFF_MODULE = "#\\{diffModule}";
protected static final String EMAIL_CONTENT_GRAY_RULES_MODULE = "#\\{rulesModule}";
//email content special field placeholder
protected static final String EMAIL_CONTENT_GRAY_RULES_CONTENT = "#\\{rulesContent}";
//set config's value max length to protect email.
protected static final int VALUE_MAX_LENGTH = 100;
protected FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
@Autowired
private RolePermissionService rolePermissionService;
@Autowired
private ReleaseService releaseService;
@Autowired
private AppNamespaceService appNamespaceService;
@Autowired
private UserService userService;
@Autowired
protected PortalConfig portalConfig;
/**
* email subject
*/
protected abstract String subject();
/**
* email body content
*/
protected abstract String emailContent(Env env, ReleaseHistoryBO releaseHistory);
/**
* email body template framework
*/
protected abstract String getTemplateFramework();
/**
* email body diff module template
*/
protected abstract String getDiffModuleTemplate();
public Email build(Env env, ReleaseHistoryBO releaseHistory) {
Email email = new Email();
email.setSubject(subject());
email.setSenderEmailAddress(portalConfig.emailSender());
email.setRecipients(recipients(releaseHistory.getAppId(), releaseHistory.getNamespaceName(), env.toString()));
String emailBody = emailContent(env, releaseHistory);
//clear not used module
emailBody = emailBody.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "");
emailBody = emailBody.replaceAll(EMAIL_CONTENT_GRAY_RULES_MODULE, "");
email.setBody(emailBody);
return email;
}
protected String renderEmailCommonContent(Env env, ReleaseHistoryBO releaseHistory) {
String template = getTemplateFramework();
String renderResult = renderReleaseBasicInfo(template, env, releaseHistory);
renderResult = renderDiffModule(renderResult, env, releaseHistory);
return renderResult;
}
private String renderReleaseBasicInfo(String template, Env env, ReleaseHistoryBO releaseHistory) {
String renderResult = template;
Map<String, Object> operationContext = releaseHistory.getOperationContext();
boolean isEmergencyPublish = operationContext.containsKey(ReleaseOperationContext.IS_EMERGENCY_PUBLISH) &&
(boolean) operationContext.get(ReleaseOperationContext.IS_EMERGENCY_PUBLISH);
if (isEmergencyPublish) {
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH, Matcher.quoteReplacement(EMERGENCY_PUBLISH_TAG));
} else {
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH, "");
}
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_APPID, Matcher.quoteReplacement(releaseHistory.getAppId()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_ENV, Matcher.quoteReplacement(env.toString()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_CLUSTER, Matcher.quoteReplacement(releaseHistory.getClusterName()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_NAMESPACE, Matcher.quoteReplacement(releaseHistory.getNamespaceName()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_OPERATOR, Matcher.quoteReplacement(releaseHistory.getOperator()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_TITLE, Matcher.quoteReplacement(releaseHistory.getReleaseTitle()));
renderResult =
renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_ID, String.valueOf(releaseHistory.getReleaseId()));
renderResult =
renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID, String.valueOf(releaseHistory.getId()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_COMMENT, Matcher.quoteReplacement(releaseHistory.getReleaseComment() == null ? "" : releaseHistory.getReleaseComment()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS, getApolloPortalAddress());
return renderResult
.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_TIME, dateFormat.format(releaseHistory.getReleaseTime()));
}
private String renderDiffModule(String bodyTemplate, Env env, ReleaseHistoryBO releaseHistory) {
String appId = releaseHistory.getAppId();
String namespaceName = releaseHistory.getNamespaceName();
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(appId, namespaceName);
if (appNamespace == null) {
appNamespace = appNamespaceService.findPublicAppNamespace(namespaceName);
}
//don't show diff content if namespace's format is file
if (appNamespace == null ||
!appNamespace.getFormat().equals(ConfigFileFormat.Properties.getValue())) {
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "<br><h4>变更内容请点击链接到Apollo上查看</h4>");
}
ReleaseCompareResult result = getReleaseCompareResult(env, releaseHistory);
if (!result.hasContent()) {
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "<br><h4>无配置变更</h4>");
}
List<Change> changes = result.getChanges();
StringBuilder changesHtmlBuilder = new StringBuilder();
for (Change change : changes) {
String key = change.getEntity().getFirstEntity().getKey();
String oldValue = change.getEntity().getFirstEntity().getValue();
String newValue = change.getEntity().getSecondEntity().getValue();
newValue = newValue == null ? "" : newValue;
changesHtmlBuilder.append("<tr>");
changesHtmlBuilder.append("<td width=\"10%\">").append(change.getType().toString()).append("</td>");
changesHtmlBuilder.append("<td width=\"20%\">").append(cutOffString(key)).append("</td>");
changesHtmlBuilder.append("<td width=\"35%\">").append(cutOffString(oldValue)).append("</td>");
changesHtmlBuilder.append("<td width=\"35%\">").append(cutOffString(newValue)).append("</td>");
changesHtmlBuilder.append("</tr>");
}
String diffContent = Matcher.quoteReplacement(changesHtmlBuilder.toString());
String diffModuleTemplate = getDiffModuleTemplate();
String diffModuleRenderResult = diffModuleTemplate.replaceAll(EMAIL_CONTENT_FIELD_DIFF_CONTENT, diffContent);
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, diffModuleRenderResult);
}
private ReleaseCompareResult getReleaseCompareResult(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory.getOperation() == ReleaseOperation.GRAY_RELEASE
&& releaseHistory.getPreviousReleaseId() == 0) {
ReleaseDTO masterLatestActiveRelease = releaseService.loadLatestRelease(
releaseHistory.getAppId(), env, releaseHistory.getClusterName(), releaseHistory.getNamespaceName());
ReleaseDTO branchLatestActiveRelease = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return releaseService.compare(masterLatestActiveRelease, branchLatestActiveRelease);
}
return releaseService.compare(env, releaseHistory.getPreviousReleaseId(), releaseHistory.getReleaseId());
}
private List<String> recipients(String appId, String namespaceName, String env) {
Set<UserInfo> modifyRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.MODIFY_NAMESPACE));
Set<UserInfo> envModifyRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.MODIFY_NAMESPACE, env));
Set<UserInfo> releaseRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.RELEASE_NAMESPACE));
Set<UserInfo> envReleaseRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.RELEASE_NAMESPACE, env));
Set<UserInfo> owners = rolePermissionService.queryUsersWithRole(RoleUtils.buildAppMasterRoleName(appId));
Set<String> userIds = new HashSet<>(modifyRoleUsers.size() + releaseRoleUsers.size() + owners.size());
for (UserInfo userInfo : modifyRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : envModifyRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : releaseRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : envReleaseRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : owners) {
userIds.add(userInfo.getUserId());
}
List<UserInfo> userInfos = userService.findByUserIds(Lists.newArrayList(userIds));
if (CollectionUtils.isEmpty(userInfos)) {
return Collections.emptyList();
}
List<String> recipients = new ArrayList<>(userInfos.size());
for (UserInfo userInfo : userInfos) {
recipients.add(userInfo.getEmail());
}
return recipients;
}
protected String getApolloPortalAddress() {
return portalConfig.portalAddress();
}
private String cutOffString(String source) {
if (source.length() > VALUE_MAX_LENGTH) {
return source.substring(0, VALUE_MAX_LENGTH) + "...";
}
return source;
}
}
| package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.RoleType;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.vo.Change;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.service.AppNamespaceService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
public abstract class ConfigPublishEmailBuilder {
private static final String EMERGENCY_PUBLISH_TAG = "<span style='color:red'>(紧急发布)</span>";
//email content common field placeholder
private static final String EMAIL_CONTENT_FIELD_APPID = "#\\{appId\\}";
private static final String EMAIL_CONTENT_FIELD_ENV = "#\\{env}";
private static final String EMAIL_CONTENT_FIELD_CLUSTER = "#\\{clusterName}";
private static final String EMAIL_CONTENT_FIELD_NAMESPACE = "#\\{namespaceName}";
private static final String EMAIL_CONTENT_FIELD_OPERATOR = "#\\{operator}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_TIME = "#\\{releaseTime}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_ID = "#\\{releaseId}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID = "#\\{releaseHistoryId}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_TITLE = "#\\{releaseTitle}";
private static final String EMAIL_CONTENT_FIELD_RELEASE_COMMENT = "#\\{releaseComment}";
private static final String EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS = "#\\{apollo.portal.address}";
private static final String EMAIL_CONTENT_FIELD_DIFF_CONTENT = "#\\{diffContent}";
private static final String EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH = "#\\{emergencyPublish}";
private static final String EMAIL_CONTENT_DIFF_MODULE = "#\\{diffModule}";
protected static final String EMAIL_CONTENT_GRAY_RULES_MODULE = "#\\{rulesModule}";
//email content special field placeholder
protected static final String EMAIL_CONTENT_GRAY_RULES_CONTENT = "#\\{rulesContent}";
//set config's value max length to protect email.
protected static final int VALUE_MAX_LENGTH = 100;
protected FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
@Autowired
private RolePermissionService rolePermissionService;
@Autowired
private ReleaseService releaseService;
@Autowired
private AppNamespaceService appNamespaceService;
@Autowired
private UserService userService;
@Autowired
protected PortalConfig portalConfig;
/**
* email subject
*/
protected abstract String subject();
/**
* email body content
*/
protected abstract String emailContent(Env env, ReleaseHistoryBO releaseHistory);
/**
* email body template framework
*/
protected abstract String getTemplateFramework();
/**
* email body diff module template
*/
protected abstract String getDiffModuleTemplate();
public Email build(Env env, ReleaseHistoryBO releaseHistory) {
Email email = new Email();
email.setSubject(subject());
email.setSenderEmailAddress(portalConfig.emailSender());
email.setRecipients(recipients(releaseHistory.getAppId(), releaseHistory.getNamespaceName(), env.toString()));
String emailBody = emailContent(env, releaseHistory);
//clear not used module
emailBody = emailBody.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "");
emailBody = emailBody.replaceAll(EMAIL_CONTENT_GRAY_RULES_MODULE, "");
email.setBody(emailBody);
return email;
}
protected String renderEmailCommonContent(Env env, ReleaseHistoryBO releaseHistory) {
String template = getTemplateFramework();
String renderResult = renderReleaseBasicInfo(template, env, releaseHistory);
renderResult = renderDiffModule(renderResult, env, releaseHistory);
return renderResult;
}
private String renderReleaseBasicInfo(String template, Env env, ReleaseHistoryBO releaseHistory) {
String renderResult = template;
Map<String, Object> operationContext = releaseHistory.getOperationContext();
boolean isEmergencyPublish = operationContext.containsKey(ReleaseOperationContext.IS_EMERGENCY_PUBLISH) &&
(boolean) operationContext.get(ReleaseOperationContext.IS_EMERGENCY_PUBLISH);
if (isEmergencyPublish) {
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH, Matcher.quoteReplacement(EMERGENCY_PUBLISH_TAG));
} else {
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_EMERGENCY_PUBLISH, "");
}
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_APPID, Matcher.quoteReplacement(releaseHistory.getAppId()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_ENV, Matcher.quoteReplacement(env.toString()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_CLUSTER, Matcher.quoteReplacement(releaseHistory.getClusterName()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_NAMESPACE, Matcher.quoteReplacement(releaseHistory.getNamespaceName()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_OPERATOR, Matcher.quoteReplacement(releaseHistory.getOperator()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_TITLE, Matcher.quoteReplacement(releaseHistory.getReleaseTitle()));
renderResult =
renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_ID, String.valueOf(releaseHistory.getReleaseId()));
renderResult =
renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID, String.valueOf(releaseHistory.getId()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_COMMENT, Matcher.quoteReplacement(releaseHistory.getReleaseComment() == null ? "" : releaseHistory.getReleaseComment()));
renderResult = renderResult.replaceAll(EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS, getApolloPortalAddress());
return renderResult
.replaceAll(EMAIL_CONTENT_FIELD_RELEASE_TIME, dateFormat.format(releaseHistory.getReleaseTime()));
}
private String renderDiffModule(String bodyTemplate, Env env, ReleaseHistoryBO releaseHistory) {
String appId = releaseHistory.getAppId();
String namespaceName = releaseHistory.getNamespaceName();
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(appId, namespaceName);
if (appNamespace == null) {
appNamespace = appNamespaceService.findPublicAppNamespace(namespaceName);
}
//don't show diff content if namespace's format is file
if (appNamespace == null ||
!appNamespace.getFormat().equals(ConfigFileFormat.Properties.getValue())) {
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "<br><h4>变更内容请点击链接到Apollo上查看</h4>");
}
ReleaseCompareResult result = getReleaseCompareResult(env, releaseHistory);
if (!result.hasContent()) {
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, "<br><h4>无配置变更</h4>");
}
List<Change> changes = result.getChanges();
StringBuilder changesHtmlBuilder = new StringBuilder();
for (Change change : changes) {
String key = change.getEntity().getFirstEntity().getKey();
String oldValue = change.getEntity().getFirstEntity().getValue();
String newValue = change.getEntity().getSecondEntity().getValue();
newValue = newValue == null ? "" : newValue;
changesHtmlBuilder.append("<tr>");
changesHtmlBuilder.append("<td width=\"10%\">").append(change.getType().toString()).append("</td>");
changesHtmlBuilder.append("<td width=\"20%\">").append(cutOffString(key)).append("</td>");
changesHtmlBuilder.append("<td width=\"35%\">").append(cutOffString(oldValue)).append("</td>");
changesHtmlBuilder.append("<td width=\"35%\">").append(cutOffString(newValue)).append("</td>");
changesHtmlBuilder.append("</tr>");
}
String diffContent = Matcher.quoteReplacement(changesHtmlBuilder.toString());
String diffModuleTemplate = getDiffModuleTemplate();
String diffModuleRenderResult = diffModuleTemplate.replaceAll(EMAIL_CONTENT_FIELD_DIFF_CONTENT, diffContent);
return bodyTemplate.replaceAll(EMAIL_CONTENT_DIFF_MODULE, diffModuleRenderResult);
}
private ReleaseCompareResult getReleaseCompareResult(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory.getOperation() == ReleaseOperation.GRAY_RELEASE
&& releaseHistory.getPreviousReleaseId() == 0) {
ReleaseDTO masterLatestActiveRelease = releaseService.loadLatestRelease(
releaseHistory.getAppId(), env, releaseHistory.getClusterName(), releaseHistory.getNamespaceName());
ReleaseDTO branchLatestActiveRelease = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return releaseService.compare(masterLatestActiveRelease, branchLatestActiveRelease);
}
return releaseService.compare(env, releaseHistory.getPreviousReleaseId(), releaseHistory.getReleaseId());
}
private List<String> recipients(String appId, String namespaceName, String env) {
Set<UserInfo> modifyRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.MODIFY_NAMESPACE));
Set<UserInfo> envModifyRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.MODIFY_NAMESPACE, env));
Set<UserInfo> releaseRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.RELEASE_NAMESPACE));
Set<UserInfo> envReleaseRoleUsers =
rolePermissionService
.queryUsersWithRole(RoleUtils.buildNamespaceRoleName(appId, namespaceName, RoleType.RELEASE_NAMESPACE, env));
Set<UserInfo> owners = rolePermissionService.queryUsersWithRole(RoleUtils.buildAppMasterRoleName(appId));
Set<String> userIds = new HashSet<>(modifyRoleUsers.size() + releaseRoleUsers.size() + owners.size());
for (UserInfo userInfo : modifyRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : envModifyRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : releaseRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : envReleaseRoleUsers) {
userIds.add(userInfo.getUserId());
}
for (UserInfo userInfo : owners) {
userIds.add(userInfo.getUserId());
}
List<UserInfo> userInfos = userService.findByUserIds(Lists.newArrayList(userIds));
if (CollectionUtils.isEmpty(userInfos)) {
return Collections.emptyList();
}
List<String> recipients = new ArrayList<>(userInfos.size());
for (UserInfo userInfo : userInfos) {
recipients.add(userInfo.getEmail());
}
return recipients;
}
protected String getApolloPortalAddress() {
return portalConfig.portalAddress();
}
private String cutOffString(String source) {
if (source.length() > VALUE_MAX_LENGTH) {
return source.substring(0, VALUE_MAX_LENGTH) + "...";
}
return source;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesConstants.java | package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED = "apollo.bootstrap.eagerLoad.enabled";
String APOLLO_BOOTSTRAP_NAMESPACES = "apollo.bootstrap.namespaces";
}
| package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED = "apollo.bootstrap.eagerLoad.enabled";
String APOLLO_BOOTSTRAP_NAMESPACES = "apollo.bootstrap.namespaces";
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/NetworkProvider.java | package com.ctrip.framework.foundation.spi.provider;
/**
* Provider for network related properties
*/
public interface NetworkProvider extends Provider {
/**
* @return the host address, i.e. ip
*/
String getHostAddress();
/**
* @return the host name
*/
String getHostName();
}
| package com.ctrip.framework.foundation.spi.provider;
/**
* Provider for network related properties
*/
public interface NetworkProvider extends Provider {
/**
* @return the host address, i.e. ip
*/
String getHostAddress();
/**
* @return the host name
*/
String getHostName();
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/DefaultConfigPropertySourcesProcessorHelper.java | package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
public class DefaultConfigPropertySourcesProcessorHelper implements ConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
processSpringValueDefinition(registry);
}
/**
* For Spring 3.x versions, the BeanDefinitionRegistryPostProcessor would not be instantiated if
* it is added in postProcessBeanDefinitionRegistry phase, so we have to manually call the
* postProcessBeanDefinitionRegistry method of SpringValueDefinitionProcessor here...
*/
private void processSpringValueDefinition(BeanDefinitionRegistry registry) {
SpringValueDefinitionProcessor springValueDefinitionProcessor = new SpringValueDefinitionProcessor();
springValueDefinitionProcessor.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
}
| package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
public class DefaultConfigPropertySourcesProcessorHelper implements ConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
processSpringValueDefinition(registry);
}
/**
* For Spring 3.x versions, the BeanDefinitionRegistryPostProcessor would not be instantiated if
* it is added in postProcessBeanDefinitionRegistry phase, so we have to manually call the
* postProcessBeanDefinitionRegistry method of SpringValueDefinitionProcessor here...
*/
private void processSpringValueDefinition(BeanDefinitionRegistry registry) {
SpringValueDefinitionProcessor springValueDefinitionProcessor = new SpringValueDefinitionProcessor();
springValueDefinitionProcessor.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java | package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long> {
AppNamespace findByAppIdAndName(String appId, String namespaceName);
AppNamespace findByName(String namespaceName);
List<AppNamespace> findByNameAndIsPublic(String namespaceName, boolean isPublic);
List<AppNamespace> findByIsPublicTrue();
List<AppNamespace> findByAppId(String appId);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy=?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long> {
AppNamespace findByAppIdAndName(String appId, String namespaceName);
AppNamespace findByName(String namespaceName);
List<AppNamespace> findByNameAndIsPublic(String namespaceName, boolean isPublic);
List<AppNamespace> findByIsPublicTrue();
List<AppNamespace> findByAppId(String appId);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy=?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValue.java | package com.ctrip.framework.apollo.spring.property;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import org.springframework.core.MethodParameter;
/**
* Spring @Value method info
*
* @author github.com/zhegexiaohuozi [email protected]
* @since 2018/2/6.
*/
public class SpringValue {
private MethodParameter methodParameter;
private Field field;
private WeakReference<Object> beanRef;
private String beanName;
private String key;
private String placeholder;
private Class<?> targetType;
private Type genericType;
private boolean isJson;
public SpringValue(String key, String placeholder, Object bean, String beanName, Field field, boolean isJson) {
this.beanRef = new WeakReference<>(bean);
this.beanName = beanName;
this.field = field;
this.key = key;
this.placeholder = placeholder;
this.targetType = field.getType();
this.isJson = isJson;
if(isJson){
this.genericType = field.getGenericType();
}
}
public SpringValue(String key, String placeholder, Object bean, String beanName, Method method, boolean isJson) {
this.beanRef = new WeakReference<>(bean);
this.beanName = beanName;
this.methodParameter = new MethodParameter(method, 0);
this.key = key;
this.placeholder = placeholder;
Class<?>[] paramTps = method.getParameterTypes();
this.targetType = paramTps[0];
this.isJson = isJson;
if(isJson){
this.genericType = method.getGenericParameterTypes()[0];
}
}
public void update(Object newVal) throws IllegalAccessException, InvocationTargetException {
if (isField()) {
injectField(newVal);
} else {
injectMethod(newVal);
}
}
private void injectField(Object newVal) throws IllegalAccessException {
Object bean = beanRef.get();
if (bean == null) {
return;
}
boolean accessible = field.isAccessible();
field.setAccessible(true);
field.set(bean, newVal);
field.setAccessible(accessible);
}
private void injectMethod(Object newVal)
throws InvocationTargetException, IllegalAccessException {
Object bean = beanRef.get();
if (bean == null) {
return;
}
methodParameter.getMethod().invoke(bean, newVal);
}
public String getBeanName() {
return beanName;
}
public Class<?> getTargetType() {
return targetType;
}
public String getPlaceholder() {
return this.placeholder;
}
public MethodParameter getMethodParameter() {
return methodParameter;
}
public boolean isField() {
return this.field != null;
}
public Field getField() {
return field;
}
public Type getGenericType() {
return genericType;
}
public boolean isJson() {
return isJson;
}
boolean isTargetBeanValid() {
return beanRef.get() != null;
}
@Override
public String toString() {
Object bean = beanRef.get();
if (bean == null) {
return "";
}
if (isField()) {
return String
.format("key: %s, beanName: %s, field: %s.%s", key, beanName, bean.getClass().getName(), field.getName());
}
return String.format("key: %s, beanName: %s, method: %s.%s", key, beanName, bean.getClass().getName(),
methodParameter.getMethod().getName());
}
}
| package com.ctrip.framework.apollo.spring.property;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import org.springframework.core.MethodParameter;
/**
* Spring @Value method info
*
* @author github.com/zhegexiaohuozi [email protected]
* @since 2018/2/6.
*/
public class SpringValue {
private MethodParameter methodParameter;
private Field field;
private WeakReference<Object> beanRef;
private String beanName;
private String key;
private String placeholder;
private Class<?> targetType;
private Type genericType;
private boolean isJson;
public SpringValue(String key, String placeholder, Object bean, String beanName, Field field, boolean isJson) {
this.beanRef = new WeakReference<>(bean);
this.beanName = beanName;
this.field = field;
this.key = key;
this.placeholder = placeholder;
this.targetType = field.getType();
this.isJson = isJson;
if(isJson){
this.genericType = field.getGenericType();
}
}
public SpringValue(String key, String placeholder, Object bean, String beanName, Method method, boolean isJson) {
this.beanRef = new WeakReference<>(bean);
this.beanName = beanName;
this.methodParameter = new MethodParameter(method, 0);
this.key = key;
this.placeholder = placeholder;
Class<?>[] paramTps = method.getParameterTypes();
this.targetType = paramTps[0];
this.isJson = isJson;
if(isJson){
this.genericType = method.getGenericParameterTypes()[0];
}
}
public void update(Object newVal) throws IllegalAccessException, InvocationTargetException {
if (isField()) {
injectField(newVal);
} else {
injectMethod(newVal);
}
}
private void injectField(Object newVal) throws IllegalAccessException {
Object bean = beanRef.get();
if (bean == null) {
return;
}
boolean accessible = field.isAccessible();
field.setAccessible(true);
field.set(bean, newVal);
field.setAccessible(accessible);
}
private void injectMethod(Object newVal)
throws InvocationTargetException, IllegalAccessException {
Object bean = beanRef.get();
if (bean == null) {
return;
}
methodParameter.getMethod().invoke(bean, newVal);
}
public String getBeanName() {
return beanName;
}
public Class<?> getTargetType() {
return targetType;
}
public String getPlaceholder() {
return this.placeholder;
}
public MethodParameter getMethodParameter() {
return methodParameter;
}
public boolean isField() {
return this.field != null;
}
public Field getField() {
return field;
}
public Type getGenericType() {
return genericType;
}
public boolean isJson() {
return isJson;
}
boolean isTargetBeanValid() {
return beanRef.get() != null;
}
@Override
public String toString() {
Object bean = beanRef.get();
if (bean == null) {
return "";
}
if (isField()) {
return String
.format("key: %s, beanName: %s, field: %s.%s", key, beanName, bean.getClass().getName(), field.getName());
}
return String.format("key: %s, beanName: %s, method: %s.%s", key, beanName, bean.getClass().getName(),
methodParameter.getMethod().getName());
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/Env.java | package com.ctrip.framework.apollo.portal.environment;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
* @author wxq
*/
public class Env {
private static final Logger logger = LoggerFactory.getLogger(Env.class);
// name of environment, cannot be null
private final String name;
// use to cache Env
private static final Map<String, Env> STRING_ENV_MAP = new ConcurrentHashMap<>();
// default environments
public static final Env LOCAL = addEnvironment("LOCAL");
public static final Env DEV = addEnvironment("DEV");
public static final Env FWS = addEnvironment("FWS");
public static final Env FAT = addEnvironment("FAT");
public static final Env UAT = addEnvironment("UAT");
public static final Env LPT = addEnvironment("LPT");
public static final Env PRO = addEnvironment("PRO");
public static final Env TOOLS = addEnvironment("TOOLS");
public static final Env UNKNOWN = addEnvironment("UNKNOWN");
/**
* Cannot create by other
* @param name
*/
private Env(String name) {
this.name = name;
}
/**
* add some change to environment name
* trim and to upper
* @param environmentName
* @return
*/
private static String getWellFormName(String environmentName) {
return environmentName.trim().toUpperCase();
}
/**
* logic same as
* @see com.ctrip.framework.apollo.core.enums.EnvUtils transformEnv
* @param envName
* @return
*/
public static Env transformEnv(String envName) {
if(Env.exists(envName)) {
return Env.valueOf(envName);
}
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
case "LPT":
return Env.LPT;
case "FAT":
case "FWS":
return Env.FAT;
case "UAT":
return Env.UAT;
case "PRO":
case "PROD": //just in case
return Env.PRO;
case "DEV":
return Env.DEV;
case "LOCAL":
return Env.LOCAL;
case "TOOLS":
return Env.TOOLS;
default:
return Env.UNKNOWN;
}
}
/**
* a environment name exist or not
* @param name
* @return
*/
public static boolean exists(String name) {
name = getWellFormName(name);
return STRING_ENV_MAP.containsKey(name);
}
/**
* add an environment
* @param name
* @return
*/
public static Env addEnvironment(String name) {
if (StringUtils.isBlank(name)) {
throw new RuntimeException("Cannot add a blank environment: " + "[" + name + "]");
}
name = getWellFormName(name);
if(STRING_ENV_MAP.containsKey(name)) {
// has been existed
logger.debug("{} already exists.", name);
} else {
// not existed
STRING_ENV_MAP.put(name, new Env(name));
}
return STRING_ENV_MAP.get(name);
}
/**
* replace valueOf in enum
* But what would happened if environment not exist?
*
* @param name
* @throws IllegalArgumentException if this existed environment has no Env with the specified name
* @return
*/
public static Env valueOf(String name) {
name = getWellFormName(name);
if(exists(name)) {
return STRING_ENV_MAP.get(name);
} else {
throw new IllegalArgumentException(name + " not exist");
}
}
/**
* Please use {@code Env.valueOf} instead this method
* @param env
* @return
*/
@Deprecated
public static Env fromString(String env) {
Env environment = transformEnv(env);
Preconditions.checkArgument(environment != UNKNOWN, String.format("Env %s is invalid", env));
return environment;
}
/**
* Not just name in Env,
* the address of Env must be same,
* or it will throw {@code RuntimeException}
* @param o
* @throws RuntimeException When same name but different address
* @return
*/
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Env env = (Env) o;
if(getName().equals(env.getName())) {
throw new RuntimeException(getName() + " is same environment name, but their Env not same");
} else {
return false;
}
}
@Override
public int hashCode() {
return Objects.hash(getName());
}
/**
* a Env convert to string, ie its name.
* @return
*/
@Override
public String toString() {
return name;
}
/**
* Backward compatibility with enum's name method
* @return
*/
@Deprecated
public String name() {
return name;
}
public String getName() {
return name;
}
/**
* conversion key from {@link String} to {@link Env}
* @param metaServerAddresses key is environment, value is environment's meta server address
* @return relationship between {@link Env} and meta server address
*/
static Map<Env, String> transformToEnvMap(Map<String, String> metaServerAddresses) {
// add to domain
Map<Env, String> map = new ConcurrentHashMap<>();
for(Map.Entry<String, String> entry : metaServerAddresses.entrySet()) {
// add new environment
Env env = Env.addEnvironment(entry.getKey());
// get meta server address value
String value = entry.getValue();
// put pair (Env, meta server address)
map.put(env, value);
}
return map;
}
}
| package com.ctrip.framework.apollo.portal.environment;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
* @author wxq
*/
public class Env {
private static final Logger logger = LoggerFactory.getLogger(Env.class);
// name of environment, cannot be null
private final String name;
// use to cache Env
private static final Map<String, Env> STRING_ENV_MAP = new ConcurrentHashMap<>();
// default environments
public static final Env LOCAL = addEnvironment("LOCAL");
public static final Env DEV = addEnvironment("DEV");
public static final Env FWS = addEnvironment("FWS");
public static final Env FAT = addEnvironment("FAT");
public static final Env UAT = addEnvironment("UAT");
public static final Env LPT = addEnvironment("LPT");
public static final Env PRO = addEnvironment("PRO");
public static final Env TOOLS = addEnvironment("TOOLS");
public static final Env UNKNOWN = addEnvironment("UNKNOWN");
/**
* Cannot create by other
* @param name
*/
private Env(String name) {
this.name = name;
}
/**
* add some change to environment name
* trim and to upper
* @param environmentName
* @return
*/
private static String getWellFormName(String environmentName) {
return environmentName.trim().toUpperCase();
}
/**
* logic same as
* @see com.ctrip.framework.apollo.core.enums.EnvUtils transformEnv
* @param envName
* @return
*/
public static Env transformEnv(String envName) {
if(Env.exists(envName)) {
return Env.valueOf(envName);
}
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
case "LPT":
return Env.LPT;
case "FAT":
case "FWS":
return Env.FAT;
case "UAT":
return Env.UAT;
case "PRO":
case "PROD": //just in case
return Env.PRO;
case "DEV":
return Env.DEV;
case "LOCAL":
return Env.LOCAL;
case "TOOLS":
return Env.TOOLS;
default:
return Env.UNKNOWN;
}
}
/**
* a environment name exist or not
* @param name
* @return
*/
public static boolean exists(String name) {
name = getWellFormName(name);
return STRING_ENV_MAP.containsKey(name);
}
/**
* add an environment
* @param name
* @return
*/
public static Env addEnvironment(String name) {
if (StringUtils.isBlank(name)) {
throw new RuntimeException("Cannot add a blank environment: " + "[" + name + "]");
}
name = getWellFormName(name);
if(STRING_ENV_MAP.containsKey(name)) {
// has been existed
logger.debug("{} already exists.", name);
} else {
// not existed
STRING_ENV_MAP.put(name, new Env(name));
}
return STRING_ENV_MAP.get(name);
}
/**
* replace valueOf in enum
* But what would happened if environment not exist?
*
* @param name
* @throws IllegalArgumentException if this existed environment has no Env with the specified name
* @return
*/
public static Env valueOf(String name) {
name = getWellFormName(name);
if(exists(name)) {
return STRING_ENV_MAP.get(name);
} else {
throw new IllegalArgumentException(name + " not exist");
}
}
/**
* Please use {@code Env.valueOf} instead this method
* @param env
* @return
*/
@Deprecated
public static Env fromString(String env) {
Env environment = transformEnv(env);
Preconditions.checkArgument(environment != UNKNOWN, String.format("Env %s is invalid", env));
return environment;
}
/**
* Not just name in Env,
* the address of Env must be same,
* or it will throw {@code RuntimeException}
* @param o
* @throws RuntimeException When same name but different address
* @return
*/
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Env env = (Env) o;
if(getName().equals(env.getName())) {
throw new RuntimeException(getName() + " is same environment name, but their Env not same");
} else {
return false;
}
}
@Override
public int hashCode() {
return Objects.hash(getName());
}
/**
* a Env convert to string, ie its name.
* @return
*/
@Override
public String toString() {
return name;
}
/**
* Backward compatibility with enum's name method
* @return
*/
@Deprecated
public String name() {
return name;
}
public String getName() {
return name;
}
/**
* conversion key from {@link String} to {@link Env}
* @param metaServerAddresses key is environment, value is environment's meta server address
* @return relationship between {@link Env} and meta server address
*/
static Map<Env, String> transformToEnvMap(Map<String, String> metaServerAddresses) {
// add to domain
Map<Env, String> map = new ConcurrentHashMap<>();
for(Map.Entry<String, String> entry : metaServerAddresses.entrySet()) {
// add new environment
Env env = Env.addEnvironment(entry.getKey());
// get meta server address value
String value = entry.getValue();
// put pair (Env, meta server address)
map.put(env, value);
}
return map;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.listener.ConfigPublishEvent;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import javax.validation.constraints.PositiveOrZero;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@Validated
@RestController
public class ReleaseController {
private final ReleaseService releaseService;
private final ApplicationEventPublisher publisher;
private final PortalConfig portalConfig;
private final PermissionValidator permissionValidator;
private final UserInfoHolder userInfoHolder;
public ReleaseController(
final ReleaseService releaseService,
final ApplicationEventPublisher publisher,
final PortalConfig portalConfig,
final PermissionValidator permissionValidator,
final UserInfoHolder userInfoHolder) {
this.releaseService = releaseService;
this.publisher = publisher;
this.portalConfig = portalConfig;
this.permissionValidator = permissionValidator;
this.userInfoHolder = userInfoHolder;
}
@PreAuthorize(value = "@permissionValidator.hasReleaseNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases")
public ReleaseDTO createRelease(@PathVariable String appId,
@PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @RequestBody NamespaceReleaseModel model) {
model.setAppId(appId);
model.setEnv(env);
model.setClusterName(clusterName);
model.setNamespaceName(namespaceName);
if (model.isEmergencyPublish() && !portalConfig.isEmergencyPublishAllowed(Env.valueOf(env))) {
throw new BadRequestException(String.format("Env: %s is not supported emergency publish now", env));
}
ReleaseDTO createdRelease = releaseService.publish(model);
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(appId)
.withCluster(clusterName)
.withNamespace(namespaceName)
.withReleaseId(createdRelease.getId())
.setNormalPublishEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
return createdRelease;
}
@PreAuthorize(value = "@permissionValidator.hasReleaseNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/releases")
public ReleaseDTO createGrayRelease(@PathVariable String appId,
@PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestBody NamespaceReleaseModel model) {
model.setAppId(appId);
model.setEnv(env);
model.setClusterName(branchName);
model.setNamespaceName(namespaceName);
if (model.isEmergencyPublish() && !portalConfig.isEmergencyPublishAllowed(Env.valueOf(env))) {
throw new BadRequestException(String.format("Env: %s is not supported emergency publish now", env));
}
ReleaseDTO createdRelease = releaseService.publish(model);
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(appId)
.withCluster(clusterName)
.withNamespace(namespaceName)
.withReleaseId(createdRelease.getId())
.setGrayPublishEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
return createdRelease;
}
@GetMapping("/envs/{env}/releases/{releaseId}")
public ReleaseDTO get(@PathVariable String env,
@PathVariable long releaseId) {
ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
return release;
}
@GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all")
public List<ReleaseBO> findAllReleases(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "5") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseService.findAllReleases(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
@GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active")
public List<ReleaseDTO> findActiveReleases(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "5") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseService.findActiveReleases(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
@GetMapping(value = "/envs/{env}/releases/compare")
public ReleaseCompareResult compareRelease(@PathVariable String env,
@RequestParam long baseReleaseId,
@RequestParam long toCompareReleaseId) {
return releaseService.compare(Env.valueOf(env), baseReleaseId, toCompareReleaseId);
}
@PutMapping(path = "/envs/{env}/releases/{releaseId}/rollback")
public void rollback(@PathVariable String env,
@PathVariable long releaseId,
@RequestParam(defaultValue = "-1") long toReleaseId) {
ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
if (!permissionValidator.hasReleaseNamespacePermission(release.getAppId(), release.getNamespaceName(), env)) {
throw new AccessDeniedException("Access is denied");
}
if (toReleaseId > -1) {
releaseService.rollbackTo(Env.valueOf(env), releaseId, toReleaseId, userInfoHolder.getUser().getUserId());
} else {
releaseService.rollback(Env.valueOf(env), releaseId, userInfoHolder.getUser().getUserId());
}
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(release.getAppId())
.withCluster(release.getClusterName())
.withNamespace(release.getNamespaceName())
.withPreviousReleaseId(releaseId)
.setRollbackEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
}
}
| package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.listener.ConfigPublishEvent;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import javax.validation.constraints.PositiveOrZero;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@Validated
@RestController
public class ReleaseController {
private final ReleaseService releaseService;
private final ApplicationEventPublisher publisher;
private final PortalConfig portalConfig;
private final PermissionValidator permissionValidator;
private final UserInfoHolder userInfoHolder;
public ReleaseController(
final ReleaseService releaseService,
final ApplicationEventPublisher publisher,
final PortalConfig portalConfig,
final PermissionValidator permissionValidator,
final UserInfoHolder userInfoHolder) {
this.releaseService = releaseService;
this.publisher = publisher;
this.portalConfig = portalConfig;
this.permissionValidator = permissionValidator;
this.userInfoHolder = userInfoHolder;
}
@PreAuthorize(value = "@permissionValidator.hasReleaseNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases")
public ReleaseDTO createRelease(@PathVariable String appId,
@PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @RequestBody NamespaceReleaseModel model) {
model.setAppId(appId);
model.setEnv(env);
model.setClusterName(clusterName);
model.setNamespaceName(namespaceName);
if (model.isEmergencyPublish() && !portalConfig.isEmergencyPublishAllowed(Env.valueOf(env))) {
throw new BadRequestException(String.format("Env: %s is not supported emergency publish now", env));
}
ReleaseDTO createdRelease = releaseService.publish(model);
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(appId)
.withCluster(clusterName)
.withNamespace(namespaceName)
.withReleaseId(createdRelease.getId())
.setNormalPublishEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
return createdRelease;
}
@PreAuthorize(value = "@permissionValidator.hasReleaseNamespacePermission(#appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/releases")
public ReleaseDTO createGrayRelease(@PathVariable String appId,
@PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestBody NamespaceReleaseModel model) {
model.setAppId(appId);
model.setEnv(env);
model.setClusterName(branchName);
model.setNamespaceName(namespaceName);
if (model.isEmergencyPublish() && !portalConfig.isEmergencyPublishAllowed(Env.valueOf(env))) {
throw new BadRequestException(String.format("Env: %s is not supported emergency publish now", env));
}
ReleaseDTO createdRelease = releaseService.publish(model);
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(appId)
.withCluster(clusterName)
.withNamespace(namespaceName)
.withReleaseId(createdRelease.getId())
.setGrayPublishEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
return createdRelease;
}
@GetMapping("/envs/{env}/releases/{releaseId}")
public ReleaseDTO get(@PathVariable String env,
@PathVariable long releaseId) {
ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
return release;
}
@GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all")
public List<ReleaseBO> findAllReleases(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "5") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseService.findAllReleases(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
@GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active")
public List<ReleaseDTO> findActiveReleases(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "5") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseService.findActiveReleases(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
@GetMapping(value = "/envs/{env}/releases/compare")
public ReleaseCompareResult compareRelease(@PathVariable String env,
@RequestParam long baseReleaseId,
@RequestParam long toCompareReleaseId) {
return releaseService.compare(Env.valueOf(env), baseReleaseId, toCompareReleaseId);
}
@PutMapping(path = "/envs/{env}/releases/{releaseId}/rollback")
public void rollback(@PathVariable String env,
@PathVariable long releaseId,
@RequestParam(defaultValue = "-1") long toReleaseId) {
ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
if (!permissionValidator.hasReleaseNamespacePermission(release.getAppId(), release.getNamespaceName(), env)) {
throw new AccessDeniedException("Access is denied");
}
if (toReleaseId > -1) {
releaseService.rollbackTo(Env.valueOf(env), releaseId, toReleaseId, userInfoHolder.getUser().getUserId());
} else {
releaseService.rollback(Env.valueOf(env), releaseId, userInfoHolder.getUser().getUserId());
}
ConfigPublishEvent event = ConfigPublishEvent.instance();
event.withAppId(release.getAppId())
.withCluster(release.getClusterName())
.withNamespace(release.getNamespaceName())
.withPreviousReleaseId(releaseId)
.setRollbackEvent(true)
.setEnv(Env.valueOf(env));
publisher.publishEvent(event);
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedEvent.java | package com.ctrip.framework.apollo.portal.listener;
import com.google.common.base.Preconditions;
import com.ctrip.framework.apollo.common.entity.App;
import org.springframework.context.ApplicationEvent;
public class AppInfoChangedEvent extends ApplicationEvent{
public AppInfoChangedEvent(Object source) {
super(source);
}
public App getApp() {
Preconditions.checkState(source != null);
return (App) this.source;
}
}
| package com.ctrip.framework.apollo.portal.listener;
import com.google.common.base.Preconditions;
import com.ctrip.framework.apollo.common.entity.App;
import org.springframework.context.ApplicationEvent;
public class AppInfoChangedEvent extends ApplicationEvent{
public AppInfoChangedEvent(Object source) {
super(source);
}
public App getApp() {
Preconditions.checkState(source != null);
return (App) this.source;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultConfig;
import com.ctrip.framework.apollo.internals.JsonConfigFile;
import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
import com.ctrip.framework.apollo.internals.PropertiesConfigFile;
import com.ctrip.framework.apollo.internals.RemoteConfigRepository;
import com.ctrip.framework.apollo.internals.XmlConfigFile;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.internals.YmlConfigFile;
import com.ctrip.framework.apollo.util.ConfigUtil;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigFactory implements ConfigFactory {
private static final Logger logger = LoggerFactory.getLogger(DefaultConfigFactory.class);
private ConfigUtil m_configUtil;
public DefaultConfigFactory() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
@Override
public Config create(String namespace) {
ConfigFileFormat format = determineFileFormat(namespace);
if (ConfigFileFormat.isPropertiesCompatible(format)) {
return new DefaultConfig(namespace, createPropertiesCompatibleFileConfigRepository(namespace, format));
}
return new DefaultConfig(namespace, createLocalConfigRepository(namespace));
}
@Override
public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigRepository configRepository = createLocalConfigRepository(namespace);
switch (configFileFormat) {
case Properties:
return new PropertiesConfigFile(namespace, configRepository);
case XML:
return new XmlConfigFile(namespace, configRepository);
case JSON:
return new JsonConfigFile(namespace, configRepository);
case YAML:
return new YamlConfigFile(namespace, configRepository);
case YML:
return new YmlConfigFile(namespace, configRepository);
case TXT:
return new TxtConfigFile(namespace, configRepository);
}
return null;
}
LocalFileConfigRepository createLocalConfigRepository(String namespace) {
if (m_configUtil.isInLocalMode()) {
logger.warn(
"==== Apollo is in local mode! Won't pull configs from remote server for namespace {} ! ====",
namespace);
return new LocalFileConfigRepository(namespace);
}
return new LocalFileConfigRepository(namespace, createRemoteConfigRepository(namespace));
}
RemoteConfigRepository createRemoteConfigRepository(String namespace) {
return new RemoteConfigRepository(namespace);
}
PropertiesCompatibleFileConfigRepository createPropertiesCompatibleFileConfigRepository(String namespace,
ConfigFileFormat format) {
String actualNamespaceName = trimNamespaceFormat(namespace, format);
PropertiesCompatibleConfigFile configFile = (PropertiesCompatibleConfigFile) ConfigService
.getConfigFile(actualNamespaceName, format);
return new PropertiesCompatibleFileConfigRepository(configFile);
}
// for namespaces whose format are not properties, the file extension must be present, e.g. application.yaml
ConfigFileFormat determineFileFormat(String namespaceName) {
String lowerCase = namespaceName.toLowerCase();
for (ConfigFileFormat format : ConfigFileFormat.values()) {
if (lowerCase.endsWith("." + format.getValue())) {
return format;
}
}
return ConfigFileFormat.Properties;
}
String trimNamespaceFormat(String namespaceName, ConfigFileFormat format) {
String extension = "." + format.getValue();
if (!namespaceName.toLowerCase().endsWith(extension)) {
return namespaceName;
}
return namespaceName.substring(0, namespaceName.length() - extension.length());
}
}
| package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultConfig;
import com.ctrip.framework.apollo.internals.JsonConfigFile;
import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
import com.ctrip.framework.apollo.internals.PropertiesConfigFile;
import com.ctrip.framework.apollo.internals.RemoteConfigRepository;
import com.ctrip.framework.apollo.internals.XmlConfigFile;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.internals.YmlConfigFile;
import com.ctrip.framework.apollo.util.ConfigUtil;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigFactory implements ConfigFactory {
private static final Logger logger = LoggerFactory.getLogger(DefaultConfigFactory.class);
private ConfigUtil m_configUtil;
public DefaultConfigFactory() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
@Override
public Config create(String namespace) {
ConfigFileFormat format = determineFileFormat(namespace);
if (ConfigFileFormat.isPropertiesCompatible(format)) {
return new DefaultConfig(namespace, createPropertiesCompatibleFileConfigRepository(namespace, format));
}
return new DefaultConfig(namespace, createLocalConfigRepository(namespace));
}
@Override
public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigRepository configRepository = createLocalConfigRepository(namespace);
switch (configFileFormat) {
case Properties:
return new PropertiesConfigFile(namespace, configRepository);
case XML:
return new XmlConfigFile(namespace, configRepository);
case JSON:
return new JsonConfigFile(namespace, configRepository);
case YAML:
return new YamlConfigFile(namespace, configRepository);
case YML:
return new YmlConfigFile(namespace, configRepository);
case TXT:
return new TxtConfigFile(namespace, configRepository);
}
return null;
}
LocalFileConfigRepository createLocalConfigRepository(String namespace) {
if (m_configUtil.isInLocalMode()) {
logger.warn(
"==== Apollo is in local mode! Won't pull configs from remote server for namespace {} ! ====",
namespace);
return new LocalFileConfigRepository(namespace);
}
return new LocalFileConfigRepository(namespace, createRemoteConfigRepository(namespace));
}
RemoteConfigRepository createRemoteConfigRepository(String namespace) {
return new RemoteConfigRepository(namespace);
}
PropertiesCompatibleFileConfigRepository createPropertiesCompatibleFileConfigRepository(String namespace,
ConfigFileFormat format) {
String actualNamespaceName = trimNamespaceFormat(namespace, format);
PropertiesCompatibleConfigFile configFile = (PropertiesCompatibleConfigFile) ConfigService
.getConfigFile(actualNamespaceName, format);
return new PropertiesCompatibleFileConfigRepository(configFile);
}
// for namespaces whose format are not properties, the file extension must be present, e.g. application.yaml
ConfigFileFormat determineFileFormat(String namespaceName) {
String lowerCase = namespaceName.toLowerCase();
for (ConfigFileFormat format : ConfigFileFormat.values()) {
if (lowerCase.endsWith("." + format.getValue())) {
return format;
}
}
return ConfigFileFormat.Properties;
}
String trimNamespaceFormat(String namespaceName, ConfigFileFormat format) {
String extension = "." + format.getValue();
if (!namespaceName.toLowerCase().endsWith(extension)) {
return namespaceName;
}
return namespaceName.substring(0, namespaceName.length() - extension.length());
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/main/resources/application.yml | spring:
application:
name: apollo-configservice
profiles:
active: ${apollo_profile}
ctrip:
appid: 100003171
server:
port: 8080
logging:
file:
name: /opt/logs/100003171/apollo-configservice.log
eureka:
instance:
hostname: ${hostname:localhost}
preferIpAddress: true
status-page-url-path: /info
health-check-url-path: /health
server:
peerEurekaNodesUpdateIntervalMs: 60000
enableSelfPreservation: false
client:
serviceUrl:
# This setting will be overridden by eureka.service.url setting from ApolloConfigDB.ServerConfig or System Property
# see com.ctrip.framework.apollo.biz.eureka.ApolloEurekaClientConfig
defaultZone: http://${eureka.instance.hostname}:8080/eureka/
healthcheck:
enabled: true
eurekaServiceUrlPollIntervalSeconds: 60
management:
health:
status:
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP
| spring:
application:
name: apollo-configservice
profiles:
active: ${apollo_profile}
ctrip:
appid: 100003171
server:
port: 8080
logging:
file:
name: /opt/logs/100003171/apollo-configservice.log
eureka:
instance:
hostname: ${hostname:localhost}
preferIpAddress: true
status-page-url-path: /info
health-check-url-path: /health
server:
peerEurekaNodesUpdateIntervalMs: 60000
enableSelfPreservation: false
client:
serviceUrl:
# This setting will be overridden by eureka.service.url setting from ApolloConfigDB.ServerConfig or System Property
# see com.ctrip.framework.apollo.biz.eureka.ApolloEurekaClientConfig
defaultZone: http://${eureka.instance.hostname}:8080/eureka/
healthcheck:
enabled: true
eurekaServiceUrlPollIntervalSeconds: 60
management:
health:
status:
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AccessKeyDTO.java | package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
return secret;
}
public void setSecret(String secret) {
this.secret = secret;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
}
| package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
return secret;
}
public void setSecret(String secret) {
this.secret = secret;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/AutoUpdateConfigChangeListener.java | package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.TypeConverter;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.env.Environment;
import org.springframework.util.CollectionUtils;
/**
* Create by zhangzheng on 2018/3/6
*/
public class AutoUpdateConfigChangeListener implements ConfigChangeListener{
private static final Logger logger = LoggerFactory.getLogger(AutoUpdateConfigChangeListener.class);
private final boolean typeConverterHasConvertIfNecessaryWithFieldParameter;
private final Environment environment;
private final ConfigurableBeanFactory beanFactory;
private final TypeConverter typeConverter;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private final Gson gson;
public AutoUpdateConfigChangeListener(Environment environment, ConfigurableListableBeanFactory beanFactory){
this.typeConverterHasConvertIfNecessaryWithFieldParameter = testTypeConverterHasConvertIfNecessaryWithFieldParameter();
this.beanFactory = beanFactory;
this.typeConverter = this.beanFactory.getTypeConverter();
this.environment = environment;
this.placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
this.springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
this.gson = new Gson();
}
@Override
public void onChange(ConfigChangeEvent changeEvent) {
Set<String> keys = changeEvent.changedKeys();
if (CollectionUtils.isEmpty(keys)) {
return;
}
for (String key : keys) {
// 1. check whether the changed key is relevant
Collection<SpringValue> targetValues = springValueRegistry.get(beanFactory, key);
if (targetValues == null || targetValues.isEmpty()) {
continue;
}
// 2. update the value
for (SpringValue val : targetValues) {
updateSpringValue(val);
}
}
}
private void updateSpringValue(SpringValue springValue) {
try {
Object value = resolvePropertyValue(springValue);
springValue.update(value);
logger.info("Auto update apollo changed value successfully, new value: {}, {}", value,
springValue);
} catch (Throwable ex) {
logger.error("Auto update apollo changed value failed, {}", springValue.toString(), ex);
}
}
/**
* Logic transplanted from DefaultListableBeanFactory
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#doResolveDependency(org.springframework.beans.factory.config.DependencyDescriptor, java.lang.String, java.util.Set, org.springframework.beans.TypeConverter)
*/
private Object resolvePropertyValue(SpringValue springValue) {
// value will never be null, as @Value and @ApolloJsonValue will not allow that
Object value = placeholderHelper
.resolvePropertyValue(beanFactory, springValue.getBeanName(), springValue.getPlaceholder());
if (springValue.isJson()) {
value = parseJsonValue((String)value, springValue.getGenericType());
} else {
if (springValue.isField()) {
// org.springframework.beans.TypeConverter#convertIfNecessary(java.lang.Object, java.lang.Class, java.lang.reflect.Field) is available from Spring 3.2.0+
if (typeConverterHasConvertIfNecessaryWithFieldParameter) {
value = this.typeConverter
.convertIfNecessary(value, springValue.getTargetType(), springValue.getField());
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType());
}
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType(),
springValue.getMethodParameter());
}
}
return value;
}
private Object parseJsonValue(String json, Type targetType) {
try {
return gson.fromJson(json, targetType);
} catch (Throwable ex) {
logger.error("Parsing json '{}' to type {} failed!", json, targetType, ex);
throw ex;
}
}
private boolean testTypeConverterHasConvertIfNecessaryWithFieldParameter() {
try {
TypeConverter.class.getMethod("convertIfNecessary", Object.class, Class.class, Field.class);
} catch (Throwable ex) {
return false;
}
return true;
}
}
| package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.TypeConverter;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.env.Environment;
import org.springframework.util.CollectionUtils;
/**
* Create by zhangzheng on 2018/3/6
*/
public class AutoUpdateConfigChangeListener implements ConfigChangeListener{
private static final Logger logger = LoggerFactory.getLogger(AutoUpdateConfigChangeListener.class);
private final boolean typeConverterHasConvertIfNecessaryWithFieldParameter;
private final Environment environment;
private final ConfigurableBeanFactory beanFactory;
private final TypeConverter typeConverter;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private final Gson gson;
public AutoUpdateConfigChangeListener(Environment environment, ConfigurableListableBeanFactory beanFactory){
this.typeConverterHasConvertIfNecessaryWithFieldParameter = testTypeConverterHasConvertIfNecessaryWithFieldParameter();
this.beanFactory = beanFactory;
this.typeConverter = this.beanFactory.getTypeConverter();
this.environment = environment;
this.placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
this.springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
this.gson = new Gson();
}
@Override
public void onChange(ConfigChangeEvent changeEvent) {
Set<String> keys = changeEvent.changedKeys();
if (CollectionUtils.isEmpty(keys)) {
return;
}
for (String key : keys) {
// 1. check whether the changed key is relevant
Collection<SpringValue> targetValues = springValueRegistry.get(beanFactory, key);
if (targetValues == null || targetValues.isEmpty()) {
continue;
}
// 2. update the value
for (SpringValue val : targetValues) {
updateSpringValue(val);
}
}
}
private void updateSpringValue(SpringValue springValue) {
try {
Object value = resolvePropertyValue(springValue);
springValue.update(value);
logger.info("Auto update apollo changed value successfully, new value: {}, {}", value,
springValue);
} catch (Throwable ex) {
logger.error("Auto update apollo changed value failed, {}", springValue.toString(), ex);
}
}
/**
* Logic transplanted from DefaultListableBeanFactory
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#doResolveDependency(org.springframework.beans.factory.config.DependencyDescriptor, java.lang.String, java.util.Set, org.springframework.beans.TypeConverter)
*/
private Object resolvePropertyValue(SpringValue springValue) {
// value will never be null, as @Value and @ApolloJsonValue will not allow that
Object value = placeholderHelper
.resolvePropertyValue(beanFactory, springValue.getBeanName(), springValue.getPlaceholder());
if (springValue.isJson()) {
value = parseJsonValue((String)value, springValue.getGenericType());
} else {
if (springValue.isField()) {
// org.springframework.beans.TypeConverter#convertIfNecessary(java.lang.Object, java.lang.Class, java.lang.reflect.Field) is available from Spring 3.2.0+
if (typeConverterHasConvertIfNecessaryWithFieldParameter) {
value = this.typeConverter
.convertIfNecessary(value, springValue.getTargetType(), springValue.getField());
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType());
}
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType(),
springValue.getMethodParameter());
}
}
return value;
}
private Object parseJsonValue(String json, Type targetType) {
try {
return gson.fromJson(json, targetType);
} catch (Throwable ex) {
logger.error("Parsing json '{}' to type {} failed!", json, targetType, ex);
throw ex;
}
}
private boolean testTypeConverterHasConvertIfNecessaryWithFieldParameter() {
try {
TypeConverter.class.getMethod("convertIfNecessary", Object.class, Class.class, Field.class);
} catch (Throwable ex) {
return false;
}
return true;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripMQService.java | package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapMappingProperties.java |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rdn key
*/
private String rdnKey;
/**
* user display name
*/
private String userDisplayName;
/**
* email
*/
private String email;
public String getObjectClass() {
return objectClass;
}
public void setObjectClass(String objectClass) {
this.objectClass = objectClass;
}
public String getLoginId() {
return loginId;
}
public void setLoginId(String loginId) {
this.loginId = loginId;
}
public String getRdnKey() {
return rdnKey;
}
public void setRdnKey(String rdnKey) {
this.rdnKey = rdnKey;
}
public String getUserDisplayName() {
return userDisplayName;
}
public void setUserDisplayName(String userDisplayName) {
this.userDisplayName = userDisplayName;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}
|
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rdn key
*/
private String rdnKey;
/**
* user display name
*/
private String userDisplayName;
/**
* email
*/
private String email;
public String getObjectClass() {
return objectClass;
}
public void setObjectClass(String objectClass) {
this.objectClass = objectClass;
}
public String getLoginId() {
return loginId;
}
public void setLoginId(String loginId) {
this.loginId = loginId;
}
public String getRdnKey() {
return rdnKey;
}
public void setRdnKey(String rdnKey) {
this.rdnKey = rdnKey;
}
public String getUserDisplayName() {
return userDisplayName;
}
public void setUserDisplayName(String userDisplayName) {
this.userDisplayName = userDisplayName;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/EntityManagerUtil.java | package com.ctrip.framework.apollo.biz.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionSynchronizationManager;
/**
* @author Jason Song([email protected])
*/
@Component
public class EntityManagerUtil extends EntityManagerFactoryAccessor {
private static final Logger logger = LoggerFactory.getLogger(EntityManagerUtil.class);
/**
* close the entity manager.
* Use it with caution! This is only intended for use with async request, which Spring won't
* close the entity manager until the async request is finished.
*/
public void closeEntityManager() {
EntityManagerHolder emHolder = (EntityManagerHolder)
TransactionSynchronizationManager.getResource(getEntityManagerFactory());
if (emHolder == null) {
return;
}
logger.debug("Closing JPA EntityManager in EntityManagerUtil");
EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager());
}
}
| package com.ctrip.framework.apollo.biz.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionSynchronizationManager;
/**
* @author Jason Song([email protected])
*/
@Component
public class EntityManagerUtil extends EntityManagerFactoryAccessor {
private static final Logger logger = LoggerFactory.getLogger(EntityManagerUtil.class);
/**
* close the entity manager.
* Use it with caution! This is only intended for use with async request, which Spring won't
* close the entity manager until the async request is finished.
*/
public void closeEntityManager() {
EntityManagerHolder emHolder = (EntityManagerHolder)
TransactionSynchronizationManager.getResource(getEntityManagerFactory());
if (emHolder == null) {
return;
}
logger.debug("Closing JPA EntityManager in EntityManagerUtil");
EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager());
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.RestTemplate;
import java.util.List;
public class ItemSetControllerTest extends AbstractControllerTest {
@Autowired
ItemRepository itemRepository;
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetCreated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets itemSet = new ItemChangeSets();
itemSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
itemSet.addCreateItem(item);
}
ResponseEntity<Void> response =
createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/itemset",
itemSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, items.size());
Item item0 = items.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("created_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetUpdated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdRestTemplate = (new TestRestTemplate()).getRestTemplate();
createdRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
createdRestTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets updateChangeSet = new ItemChangeSets();
updateChangeSet.setDataChangeLastModifiedBy("updated");
RestTemplate updatedRestTemplate = (new TestRestTemplate()).getRestTemplate();
updatedRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int updatedSize = 2;
for (int i = 0; i < updatedSize; i++) {
items[i].setValue("updated_value_" + i);
updateChangeSet.addUpdateItem(items[i]);
}
response = updatedRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
updateChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("updated_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertEquals("updated", item0.getDataChangeLastModifiedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
Assert.assertNotNull(item0.getDataChangeLastModifiedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetDeleted() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets deleteChangeSet = new ItemChangeSets();
deleteChangeSet.setDataChangeLastModifiedBy("deleted");
RestTemplate deletedTemplate = (new TestRestTemplate()).getRestTemplate();
deletedTemplate.setMessageConverters(restTemplate.getMessageConverters());
int deletedSize = 1;
for (int i = 0; i < deletedSize; i++) {
items[i].setValue("deleted_value_" + i);
deleteChangeSet.addDeleteItem(items[i]);
}
response = deletedTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
deleteChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize - deletedSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_1", item0.getKey());
Assert.assertEquals("created_value_1", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
}
| package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.RestTemplate;
import java.util.List;
public class ItemSetControllerTest extends AbstractControllerTest {
@Autowired
ItemRepository itemRepository;
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetCreated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets itemSet = new ItemChangeSets();
itemSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
itemSet.addCreateItem(item);
}
ResponseEntity<Void> response =
createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/itemset",
itemSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, items.size());
Item item0 = items.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("created_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetUpdated() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdRestTemplate = (new TestRestTemplate()).getRestTemplate();
createdRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
createdRestTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets updateChangeSet = new ItemChangeSets();
updateChangeSet.setDataChangeLastModifiedBy("updated");
RestTemplate updatedRestTemplate = (new TestRestTemplate()).getRestTemplate();
updatedRestTemplate.setMessageConverters(restTemplate.getMessageConverters());
int updatedSize = 2;
for (int i = 0; i < updatedSize; i++) {
items[i].setValue("updated_value_" + i);
updateChangeSet.addUpdateItem(items[i]);
}
response = updatedRestTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
updateChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_0", item0.getKey());
Assert.assertEquals("updated_value_0", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertEquals("updated", item0.getDataChangeLastModifiedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
Assert.assertNotNull(item0.getDataChangeLastModifiedTime());
}
@Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetDeleted() {
String appId = "someAppId";
AppDTO app =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + appId, AppDTO.class);
ClusterDTO cluster = restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/default",
ClusterDTO.class);
NamespaceDTO namespace =
restTemplate.getForObject("http://localhost:" + port + "/apps/" + app.getAppId()
+ "/clusters/" + cluster.getName() + "/namespaces/application", NamespaceDTO.class);
Assert.assertEquals("someAppId", app.getAppId());
Assert.assertEquals("default", cluster.getName());
Assert.assertEquals("application", namespace.getNamespaceName());
ItemChangeSets createChangeSet = new ItemChangeSets();
createChangeSet.setDataChangeLastModifiedBy("created");
RestTemplate createdTemplate = (new TestRestTemplate()).getRestTemplate();
createdTemplate.setMessageConverters(restTemplate.getMessageConverters());
int createdSize = 3;
for (int i = 0; i < createdSize; i++) {
ItemDTO item = new ItemDTO();
item.setNamespaceId(namespace.getId());
item.setKey("key_" + i);
item.setValue("created_value_" + i);
createChangeSet.addCreateItem(item);
}
ResponseEntity<Void> response = createdTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
createChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
ItemDTO[] items =
restTemplate.getForObject(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/"
+ cluster.getName() + "/namespaces/" + namespace.getNamespaceName() + "/items",
ItemDTO[].class);
ItemChangeSets deleteChangeSet = new ItemChangeSets();
deleteChangeSet.setDataChangeLastModifiedBy("deleted");
RestTemplate deletedTemplate = (new TestRestTemplate()).getRestTemplate();
deletedTemplate.setMessageConverters(restTemplate.getMessageConverters());
int deletedSize = 1;
for (int i = 0; i < deletedSize; i++) {
items[i].setValue("deleted_value_" + i);
deleteChangeSet.addDeleteItem(items[i]);
}
response = deletedTemplate.postForEntity(
"http://localhost:" + port + "/apps/" + app.getAppId() + "/clusters/" + cluster.getName()
+ "/namespaces/" + namespace.getNamespaceName() + "/itemset",
deleteChangeSet, Void.class);
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
List<Item> savedItems = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespace.getId());
Assert.assertEquals(createdSize - deletedSize, savedItems.size());
Item item0 = savedItems.get(0);
Assert.assertEquals("key_1", item0.getKey());
Assert.assertEquals("created_value_1", item0.getValue());
Assert.assertEquals("created", item0.getDataChangeCreatedBy());
Assert.assertNotNull(item0.getDataChangeCreatedTime());
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/NamespaceLock.java | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "NamespaceLock")
@Where(clause = "isDeleted = 0")
public class NamespaceLock extends BaseEntity{
@Column(name = "NamespaceId")
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "NamespaceLock")
@Where(clause = "isDeleted = 0")
public class NamespaceLock extends BaseEntity{
@Column(name = "NamespaceId")
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java | package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
public interface EmailService {
void send(Email email);
}
| package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
public interface EmailService {
void send(Email email);
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/AppOpenApiServiceTest.java | package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class AppOpenApiServiceTest extends AbstractOpenApiServiceTest {
private AppOpenApiService appOpenApiService;
private String someAppId;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
StringEntity responseEntity = new StringEntity("[]");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
appOpenApiService = new AppOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetEnvClusterInfo() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
appOpenApiService.getEnvClusterInfo(someAppId);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/apps/%s/envclusters", someBaseUrl, someAppId), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetEnvClusterInfoWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(500);
appOpenApiService.getEnvClusterInfo(someAppId);
}
}
| package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class AppOpenApiServiceTest extends AbstractOpenApiServiceTest {
private AppOpenApiService appOpenApiService;
private String someAppId;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
StringEntity responseEntity = new StringEntity("[]");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
appOpenApiService = new AppOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetEnvClusterInfo() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
appOpenApiService.getEnvClusterInfo(someAppId);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/apps/%s/envclusters", someBaseUrl, someAppId), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetEnvClusterInfoWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(500);
appOpenApiService.getEnvClusterInfo(someAppId);
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java | package com.ctrip.framework.apollo.model;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song([email protected])
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**
* Constructor.
* @param namespace the namespace of this change
* @param changes the actual changes
*/
public ConfigChangeEvent(String namespace,
Map<String, ConfigChange> changes) {
m_namespace = namespace;
m_changes = changes;
}
/**
* Get the keys changed.
* @return the list of the keys
*/
public Set<String> changedKeys() {
return m_changes.keySet();
}
/**
* Get a specific change instance for the key specified.
* @param key the changed key
* @return the change instance
*/
public ConfigChange getChange(String key) {
return m_changes.get(key);
}
/**
* Check whether the specified key is changed
* @param key the key
* @return true if the key is changed, false otherwise.
*/
public boolean isChanged(String key) {
return m_changes.containsKey(key);
}
/**
* Get the namespace of this change event.
* @return the namespace
*/
public String getNamespace() {
return m_namespace;
}
}
| package com.ctrip.framework.apollo.model;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song([email protected])
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**
* Constructor.
* @param namespace the namespace of this change
* @param changes the actual changes
*/
public ConfigChangeEvent(String namespace,
Map<String, ConfigChange> changes) {
m_namespace = namespace;
m_changes = changes;
}
/**
* Get the keys changed.
* @return the list of the keys
*/
public Set<String> changedKeys() {
return m_changes.keySet();
}
/**
* Get a specific change instance for the key specified.
* @param key the changed key
* @return the change instance
*/
public ConfigChange getChange(String key) {
return m_changes.get(key);
}
/**
* Check whether the specified key is changed
* @param key the key
* @return true if the key is changed, false otherwise.
*/
public boolean isChanged(String key) {
return m_changes.containsKey(key);
}
/**
* Get the namespace of this change event.
* @return the namespace
*/
public String getNamespace() {
return m_namespace;
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AccessKeyController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.AccessKeyService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;
/**
* @author nisiyong
*/
@RestController
public class AccessKeyController {
private final UserInfoHolder userInfoHolder;
private final AccessKeyService accessKeyService;
public AccessKeyController(
UserInfoHolder userInfoHolder,
AccessKeyService accessKeyService) {
this.userInfoHolder = userInfoHolder;
this.accessKeyService = accessKeyService;
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PostMapping(value = "/apps/{appId}/envs/{env}/accesskeys")
public AccessKeyDTO save(@PathVariable String appId, @PathVariable String env,
@RequestBody AccessKeyDTO accessKeyDTO) {
String secret = UUID.randomUUID().toString().replaceAll("-", "");
accessKeyDTO.setAppId(appId);
accessKeyDTO.setSecret(secret);
return accessKeyService.createAccessKey(Env.valueOf(env), accessKeyDTO);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@GetMapping(value = "/apps/{appId}/envs/{env}/accesskeys")
public List<AccessKeyDTO> findByAppId(@PathVariable String appId,
@PathVariable String env) {
return accessKeyService.findByAppId(Env.valueOf(env), appId);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@DeleteMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}")
public void delete(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.deleteAccessKey(Env.valueOf(env), appId, id, operator);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PutMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}/enable")
public void enable(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.enable(Env.valueOf(env), appId, id, operator);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PutMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}/disable")
public void disable(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.disable(Env.valueOf(env), appId, id, operator);
}
}
| package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.AccessKeyService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;
/**
* @author nisiyong
*/
@RestController
public class AccessKeyController {
private final UserInfoHolder userInfoHolder;
private final AccessKeyService accessKeyService;
public AccessKeyController(
UserInfoHolder userInfoHolder,
AccessKeyService accessKeyService) {
this.userInfoHolder = userInfoHolder;
this.accessKeyService = accessKeyService;
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PostMapping(value = "/apps/{appId}/envs/{env}/accesskeys")
public AccessKeyDTO save(@PathVariable String appId, @PathVariable String env,
@RequestBody AccessKeyDTO accessKeyDTO) {
String secret = UUID.randomUUID().toString().replaceAll("-", "");
accessKeyDTO.setAppId(appId);
accessKeyDTO.setSecret(secret);
return accessKeyService.createAccessKey(Env.valueOf(env), accessKeyDTO);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@GetMapping(value = "/apps/{appId}/envs/{env}/accesskeys")
public List<AccessKeyDTO> findByAppId(@PathVariable String appId,
@PathVariable String env) {
return accessKeyService.findByAppId(Env.valueOf(env), appId);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@DeleteMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}")
public void delete(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.deleteAccessKey(Env.valueOf(env), appId, id, operator);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PutMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}/enable")
public void enable(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.enable(Env.valueOf(env), appId, id, operator);
}
@PreAuthorize(value = "@permissionValidator.isAppAdmin(#appId)")
@PutMapping(value = "/apps/{appId}/envs/{env}/accesskeys/{id}/disable")
public void disable(@PathVariable String appId,
@PathVariable String env,
@PathVariable long id) {
String operator = userInfoHolder.getUser().getUserId();
accessKeyService.disable(Env.valueOf(env), appId, id, operator);
}
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song([email protected])
*/
public interface ConfigFactory {
/**
* Create the config instance for the namespace.
*
* @param namespace the namespace
* @return the newly created config instance
*/
Config create(String namespace);
/**
* Create the config file instance for the namespace
* @param namespace the namespace
* @return the newly created config file instance
*/
ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song([email protected])
*/
public interface ConfigFactory {
/**
* Create the config instance for the namespace.
*
* @param namespace the namespace
* @return the newly created config instance
*/
Config create(String namespace);
/**
* Create the config file instance for the namespace
* @param namespace the namespace
* @return the newly created config file instance
*/
ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/resources/spring/yaml/case7.yml | apollo.test.testBean:false
| apollo.test.testBean:false
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScannerTest.java | package com.ctrip.framework.apollo.biz.message;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
public class ReleaseMessageScannerTest extends AbstractUnitTest {
private ReleaseMessageScanner releaseMessageScanner;
@Mock
private ReleaseMessageRepository releaseMessageRepository;
@Mock
private BizConfig bizConfig;
private int databaseScanInterval;
@Before
public void setUp() throws Exception {
releaseMessageScanner = new ReleaseMessageScanner();
ReflectionTestUtils
.setField(releaseMessageScanner, "releaseMessageRepository", releaseMessageRepository);
ReflectionTestUtils.setField(releaseMessageScanner, "bizConfig", bizConfig);
databaseScanInterval = 100; //100 ms
when(bizConfig.releaseMessageScanIntervalInMilli()).thenReturn(databaseScanInterval);
releaseMessageScanner.afterPropertiesSet();
}
@Test
public void testScanMessageAndNotifyMessageListener() throws Exception {
SettableFuture<ReleaseMessage> someListenerFuture = SettableFuture.create();
ReleaseMessageListener someListener = (message, channel) -> someListenerFuture.set(message);
releaseMessageScanner.addMessageListener(someListener);
String someMessage = "someMessage";
long someId = 100;
ReleaseMessage someReleaseMessage = assembleReleaseMessage(someId, someMessage);
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0L)).thenReturn(
Lists.newArrayList(someReleaseMessage));
ReleaseMessage someListenerMessage =
someListenerFuture.get(5000, TimeUnit.MILLISECONDS);
assertEquals(someMessage, someListenerMessage.getMessage());
assertEquals(someId, someListenerMessage.getId());
SettableFuture<ReleaseMessage> anotherListenerFuture = SettableFuture.create();
ReleaseMessageListener anotherListener = (message, channel) -> anotherListenerFuture.set(message);
releaseMessageScanner.addMessageListener(anotherListener);
String anotherMessage = "anotherMessage";
long anotherId = someId + 1;
ReleaseMessage anotherReleaseMessage = assembleReleaseMessage(anotherId, anotherMessage);
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(someId)).thenReturn(
Lists.newArrayList(anotherReleaseMessage));
ReleaseMessage anotherListenerMessage =
anotherListenerFuture.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherMessage, anotherListenerMessage.getMessage());
assertEquals(anotherId, anotherListenerMessage.getId());
}
private ReleaseMessage assembleReleaseMessage(long id, String message) {
ReleaseMessage releaseMessage = new ReleaseMessage();
releaseMessage.setId(id);
releaseMessage.setMessage(message);
return releaseMessage;
}
}
| package com.ctrip.framework.apollo.biz.message;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
public class ReleaseMessageScannerTest extends AbstractUnitTest {
private ReleaseMessageScanner releaseMessageScanner;
@Mock
private ReleaseMessageRepository releaseMessageRepository;
@Mock
private BizConfig bizConfig;
private int databaseScanInterval;
@Before
public void setUp() throws Exception {
releaseMessageScanner = new ReleaseMessageScanner();
ReflectionTestUtils
.setField(releaseMessageScanner, "releaseMessageRepository", releaseMessageRepository);
ReflectionTestUtils.setField(releaseMessageScanner, "bizConfig", bizConfig);
databaseScanInterval = 100; //100 ms
when(bizConfig.releaseMessageScanIntervalInMilli()).thenReturn(databaseScanInterval);
releaseMessageScanner.afterPropertiesSet();
}
@Test
public void testScanMessageAndNotifyMessageListener() throws Exception {
SettableFuture<ReleaseMessage> someListenerFuture = SettableFuture.create();
ReleaseMessageListener someListener = (message, channel) -> someListenerFuture.set(message);
releaseMessageScanner.addMessageListener(someListener);
String someMessage = "someMessage";
long someId = 100;
ReleaseMessage someReleaseMessage = assembleReleaseMessage(someId, someMessage);
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0L)).thenReturn(
Lists.newArrayList(someReleaseMessage));
ReleaseMessage someListenerMessage =
someListenerFuture.get(5000, TimeUnit.MILLISECONDS);
assertEquals(someMessage, someListenerMessage.getMessage());
assertEquals(someId, someListenerMessage.getId());
SettableFuture<ReleaseMessage> anotherListenerFuture = SettableFuture.create();
ReleaseMessageListener anotherListener = (message, channel) -> anotherListenerFuture.set(message);
releaseMessageScanner.addMessageListener(anotherListener);
String anotherMessage = "anotherMessage";
long anotherId = someId + 1;
ReleaseMessage anotherReleaseMessage = assembleReleaseMessage(anotherId, anotherMessage);
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(someId)).thenReturn(
Lists.newArrayList(anotherReleaseMessage));
ReleaseMessage anotherListenerMessage =
anotherListenerFuture.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherMessage, anotherListenerMessage.getMessage());
assertEquals(anotherId, anotherListenerMessage.getId());
}
private ReleaseMessage assembleReleaseMessage(long id, String message) {
ReleaseMessage releaseMessage = new ReleaseMessage();
releaseMessage.setId(id);
releaseMessage.setMessage(message);
return releaseMessage;
}
}
| -1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.