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,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-client/src/test/resources/yaml/case9.yaml | #
# Copyright 2021 Apollo Authors
#
# 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.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | #
# Copyright 2021 Apollo Authors
#
# 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.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./docs/en/faq/faq.md | TODO
| TODO
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/http/RichResponseEntity.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.http;
import org.springframework.http.HttpStatus;
public class RichResponseEntity<T>{
private int code;
private Object message;
private T body;
public static <T> RichResponseEntity<T> ok(T body){
RichResponseEntity<T> richResponseEntity = new RichResponseEntity<>();
richResponseEntity.message = HttpStatus.OK.getReasonPhrase();
richResponseEntity.code = HttpStatus.OK.value();
richResponseEntity.body = body;
return richResponseEntity;
}
public static <T> RichResponseEntity<T> error(HttpStatus httpCode, Object message){
RichResponseEntity<T> richResponseEntity = new RichResponseEntity<>();
richResponseEntity.message = message;
richResponseEntity.code = httpCode.value();
return richResponseEntity;
}
public int getCode() {
return code;
}
public Object getMessage() {
return message;
}
public T getBody() {
return body;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.http;
import org.springframework.http.HttpStatus;
public class RichResponseEntity<T>{
private int code;
private Object message;
private T body;
public static <T> RichResponseEntity<T> ok(T body){
RichResponseEntity<T> richResponseEntity = new RichResponseEntity<>();
richResponseEntity.message = HttpStatus.OK.getReasonPhrase();
richResponseEntity.code = HttpStatus.OK.value();
richResponseEntity.body = body;
return richResponseEntity;
}
public static <T> RichResponseEntity<T> error(HttpStatus httpCode, Object message){
RichResponseEntity<T> richResponseEntity = new RichResponseEntity<>();
richResponseEntity.message = message;
richResponseEntity.code = httpCode.value();
return richResponseEntity;
}
public int getCode() {
return code;
}
public Object getMessage() {
return message;
}
public T getBody() {
return body;
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/service/ReleaseOpenApiService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
public class ReleaseOpenApiService extends AbstractOpenApiService {
public ReleaseOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
super(client, baseUrl, gson);
}
public OpenReleaseDTO publishNamespace(String appId, String env, String clusterName, String namespaceName,
NamespaceReleaseDTO releaseDTO) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
checkNotEmpty(releaseDTO.getReleaseTitle(), "Release title");
checkNotEmpty(releaseDTO.getReleasedBy(), "Released by");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/releases",
escapePath(env), escapePath(appId), escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = post(path, releaseDTO)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenReleaseDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Release namespace: %s for appId: %s, cluster: %s in env: %s failed", namespaceName, appId,
clusterName, env), ex);
}
}
public OpenReleaseDTO getLatestActiveRelease(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/releases/latest",
escapePath(env), escapePath(appId), escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenReleaseDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get latest active release for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId,
clusterName, namespaceName, env), ex);
}
}
public void rollbackRelease(String env, long releaseId, String operator) {
checkNotEmpty(env, "Env");
checkNotEmpty(operator, "Operator");
String path = String.format("envs/%s/releases/%s/rollback?operator=%s", escapePath(env), releaseId,
escapeParam(operator));
try (CloseableHttpResponse ignored = put(path, null)) {
} catch (Throwable ex) {
throw new RuntimeException(String.format("Rollback release: %s in env: %s failed", releaseId, env), ex);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
public class ReleaseOpenApiService extends AbstractOpenApiService {
public ReleaseOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
super(client, baseUrl, gson);
}
public OpenReleaseDTO publishNamespace(String appId, String env, String clusterName, String namespaceName,
NamespaceReleaseDTO releaseDTO) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
checkNotEmpty(releaseDTO.getReleaseTitle(), "Release title");
checkNotEmpty(releaseDTO.getReleasedBy(), "Released by");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/releases",
escapePath(env), escapePath(appId), escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = post(path, releaseDTO)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenReleaseDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Release namespace: %s for appId: %s, cluster: %s in env: %s failed", namespaceName, appId,
clusterName, env), ex);
}
}
public OpenReleaseDTO getLatestActiveRelease(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/releases/latest",
escapePath(env), escapePath(appId), escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenReleaseDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get latest active release for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId,
clusterName, namespaceName, env), ex);
}
}
public void rollbackRelease(String env, long releaseId, String operator) {
checkNotEmpty(env, "Env");
checkNotEmpty(operator, "Operator");
String path = String.format("envs/%s/releases/%s/rollback?operator=%s", escapePath(env), releaseId,
escapeParam(operator));
try (CloseableHttpResponse ignored = put(path, null)) {
} catch (Throwable ex) {
throw new RuntimeException(String.format("Rollback release: %s in env: %s failed", releaseId, env), ex);
}
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./.git/hooks/pre-commit.sample | #!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
| #!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/package-info.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
/**
* 携程内部的dal,第三方公司可替换实现
*/
package com.ctrip.framework.apollo.common.datasource;
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
/**
* 携程内部的dal,第三方公司可替换实现
*/
package com.ctrip.framework.apollo.common.datasource;
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/FavoriteService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/FavoriteRepository.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface FavoriteRepository extends PagingAndSortingRepository<Favorite, Long> {
List<Favorite> findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId, Pageable page);
List<Favorite> findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(String appId, Pageable page);
Favorite findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId);
Favorite findByUserIdAndAppId(String userId, String appId);
@Modifying
@Query("UPDATE Favorite SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface FavoriteRepository extends PagingAndSortingRepository<Favorite, Long> {
List<Favorite> findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId, Pageable page);
List<Favorite> findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(String appId, Pageable page);
Favorite findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId);
Favorite findByUserIdAndAppId(String userId, String appId);
@Modifying
@Query("UPDATE Favorite SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./scripts/helm/apollo-portal/.helmignore | # Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
| # Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/views/component/rollback-modal.html | <form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form>
| <form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form>
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/MergeEmailBuilder.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import org.springframework.stereotype.Component;
@Component
public class MergeEmailBuilder extends ConfigPublishEmailBuilder {
private static final String EMAIL_SUBJECT = "[Apollo] 全量发布";
@Override
protected String subject() {
return EMAIL_SUBJECT;
}
@Override
protected String emailContent(Env env, ReleaseHistoryBO releaseHistory) {
return renderEmailCommonContent(env, releaseHistory);
}
@Override
protected String getTemplateFramework() {
return portalConfig.emailTemplateFramework();
}
@Override
protected String getDiffModuleTemplate() {
return portalConfig.emailReleaseDiffModuleTemplate();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import org.springframework.stereotype.Component;
@Component
public class MergeEmailBuilder extends ConfigPublishEmailBuilder {
private static final String EMAIL_SUBJECT = "[Apollo] 全量发布";
@Override
protected String subject() {
return EMAIL_SUBJECT;
}
@Override
protected String emailContent(Env env, ReleaseHistoryBO releaseHistory) {
return renderEmailCommonContent(env, releaseHistory);
}
@Override
protected String getTemplateFramework() {
return portalConfig.emailTemplateFramework();
}
@Override
protected String getDiffModuleTemplate() {
return portalConfig.emailReleaseDiffModuleTemplate();
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/ApolloCommonConfig.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloCommonConfig.class)
public class ApolloCommonConfig {
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloCommonConfig.class)
public class ApolloCommonConfig {
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/vendor/clipboard.min.js | /*!
* clipboard.js v1.5.12
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.Clipboard=t()}}(function(){var t,e,n;return function t(e,n,o){function i(a,c){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!c&&s)return s(a,!0);if(r)return r(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(t,e,n){var o=t("matches-selector");e.exports=function(t,e,n){for(var i=n?t:t.parentNode;i&&i!==document;){if(o(i,e))return i;i=i.parentNode}}},{"matches-selector":5}],2:[function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function i(t,e,n,o){return function(n){n.delegateTarget=r(n.target,e,!0),n.delegateTarget&&o.call(t,n)}}var r=t("closest");e.exports=o},{closest:1}],3:[function(t,e,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){var e=Object.prototype.toString.call(t);return"[object Function]"===e}},{}],4:[function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return i(t,e,n);if(c.nodeList(t))return r(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function r(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return s(document.body,t,e,n)}var c=t("./is"),s=t("delegate");e.exports=o},{"./is":3,delegate:2}],5:[function(t,e,n){function o(t,e){if(r)return r.call(t,e);for(var n=t.parentNode.querySelectorAll(e),o=0;o<n.length;++o)if(n[o]==t)return!0;return!1}var i=Element.prototype,r=i.matchesSelector||i.webkitMatchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector;e.exports=o},{}],6:[function(t,e,n){function o(t){var e;if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName)t.focus(),t.setSelectionRange(0,t.value.length),e=t.value;else{t.hasAttribute("contenteditable")&&t.focus();var n=window.getSelection(),o=document.createRange();o.selectNodeContents(t),n.removeAllRanges(),n.addRange(o),e=n.toString()}return e}e.exports=o},{}],7:[function(t,e,n){function o(){}o.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){i.off(t,o),e.apply(n,arguments)}var i=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,i=n.length;for(o;i>o;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],i=[];if(o&&e)for(var r=0,a=o.length;a>r;r++)o[r].fn!==e&&o[r].fn._!==e&&i.push(o[r]);return i.length?n[t]=i:delete n[t],this}},e.exports=o},{}],8:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","select"],r);else if("undefined"!=typeof o)r(n,e("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(t,e){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var i=n(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),c=function(){function t(e){o(this,t),this.resolveOptions(e),this.initSelection()}return t.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action=e.action,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""},t.prototype.initSelection=function t(){this.text?this.selectFake():this.target&&this.selectTarget()},t.prototype.selectFake=function t(){var e=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px",this.fakeElem.style.top=(window.pageYOffset||document.documentElement.scrollTop)+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()},t.prototype.removeFake=function t(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)},t.prototype.selectTarget=function t(){this.selectedText=(0,i.default)(this.target),this.copyText()},t.prototype.copyText=function t(){var e=void 0;try{e=document.execCommand(this.action)}catch(n){e=!1}this.handleResult(e)},t.prototype.handleResult=function t(e){e?this.emitter.emit("success",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)}):this.emitter.emit("error",{action:this.action,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})},t.prototype.clearSelection=function t(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()},t.prototype.destroy=function t(){this.removeFake()},a(t,[{key:"action",set:function t(){var e=arguments.length<=0||void 0===arguments[0]?"copy":arguments[0];if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function t(){return this._action}},{key:"target",set:function t(e){if(void 0!==e){if(!e||"object"!==("undefined"==typeof e?"undefined":r(e))||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=e}},get:function t(){return this._target}}]),t}();t.exports=c})},{select:6}],9:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,e("./clipboard-action"),e("tiny-emitter"),e("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(t,e,n,o){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=i(e),u=i(n),f=i(o),d=function(t){function e(n,o){r(this,e);var i=a(this,t.call(this));return i.resolveOptions(o),i.listenClick(n),i}return c(e,t),e.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText},e.prototype.listenClick=function t(e){var n=this;this.listener=(0,f.default)(e,"click",function(t){return n.onClick(t)})},e.prototype.onClick=function t(e){var n=e.delegateTarget||e.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})},e.prototype.defaultAction=function t(e){return s("action",e)},e.prototype.defaultTarget=function t(e){var n=s("target",e);return n?document.querySelector(n):void 0},e.prototype.defaultText=function t(e){return s("text",e)},e.prototype.destroy=function t(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)},e}(u.default);t.exports=d})},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)}); | /*!
* clipboard.js v1.5.12
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.Clipboard=t()}}(function(){var t,e,n;return function t(e,n,o){function i(a,c){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!c&&s)return s(a,!0);if(r)return r(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(t,e,n){var o=t("matches-selector");e.exports=function(t,e,n){for(var i=n?t:t.parentNode;i&&i!==document;){if(o(i,e))return i;i=i.parentNode}}},{"matches-selector":5}],2:[function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function i(t,e,n,o){return function(n){n.delegateTarget=r(n.target,e,!0),n.delegateTarget&&o.call(t,n)}}var r=t("closest");e.exports=o},{closest:1}],3:[function(t,e,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){var e=Object.prototype.toString.call(t);return"[object Function]"===e}},{}],4:[function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return i(t,e,n);if(c.nodeList(t))return r(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function r(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return s(document.body,t,e,n)}var c=t("./is"),s=t("delegate");e.exports=o},{"./is":3,delegate:2}],5:[function(t,e,n){function o(t,e){if(r)return r.call(t,e);for(var n=t.parentNode.querySelectorAll(e),o=0;o<n.length;++o)if(n[o]==t)return!0;return!1}var i=Element.prototype,r=i.matchesSelector||i.webkitMatchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector;e.exports=o},{}],6:[function(t,e,n){function o(t){var e;if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName)t.focus(),t.setSelectionRange(0,t.value.length),e=t.value;else{t.hasAttribute("contenteditable")&&t.focus();var n=window.getSelection(),o=document.createRange();o.selectNodeContents(t),n.removeAllRanges(),n.addRange(o),e=n.toString()}return e}e.exports=o},{}],7:[function(t,e,n){function o(){}o.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){i.off(t,o),e.apply(n,arguments)}var i=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,i=n.length;for(o;i>o;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],i=[];if(o&&e)for(var r=0,a=o.length;a>r;r++)o[r].fn!==e&&o[r].fn._!==e&&i.push(o[r]);return i.length?n[t]=i:delete n[t],this}},e.exports=o},{}],8:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","select"],r);else if("undefined"!=typeof o)r(n,e("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(t,e){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var i=n(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),c=function(){function t(e){o(this,t),this.resolveOptions(e),this.initSelection()}return t.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action=e.action,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""},t.prototype.initSelection=function t(){this.text?this.selectFake():this.target&&this.selectTarget()},t.prototype.selectFake=function t(){var e=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px",this.fakeElem.style.top=(window.pageYOffset||document.documentElement.scrollTop)+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()},t.prototype.removeFake=function t(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)},t.prototype.selectTarget=function t(){this.selectedText=(0,i.default)(this.target),this.copyText()},t.prototype.copyText=function t(){var e=void 0;try{e=document.execCommand(this.action)}catch(n){e=!1}this.handleResult(e)},t.prototype.handleResult=function t(e){e?this.emitter.emit("success",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)}):this.emitter.emit("error",{action:this.action,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})},t.prototype.clearSelection=function t(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()},t.prototype.destroy=function t(){this.removeFake()},a(t,[{key:"action",set:function t(){var e=arguments.length<=0||void 0===arguments[0]?"copy":arguments[0];if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function t(){return this._action}},{key:"target",set:function t(e){if(void 0!==e){if(!e||"object"!==("undefined"==typeof e?"undefined":r(e))||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=e}},get:function t(){return this._target}}]),t}();t.exports=c})},{select:6}],9:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,e("./clipboard-action"),e("tiny-emitter"),e("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(t,e,n,o){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=i(e),u=i(n),f=i(o),d=function(t){function e(n,o){r(this,e);var i=a(this,t.call(this));return i.resolveOptions(o),i.listenClick(n),i}return c(e,t),e.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText},e.prototype.listenClick=function t(e){var n=this;this.listener=(0,f.default)(e,"click",function(t){return n.onClick(t)})},e.prototype.onClick=function t(e){var n=e.delegateTarget||e.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})},e.prototype.defaultAction=function t(e){return s("action",e)},e.prototype.defaultTarget=function t(e){var n=s("target",e);return n?document.querySelector(n):void 0},e.prototype.defaultText=function t(e){return s("text",e)},e.prototype.destroy=function t(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)},e}(u.default);t.exports=d})},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)}); | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ServletInitializer.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* Entry point for traditional web app
*
* @author Jason Song(song_s@ctrip.com)
*/
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(ConfigServiceApplication.class);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* Entry point for traditional web app
*
* @author Jason Song(song_s@ctrip.com)
*/
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(ConfigServiceApplication.class);
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
/**
* To process xml config placeholders, e.g.
*
* <pre>
* <bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
* <property name="timeout" value="${timeout:200}"/>
* <property name="batch" value="${batch:100}"/>
* </bean>
* </pre>
*/
public class SpringValueDefinitionProcessor implements BeanDefinitionRegistryPostProcessor {
private static final Map<BeanDefinitionRegistry, Multimap<String, SpringValueDefinition>> beanName2SpringValueDefinitions =
Maps.newConcurrentMap();
private static final Set<BeanDefinitionRegistry> PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES = Sets.newConcurrentHashSet();
private final ConfigUtil configUtil;
private final PlaceholderHelper placeholderHelper;
public SpringValueDefinitionProcessor() {
configUtil = ApolloInjector.getInstance(ConfigUtil.class);
placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
}
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled()) {
processPropertyValues(registry);
}
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
}
public static Multimap<String, SpringValueDefinition> getBeanName2SpringValueDefinitions(BeanDefinitionRegistry registry) {
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(registry);
if (springValueDefinitions == null) {
springValueDefinitions = LinkedListMultimap.create();
}
return springValueDefinitions;
}
private void processPropertyValues(BeanDefinitionRegistry beanRegistry) {
if (!PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES.add(beanRegistry)) {
// already initialized
return;
}
if (!beanName2SpringValueDefinitions.containsKey(beanRegistry)) {
beanName2SpringValueDefinitions.put(beanRegistry, LinkedListMultimap.<String, SpringValueDefinition>create());
}
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(beanRegistry);
String[] beanNames = beanRegistry.getBeanDefinitionNames();
for (String beanName : beanNames) {
BeanDefinition beanDefinition = beanRegistry.getBeanDefinition(beanName);
MutablePropertyValues mutablePropertyValues = beanDefinition.getPropertyValues();
List<PropertyValue> propertyValues = mutablePropertyValues.getPropertyValueList();
for (PropertyValue propertyValue : propertyValues) {
Object value = propertyValue.getValue();
if (!(value instanceof TypedStringValue)) {
continue;
}
String placeholder = ((TypedStringValue) value).getValue();
Set<String> keys = placeholderHelper.extractPlaceholderKeys(placeholder);
if (keys.isEmpty()) {
continue;
}
for (String key : keys) {
springValueDefinitions.put(beanName, new SpringValueDefinition(key, placeholder, propertyValue.getName()));
}
}
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
/**
* To process xml config placeholders, e.g.
*
* <pre>
* <bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
* <property name="timeout" value="${timeout:200}"/>
* <property name="batch" value="${batch:100}"/>
* </bean>
* </pre>
*/
public class SpringValueDefinitionProcessor implements BeanDefinitionRegistryPostProcessor {
private static final Map<BeanDefinitionRegistry, Multimap<String, SpringValueDefinition>> beanName2SpringValueDefinitions =
Maps.newConcurrentMap();
private static final Set<BeanDefinitionRegistry> PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES = Sets.newConcurrentHashSet();
private final ConfigUtil configUtil;
private final PlaceholderHelper placeholderHelper;
public SpringValueDefinitionProcessor() {
configUtil = ApolloInjector.getInstance(ConfigUtil.class);
placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
}
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
if (configUtil.isAutoUpdateInjectedSpringPropertiesEnabled()) {
processPropertyValues(registry);
}
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
}
public static Multimap<String, SpringValueDefinition> getBeanName2SpringValueDefinitions(BeanDefinitionRegistry registry) {
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(registry);
if (springValueDefinitions == null) {
springValueDefinitions = LinkedListMultimap.create();
}
return springValueDefinitions;
}
private void processPropertyValues(BeanDefinitionRegistry beanRegistry) {
if (!PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES.add(beanRegistry)) {
// already initialized
return;
}
if (!beanName2SpringValueDefinitions.containsKey(beanRegistry)) {
beanName2SpringValueDefinitions.put(beanRegistry, LinkedListMultimap.<String, SpringValueDefinition>create());
}
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(beanRegistry);
String[] beanNames = beanRegistry.getBeanDefinitionNames();
for (String beanName : beanNames) {
BeanDefinition beanDefinition = beanRegistry.getBeanDefinition(beanName);
MutablePropertyValues mutablePropertyValues = beanDefinition.getPropertyValues();
List<PropertyValue> propertyValues = mutablePropertyValues.getPropertyValueList();
for (PropertyValue propertyValue : propertyValues) {
Object value = propertyValue.getValue();
if (!(value instanceof TypedStringValue)) {
continue;
}
String placeholder = ((TypedStringValue) value).getValue();
Set<String> keys = placeholderHelper.extractPlaceholderKeys(placeholder);
if (keys.isEmpty()) {
continue;
}
for (String key : keys) {
springValueDefinitions.put(beanName, new SpringValueDefinition(key, placeholder, propertyValue.getName()));
}
}
}
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-adminservice/src/test/resources/application.properties | #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
spring.cloud.consul.enabled=false | #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
spring.cloud.consul.enabled=false | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/bean/XmlBean.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class XmlBean {
private static final Logger logger = LoggerFactory.getLogger(XmlBean.class);
private int timeout;
private int batch;
public void setTimeout(int timeout) {
logger.info("updating timeout, old value: {}, new value: {}", this.timeout, timeout);
this.timeout = timeout;
}
public void setBatch(int batch) {
logger.info("updating batch, old value: {}, new value: {}", this.batch, batch);
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
@Override
public String toString() {
return String.format("[XmlBean] timeout: %d, batch: %d", timeout, batch);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class XmlBean {
private static final Logger logger = LoggerFactory.getLogger(XmlBean.class);
private int timeout;
private int batch;
public void setTimeout(int timeout) {
logger.info("updating timeout, old value: {}, new value: {}", this.timeout, timeout);
this.timeout = timeout;
}
public void setBatch(int batch) {
logger.info("updating batch, old value: {}, new value: {}", this.batch, batch);
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
@Override
public String toString() {
return String.format("[XmlBean] timeout: %d, batch: %d", timeout, batch);
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/vendor/jquery-plugin/textareafullscreen.css | .tx-editor-wrapper {
position: relative;
}
.tx-editor-wrapper .tx-editor.expanded {
position: fixed;
top: 0;
left: 0;
width: 80%;
height: 80%;
z-index: 500;
}
.tx-editor-wrapper .tx-editor {
height: 140px;
}
.tx-editor-wrapper .tx-editor .tx-icon {
position: absolute;
right: 5px;
top: 5px;
width: 18px;
height: 16px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABV0RVh0Q3JlYXRpb24gVGltZQA4LzE2LzEzspl6ugAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAB7SURBVDiN7ZOxCsAgDESvxXyhi5P/Fif/0i6NGJH2KIUufVOUJB45s6lqw0DOGQylFHfeqSqCYEGMESJCF6aUAAC1Vt9IRPolixtDG1DVxjLnhtVL8yAvlZy8Nuy/0T1L19g1cY3Mavupd9bPWL5T9ERJV2SBrcfn238A3whjoYEPESwAAAAASUVORK5CYII=');
cursor: pointer;
z-index: 3;
}
.tx-editor-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(255, 255, 255, 0.7);
z-index: 2;
opacity: 0;
}
| .tx-editor-wrapper {
position: relative;
}
.tx-editor-wrapper .tx-editor.expanded {
position: fixed;
top: 0;
left: 0;
width: 80%;
height: 80%;
z-index: 500;
}
.tx-editor-wrapper .tx-editor {
height: 140px;
}
.tx-editor-wrapper .tx-editor .tx-icon {
position: absolute;
right: 5px;
top: 5px;
width: 18px;
height: 16px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABV0RVh0Q3JlYXRpb24gVGltZQA4LzE2LzEzspl6ugAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAB7SURBVDiN7ZOxCsAgDESvxXyhi5P/Fif/0i6NGJH2KIUufVOUJB45s6lqw0DOGQylFHfeqSqCYEGMESJCF6aUAAC1Vt9IRPolixtDG1DVxjLnhtVL8yAvlZy8Nuy/0T1L19g1cY3Mavupd9bPWL5T9ERJV2SBrcfn238A3whjoYEPESwAAAAASUVORK5CYII=');
cursor: pointer;
z-index: 3;
}
.tx-editor-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(255, 255, 255, 0.7);
z-index: 2;
opacity: 0;
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./scripts/docker-quick-start/sql/apolloportaldb.sql | --
-- Copyright 2021 Apollo Authors
--
-- 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.
--
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
# Create Database
# ------------------------------------------------------------
CREATE DATABASE IF NOT EXISTS ApolloPortalDB DEFAULT CHARACTER SET = utf8mb4;
Use ApolloPortalDB;
# Dump of table app
# ------------------------------------------------------------
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
# Dump of table appnamespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId` (`AppId`),
KEY `Name_AppId` (`Name`,`AppId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
# Dump of table consumer
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Consumer`;
CREATE TABLE `Consumer` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='开放API消费者';
# Dump of table consumeraudit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerAudit`;
CREATE TABLE `ConsumerAudit` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
`Uri` varchar(1024) NOT NULL DEFAULT '' COMMENT '访问的Uri',
`Method` varchar(16) NOT NULL DEFAULT '' COMMENT '访问的Method',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_ConsumerId` (`ConsumerId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer审计表';
# Dump of table consumerrole
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerRole`;
CREATE TABLE `ConsumerRole` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_ConsumerId_RoleId` (`ConsumerId`,`RoleId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer和role的绑定表';
# Dump of table consumertoken
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerToken`;
CREATE TABLE `ConsumerToken` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'ConsumerId',
`Token` varchar(128) NOT NULL DEFAULT '' COMMENT 'token',
`Expires` datetime NOT NULL DEFAULT '2099-01-01 00:00:00' COMMENT 'token失效时间',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_Token` (`Token`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer token表';
# Dump of table favorite
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Favorite`;
CREATE TABLE `Favorite` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`UserId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Position` int(32) NOT NULL DEFAULT '10000' COMMENT '收藏顺序',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `IX_UserId` (`UserId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COMMENT='应用收藏表';
# Dump of table permission
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Permission`;
CREATE TABLE `Permission` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`PermissionType` varchar(32) NOT NULL DEFAULT '' COMMENT '权限类型',
`TargetId` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_TargetId_PermissionType` (`TargetId`(191),`PermissionType`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='permission表';
# Dump of table role
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Role`;
CREATE TABLE `Role` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`RoleName` varchar(256) NOT NULL DEFAULT '' COMMENT 'Role name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_RoleName` (`RoleName`(191)),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色表';
# Dump of table rolepermission
# ------------------------------------------------------------
DROP TABLE IF EXISTS `RolePermission`;
CREATE TABLE `RolePermission` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`PermissionId` int(10) unsigned DEFAULT NULL COMMENT 'Permission Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_PermissionId` (`PermissionId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和权限的绑定表';
# Dump of table serverconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
# Dump of table userrole
# ------------------------------------------------------------
DROP TABLE IF EXISTS `UserRole`;
CREATE TABLE `UserRole` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`UserId` varchar(128) DEFAULT '' COMMENT '用户身份标识',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_UserId_RoleId` (`UserId`,`RoleId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和role的绑定表';
# Dump of table Users
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Users`;
CREATE TABLE `Users` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Username` varchar(64) NOT NULL DEFAULT 'default' COMMENT '用户登录账户',
`Password` varchar(512) NOT NULL DEFAULT 'default' COMMENT '密码',
`UserDisplayName` varchar(512) NOT NULL DEFAULT 'default' COMMENT '用户名称',
`Email` varchar(64) NOT NULL DEFAULT 'default' COMMENT '邮箱地址',
`Enabled` tinyint(4) DEFAULT NULL COMMENT '是否有效',
PRIMARY KEY (`Id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表';
# Dump of table Authorities
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Authorities`;
CREATE TABLE `Authorities` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Username` varchar(64) NOT NULL,
`Authority` varchar(50) NOT NULL,
PRIMARY KEY (`Id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
# Config
# ------------------------------------------------------------
INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
VALUES
('apollo.portal.envs', 'dev', '可支持的环境列表'),
('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
('superAdmin', 'apollo', 'Portal超级管理员'),
('api.readTimeout', '10000', 'http接口read timeout'),
('consumer.token.salt', 'someSalt', 'consumer token salt'),
('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
('configView.memberOnly.envs', 'dev', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔'),
('apollo.portal.meta.servers', '{}', '各环境Meta Service列表');
INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
VALUES
('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
# Sample Data
# ------------------------------------------------------------
INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
VALUES
('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
VALUES
('application', 'SampleApp', 'properties', 0, 'default app namespace');
INSERT INTO `Permission` (`Id`, `PermissionType`, `TargetId`)
VALUES
(1, 'CreateCluster', 'SampleApp'),
(2, 'CreateNamespace', 'SampleApp'),
(3, 'AssignRole', 'SampleApp'),
(4, 'ModifyNamespace', 'SampleApp+application'),
(5, 'ReleaseNamespace', 'SampleApp+application');
INSERT INTO `Role` (`Id`, `RoleName`)
VALUES
(1, 'Master+SampleApp'),
(2, 'ModifyNamespace+SampleApp+application'),
(3, 'ReleaseNamespace+SampleApp+application');
INSERT INTO `RolePermission` (`RoleId`, `PermissionId`)
VALUES
(1, 1),
(1, 2),
(1, 3),
(2, 4),
(3, 5);
INSERT INTO `UserRole` (`UserId`, `RoleId`)
VALUES
('apollo', 1),
('apollo', 2),
('apollo', 3);
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
| --
-- Copyright 2021 Apollo Authors
--
-- 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.
--
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
# Create Database
# ------------------------------------------------------------
CREATE DATABASE IF NOT EXISTS ApolloPortalDB DEFAULT CHARACTER SET = utf8mb4;
Use ApolloPortalDB;
# Dump of table app
# ------------------------------------------------------------
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
# Dump of table appnamespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId` (`AppId`),
KEY `Name_AppId` (`Name`,`AppId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
# Dump of table consumer
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Consumer`;
CREATE TABLE `Consumer` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='开放API消费者';
# Dump of table consumeraudit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerAudit`;
CREATE TABLE `ConsumerAudit` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
`Uri` varchar(1024) NOT NULL DEFAULT '' COMMENT '访问的Uri',
`Method` varchar(16) NOT NULL DEFAULT '' COMMENT '访问的Method',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_ConsumerId` (`ConsumerId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer审计表';
# Dump of table consumerrole
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerRole`;
CREATE TABLE `ConsumerRole` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_ConsumerId_RoleId` (`ConsumerId`,`RoleId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer和role的绑定表';
# Dump of table consumertoken
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ConsumerToken`;
CREATE TABLE `ConsumerToken` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'ConsumerId',
`Token` varchar(128) NOT NULL DEFAULT '' COMMENT 'token',
`Expires` datetime NOT NULL DEFAULT '2099-01-01 00:00:00' COMMENT 'token失效时间',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_Token` (`Token`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer token表';
# Dump of table favorite
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Favorite`;
CREATE TABLE `Favorite` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`UserId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Position` int(32) NOT NULL DEFAULT '10000' COMMENT '收藏顺序',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `IX_UserId` (`UserId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COMMENT='应用收藏表';
# Dump of table permission
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Permission`;
CREATE TABLE `Permission` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`PermissionType` varchar(32) NOT NULL DEFAULT '' COMMENT '权限类型',
`TargetId` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_TargetId_PermissionType` (`TargetId`(191),`PermissionType`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='permission表';
# Dump of table role
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Role`;
CREATE TABLE `Role` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`RoleName` varchar(256) NOT NULL DEFAULT '' COMMENT 'Role name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_RoleName` (`RoleName`(191)),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色表';
# Dump of table rolepermission
# ------------------------------------------------------------
DROP TABLE IF EXISTS `RolePermission`;
CREATE TABLE `RolePermission` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`PermissionId` int(10) unsigned DEFAULT NULL COMMENT 'Permission Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_PermissionId` (`PermissionId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和权限的绑定表';
# Dump of table serverconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
# Dump of table userrole
# ------------------------------------------------------------
DROP TABLE IF EXISTS `UserRole`;
CREATE TABLE `UserRole` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`UserId` varchar(128) DEFAULT '' COMMENT '用户身份标识',
`RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_RoleId` (`RoleId`),
KEY `IX_UserId_RoleId` (`UserId`,`RoleId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和role的绑定表';
# Dump of table Users
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Users`;
CREATE TABLE `Users` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Username` varchar(64) NOT NULL DEFAULT 'default' COMMENT '用户登录账户',
`Password` varchar(512) NOT NULL DEFAULT 'default' COMMENT '密码',
`UserDisplayName` varchar(512) NOT NULL DEFAULT 'default' COMMENT '用户名称',
`Email` varchar(64) NOT NULL DEFAULT 'default' COMMENT '邮箱地址',
`Enabled` tinyint(4) DEFAULT NULL COMMENT '是否有效',
PRIMARY KEY (`Id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表';
# Dump of table Authorities
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Authorities`;
CREATE TABLE `Authorities` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Username` varchar(64) NOT NULL,
`Authority` varchar(50) NOT NULL,
PRIMARY KEY (`Id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
# Config
# ------------------------------------------------------------
INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
VALUES
('apollo.portal.envs', 'dev', '可支持的环境列表'),
('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
('superAdmin', 'apollo', 'Portal超级管理员'),
('api.readTimeout', '10000', 'http接口read timeout'),
('consumer.token.salt', 'someSalt', 'consumer token salt'),
('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
('configView.memberOnly.envs', 'dev', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔'),
('apollo.portal.meta.servers', '{}', '各环境Meta Service列表');
INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
VALUES
('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
# Sample Data
# ------------------------------------------------------------
INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
VALUES
('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
VALUES
('application', 'SampleApp', 'properties', 0, 'default app namespace');
INSERT INTO `Permission` (`Id`, `PermissionType`, `TargetId`)
VALUES
(1, 'CreateCluster', 'SampleApp'),
(2, 'CreateNamespace', 'SampleApp'),
(3, 'AssignRole', 'SampleApp'),
(4, 'ModifyNamespace', 'SampleApp+application'),
(5, 'ReleaseNamespace', 'SampleApp+application');
INSERT INTO `Role` (`Id`, `RoleName`)
VALUES
(1, 'Master+SampleApp'),
(2, 'ModifyNamespace+SampleApp+application'),
(3, 'ReleaseNamespace+SampleApp+application');
INSERT INTO `RolePermission` (`RoleId`, `PermissionId`)
VALUES
(1, 1),
(1, 2),
(1, 3),
(2, 4),
(3, 5);
INSERT INTO `UserRole` (`UserId`, `RoleId`)
VALUES
('apollo', 1),
('apollo', 2),
('apollo', 3);
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/environment/DefaultPortalMetaServerProviderTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.environment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class DefaultPortalMetaServerProviderTest extends AbstractUnitTest {
private DefaultPortalMetaServerProvider defaultPortalMetaServerProvider;
@Before
public void setUp() throws Exception {
defaultPortalMetaServerProvider = new DefaultPortalMetaServerProvider();
}
@After
public void tearDown() throws Exception {
System.clearProperty("dev_meta");
System.clearProperty("fat_meta");
}
@Test
public void testFromPropertyFile() {
assertEquals("http://localhost:8080", defaultPortalMetaServerProvider.getMetaServerAddress(Env.LOCAL));
assertEquals("${dev_meta}", defaultPortalMetaServerProvider.getMetaServerAddress(Env.DEV));
assertEquals("${pro_meta}", defaultPortalMetaServerProvider.getMetaServerAddress(Env.PRO));
}
/**
* testing the environment dynamic added from system property
*/
@Test
public void testDynamicEnvironmentFromSystemProperty() {
String someDevMetaAddress = "someMetaAddress";
String someFatMetaAddress = "someFatMetaAddress";
System.setProperty("dev_meta", someDevMetaAddress);
System.setProperty("fat_meta", someFatMetaAddress);
// reload above added
defaultPortalMetaServerProvider.reload();
assertEquals(someDevMetaAddress, defaultPortalMetaServerProvider.getMetaServerAddress(Env.DEV));
assertEquals(someFatMetaAddress, defaultPortalMetaServerProvider.getMetaServerAddress(Env.FAT));
String randomAddress = "randomAddress";
String randomEnvironment = "randomEnvironment";
System.setProperty(randomEnvironment + "_meta", randomAddress);
assertFalse(defaultPortalMetaServerProvider.exists(Env.addEnvironment(randomEnvironment)));
// reload above added
defaultPortalMetaServerProvider.reload();
assertEquals(randomAddress,
defaultPortalMetaServerProvider.getMetaServerAddress(Env.valueOf(randomEnvironment)));
assertTrue(defaultPortalMetaServerProvider.exists(Env.addEnvironment(randomEnvironment)));
// clear the property
System.clearProperty(randomEnvironment + "_meta");
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.environment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class DefaultPortalMetaServerProviderTest extends AbstractUnitTest {
private DefaultPortalMetaServerProvider defaultPortalMetaServerProvider;
@Before
public void setUp() throws Exception {
defaultPortalMetaServerProvider = new DefaultPortalMetaServerProvider();
}
@After
public void tearDown() throws Exception {
System.clearProperty("dev_meta");
System.clearProperty("fat_meta");
}
@Test
public void testFromPropertyFile() {
assertEquals("http://localhost:8080", defaultPortalMetaServerProvider.getMetaServerAddress(Env.LOCAL));
assertEquals("${dev_meta}", defaultPortalMetaServerProvider.getMetaServerAddress(Env.DEV));
assertEquals("${pro_meta}", defaultPortalMetaServerProvider.getMetaServerAddress(Env.PRO));
}
/**
* testing the environment dynamic added from system property
*/
@Test
public void testDynamicEnvironmentFromSystemProperty() {
String someDevMetaAddress = "someMetaAddress";
String someFatMetaAddress = "someFatMetaAddress";
System.setProperty("dev_meta", someDevMetaAddress);
System.setProperty("fat_meta", someFatMetaAddress);
// reload above added
defaultPortalMetaServerProvider.reload();
assertEquals(someDevMetaAddress, defaultPortalMetaServerProvider.getMetaServerAddress(Env.DEV));
assertEquals(someFatMetaAddress, defaultPortalMetaServerProvider.getMetaServerAddress(Env.FAT));
String randomAddress = "randomAddress";
String randomEnvironment = "randomEnvironment";
System.setProperty(randomEnvironment + "_meta", randomAddress);
assertFalse(defaultPortalMetaServerProvider.exists(Env.addEnvironment(randomEnvironment)));
// reload above added
defaultPortalMetaServerProvider.reload();
assertEquals(randomAddress,
defaultPortalMetaServerProvider.getMetaServerAddress(Env.valueOf(randomEnvironment)));
assertTrue(defaultPortalMetaServerProvider.exists(Env.addEnvironment(randomEnvironment)));
// clear the property
System.clearProperty(randomEnvironment + "_meta");
}
} | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/service/ConsumerRolePermissionServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConsumerRolePermissionServiceTest extends AbstractIntegrationTest {
@Autowired
private ConsumerRolePermissionService consumerRolePermissionService;
@Before
public void setUp() throws Exception {
}
@Test
@Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-consumerroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConsumerHasPermission() throws Exception {
String someTargetId = "someTargetId";
String anotherTargetId = "anotherTargetId";
String somePermissionType = "somePermissionType";
String anotherPermissionType = "anotherPermissionType";
long someConsumerId = 1;
long anotherConsumerId = 2;
long someConsumerWithNoPermission = 3;
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, anotherPermissionType, anotherTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, anotherPermissionType, anotherTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, somePermissionType, someTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, anotherPermissionType, anotherTargetId));
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConsumerRolePermissionServiceTest extends AbstractIntegrationTest {
@Autowired
private ConsumerRolePermissionService consumerRolePermissionService;
@Before
public void setUp() throws Exception {
}
@Test
@Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-consumerroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConsumerHasPermission() throws Exception {
String someTargetId = "someTargetId";
String anotherTargetId = "anotherTargetId";
String somePermissionType = "somePermissionType";
String anotherPermissionType = "anotherPermissionType";
long someConsumerId = 1;
long anotherConsumerId = 2;
long someConsumerWithNoPermission = 3;
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, anotherPermissionType, anotherTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, anotherPermissionType, anotherTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, somePermissionType, someTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, anotherPermissionType, anotherTargetId));
}
} | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot | N AM LP ', ( G L Y P H I C O N S H a l f l i n g s R e g u l a r x V e r s i o n 1 . 0 0 9 ; P S 0 0 1 . 0 0 9 ; h o t c o n v 1 . 0 . 7 0 ; m a k e o t f . l i b 2 . 5 . 5 8 3 2 9 8 G L Y P H I C O N S H a l f l i n g s R e g u l a r BSGP M M F٣(uʌ<0DB/X
N CC^ rmR2skPJ"5+glW*iW/E4#ԣU~fUDĹJ1/!/s7k(h N8od$yq19@-HGS"Fjؠ6C3& W51BaQaRU/{* =@dh$ 1Tۗnc+cA Zɀ@Qcal2>Km' CHMĬfBX,Ype
U *Ҕz
miO1nE.
hx!aC
XTV R %|IHP5"bN=r/_R_ %҄uzҘ52ġP)F7SqF{nia@Ds; }9⬥?ź R{Tk;ǜU\NZQ-^s7f 0S3A
_n`W 7Ppi!g/_pZ-=ץ~WZ#/4 KF ` z0| Dѵ &däIÏ;M{'omm I !w i9|H:ۧ{~qO, L]&J09/9&Y 蓰{;'3` e @vHyDZ$ 3Dx28 W Cx5xwB`$C$'El yh Ԁ
DJ
$(pQAA܉A@'$
hp 0V0 `se$4$"t2=f4A{Tk0|rH`L&sh]A<`R'!1N;_t3# V *veF`E O${)W=p:F`22ړC^.ćG<<?~z>.p Ne2ִ+Ysl:˼ ܫu5tu^86 ȄTmyQ%u~%~1rҘawߚ^_ZZa0!N`.
uqYB\ᨀ[e:@J'Eہ,3 ubj@pfeW9( ޅ=lG 7gj SM609OˑlBa݁ <Bՙ(VRApf^+g9qMt ] تpEr@]@ VkV
ud^X R@?E Y2 ]#Ǽ4JK'dPC|mmn#$+48u'e&[n[L %{BCDL:^!bƙ:&g3-3ub
iLZڂWFSId6.k5Pl77UzT:NN.")['|U"A Ivwptdk9嫫9 nDmq7I|6Kbc]MBABȪ _JT q 6@Fhd`GT:M 7'L,IhFP ~j $¡ 3hA -S^چ-%qe~Qqln"i&Qe?FlK"As(3 Y;"Let 'Rz<MW!S3$rZ:b-^ DŽ/$QqJB'WdGAO`.( o 3B0ɑ1p((*o^ǪkJ`v[C|9=#AQ# 7;.]L:ϸcdiEsr6?} e@H- bƖC1;.
v. ɾ$`T JW%BZI04^:kU,C^WVF` Fb (OO 2<@Xu g~ɑW t&1\1L:φ"!P 3/^ǰqw`IAD
)qCfO 02Y293Nfp\ Cah&6p`ځzgB
hRf ]; ]#pw_t(p q꿏ٷ,bdkRBT?22cFy2%Cn909E&#lT__Sлg)eh/ڷ+#:F Gotk5Gbr;Cb˴:#ɜ & QCwmxlNq P)͐3f-v5Kh0AכjnSp ^HGFf H "%[ѻ @ p aα $$͂*_\@>M1 0{=) K%$C
9M4c EotjVGD)l8,\w ! %$3t TBzҴ iUJ[xgd Br$!eq"J> )\~3(^
R8#>bHG'7_ fӫcκtD oAA߃(qB<` `VΫ֘*buP4v@+.Qԥ$V@C0
R ܐP[ z:XH#e s>?EWO>@I$|si
ES)0A?9ab,@K̩o&Q% ϞLu+
+H|Ɛ?NK4CnPt
'OT.j5Ĵ8vw֜I&+`yScaO[#gQd[KI矗`ČLP # )27aTi@c\ސ 0nCpߖ運4͵x*RzYbT[\ kUvHʈqpIIŗ) bB
XPNtz 2
I== ;}bqjiކa#" >11Ap1PO OuxQ
Fϲ(h݄O'MDxLK$ȵh&
14SirHJPt DM;rM+
*ؗ5u2$f3K <PLrcI)^ da>
%ѳb (@,2f,~"7R;E ;HX( 42Z ' Tۿ2J+^!#oY~4-׃GW *!A0&8f{`W=DP8'= R g}iP>#4EBRY^4eN8V,[BĨD#X],LBsNC>
+o^x
jC.4Ya_{eA2=r+ 9POA!!
}YPJeGn%x1/}RgHa ^3- 5
|qSaWK{ 1al`I1 Qf_yyCZ)L3X] W6@DMT<.uGK8DsбWr\7Z\V"ISd>CUjeD 3MtWcPӉ6#3QnቩJ\7#磱`K lV6 & T ~l. <BP
*!zRZeљٷT#CLHW)DpYU#51{WJ4^f̼Zy6ӑT2d4H=B Ҋ}&݃,aPçv+:2~*0dɓփd !"A+r Hn sAڗU
bHN6$.l};@iK \҂:v QE : ,|Q Y0|%@ ܁qcdqh諹vCGV-(m1q89KFä
"2}Rrz,j^q\ݖ#p+`f l :k t5EOaIJP
@psEj14;6/aH.ӰT XpLL8Fܚil1Y؊8
%!/{霋 Xb NxpPWcI9g*%: LuCAO%/œ(Y^? &I'uh[xQ$zҵŽ ߳(=V׀
mU) lΠΒid㦈~fjGR{D%>@61`! ` wYk/a0A¹ԁYhdxk:f <WL4` 8IYMBSlc-E҂'ڌ:, DƩ84)~2jǠiB(L| "a4,b8ԓi 94jWщ 6*Tc4g̓UMbRE C5)jȴ 16pbƎHFxģ%4QCʈ $9:M>Eao̟^<Iw Ygq7s[ -y1ع5aMKאRBYFq}8*Nt'.YbZ vK
(]&ɜ ( ՙ 2:0
oΏх PKiBH4UX,[$
0mXش f50VR
8%ާDtUs` -BPzP svI8z-t1DiB
"˶YTJ .?07jLN[2tĮ̎ #6?E:ɞY;A&qSIR)ss
9*x0Bj)mHAhyЏhMm&4Ŋ4 gV&tY OCS0Yd7MvNj)wA(o
"͢[
E`7ezď-Q]6+Bca@^I:һ =sSn c 6
OB4LGpBq/<zAC A~x0 6rihh IطON,:ok/{H,zЂgfȻz5FTrn/t``l*H6j T tG/x@P@(Ip
e!`wv,:A쑜N 4}09zqC$r M`YQM䕫(|B!> >O pwj A*@ JC[h&3B Qbϩ8 :%f~v/lS00a"<TX@&Jg
3ϕHF oI8{:YTb( Pj<za{ wXoa04 3lGȶN0>B8(f uGoǚgyt_y~͔
% mL
!I$X<T+ 3dq
DMt2|fEV([]NdbD3Sp'RG mK<Tٰ }5iܷʹp#&jF
Z'2%y9Q#2H]wA}vf%XӚ)X_S0t(-ⰓjHpӖv/詵,9w<`E
FagAٓЉt)le
; $9{C ()? pIF b3l[):drr]?Ֆ?BdiD7hJ:
U%n3aƬJ.>t0~ePz]Ug
Н=_?.j#+`li BM5 őGp7a
֒ %Y[UG9@\bD Y {{ED0
$Q+FvC`ݨ3Q E\uC9![$l 6DoDgG*+X!%#Cq ?8ZUB)U@opgީZq89|uccAќW;@">Ph_9}.6V/O:3}Z S {:~y kcO6;OB=bV. Rk
o ^GV= }oI"+
]wFzϷ`<30 h3]R f859s`K M8
XUq<\ZOssM&j &
.%PBL~^Gˈ3pD:Z<\ǠiW̆"( :zX~0PG]8RQMNT qfW~!0R%Ց0xvGFy/F-wu/ *+ \8@6c<L;c[ º nr QS'oQuT{qҐ_ͿSdA*ð:m8Yuz2PB
Hh`lkpLLh
cEb6eۏ ҋ ?!>| *=VK@rx0G`%ryr[6Y37 f**n%9df11ޢځ^']
Rq. ,^%l
e#wW s56!=!q[ %Ԯ]5^:m5)?V b|u7fw,:Y e R%
[
o gFAzFP x{dxíw8ٔ{{L> d2C LL,L ,(mS$=|%֝lu& ą83
N Xx \VnJ[)Iw/鹻 |GźYDH*Sp60cJ2@W%Ѧc_^$#*:G6n>D;~`9hXB UJB_вˈ%w'$v|#T<68KMϑ-5U+'B
ĪNbJOv'|+*Mk(d
}C˱@q&aR%}
!VЃs3w2a2awHz/Q0F ]~;ä NDP
mK3xke_
S!V&=v_PL9Yi
NU_)J69f*S 1 7F|BR$y,Ʊ.&=uqsODB R=ɳeؽɇBH
2lu'h7^#S)Xi2..P e/@FK$](%|2 Y1pC8tI11N//+\pjd WmI=߽YZx MЉP81/ JG^U ,Pd1O^ypql2h$jv I%]V
. '[+WU8[D,-=[ O
wE)3J&dقݶR¡S\. 5J$I&o Hȳ~ lz>
Ux/Hu;?Gt{?;TH L|F8}{ p:2t͆<LCA`ʘ Ç득+' oR0D ?AClIZ1F?j᧴ {^ EdGIT&#eJ} ɣ_m iA3K["oCTJEߞ4c$jݍbYnathY `YGei(a#psWi-1b,ʎTcm b hv9jh3t4@zKꙆf jĖ\$5P!hR$P
Mњ`CC^%2]u OsLTxpY !UƜ{' yL +lJ8 )@w$F5t4$,34aT&݄Ui+--,{!/\ς'& S 0xkY 0I)'~ j#m!-TQ`==KR ,.isgI&jf-I(~ o,i傌t&\`͞ҕ,YGܑuI(~[!2= h &I{8~4
j(*aATR?b0IKP
M ^cYf3-Jcr;ruGuAT1?Q8Dpyy+ c@6![ofZp ɲ`$Q!O 4|qiL^_ǀM+ƾQb#7ՃX
5=qQ!i m~u ݢ r(48zrY;*1yNk$9jip +q]giffԥ>aѧp65Y"LD.rVS_
k]n&Hz~9æ
p
$ 4ق'{&M\ΰч!qi (.h' B T| {I6cL . 빍iI\! ;g`1 j%C o3*60E؎]t.-%0
Y K_nft] *VFC tJT+\WZ8gF^
ޞf 5I=#6.@2z;W`B/ęQghjyJNAX3, K66ڲM0T@O{4kj |"ftџۄU<-a5b)^R8:il Ka6@!]buv Ώ$ oU~:.Lte JξP
l$S[z~Rq39钺9Q/m"%ʤ7 5MKL鑧"IߏG XTގXLFݧV
jp^/Mgۻ{w
*9Oʈ<"a Aq. M 2@mp^'wߕmkxO8 $[&|YZy`2_|%r/J?QṈl3ÞKE$wvCh a@U1M%0?1* $GZ{!|ʿ$ە-٪Ev;͓:`Bl˸쌧ɬoQ0&,F?^s,ch˕$Ecl0w`⏺ň@/r^l8cT3k@JݔuP&ʪNdJjTKi *uX{tj~ɡ}i\BK enȵ|N u#]@ lCZ$iPa㸩t04y20
s֪,Au!QBϖ^@Vsɑ\Za7쾉ш6-TrU u~1HJ(<α bRԖqi J? eG
*jVħ ":Y);-Fd!HG~ ux cb6m)&;0 dU?8X~12ۼtI x5{(z
'[ŃkZЅi,b1̇`(mHNeK/
[(#QGduT^m%!(7K gP=h ϕkɐU+.[eC"GDΨ<*<h )` AU @O]hlf2!HF# QB=uȾ9fh;"R K3-(G )PT],7ec
F4hH s73ᖟ `RTwfͳ;6B>Ř
9&܂?)\<&Ŏ 5 LJu@Y, 냲ھ_w0^17p*>D8_)$UźR!jOF>{ t,- bP,m`D"/zA
͔إQZG&U]xejxLwv~=)@B6?!;53/ps@tOZS7ؙnlxZ?Zj
a{6L41 2Qi&֥l]o= 7 ļ ofЖr MEV@H/aD٦HlK5)Z OE 3IG'г;D'zl(E$.ٜ-W R'\w+)w3꺾 @%R).~9;].g+)%ȝk҉^ NW>b1z: soD
K2w[|>9vWMFu` axchիU`*ʆe]OV'6xd ?H]_rA+zdFH ʋ< Ǵ kUsFzaH9- gvb =L/E).x9j%B)$AB t b.bAEZRbH(Jya 9Wj0fF'Xz $DQ6q` o i={#4FYH@J3
3i~tYТhkHP17YD"pĦ;'16fpu>FoDQin̒- @P# hj ނŀfC 7°T5HVXpklĭ]yXr)?ͺBNJ B#9e &&_0 =pZ6h)
̗a b=(p);.N,W^ *hԺCm}E7 i6aIvͲxp*Ac#4N&`)ĉHWey7jl oEh_n3 jp?4p2WE 'kT_
&!ȖjVlHӻ_kɚʳaY s@[G"bYLܫXi
Cq8&zVaY{#I@ 2m!d[1 AƢnKeם/> dmuX:xʷ\pN l+H+ctSǶ C[~3e}6 \,Ʉ|Yݧv]'|&M2 d dsx-((76aXm=ӊQ<$ Q \
qiH阇i'i$"{S*VwF/t<Q`ʒZ +pr)(.j鸫Ik5 <ʆˮ, kODTJ&^7ĪQve
&Z
^4^sD+`WHb6 LW{ZZ @mqvɷ(D\+l0*V߇Vm hƏ/S`|^\<-62N3"
Tolre!H2 pA ֛{ȼ/ udU2*2"c"p${y, 饋 &\m&` |x pCw#W9DIiіCKs燝 S3 ,M; jB4P2if ɿbA]aid"i!aQhCNOY
xF$g9Z`W VBg#j\˂eG [. ]0~X{2D? "3Bj,K~ b#0ɒLkc(6
aE7λ/Վ% ġR^JCϏZ+71XUO,}#-e٤43łt8Z7i<:i?FtFkC W'f0i<Xdj0W#ieC
zI7Bs.K *VdDlj@%
܈
Zsﮐsh̸%^
@8? N8gGgrXS
Ap 4z*4,ít4GndS>fQC WUZ{S;Nx}H&* 9qU1 a`(M-aG}n̽0 pmcn
ɘ_\l} 9F vHþkJZNO mZQҤ aSf
)QC+2
d[ H"t*
c*bڢq,#S#u'Ҭ:4 asCDMF|ɸm_1L]Y\*X>tgD d@&[)8;<{8<+VG\H ^aae-4sJA \ hM[\`#pD5Z97g;BWmqTXX%0 v&]E 4]FIJ&S_4R0D+meY gO+M{03v 'ͅft :;ر Nn\ǔ^,)1laBZZ[ ZSUYh߆wS\/*?zQЋ`X4 gr[CWG.Y0Q|RԃE[wy),ш$NK@c /b
-#ZI
G$ƗtmH#)XwPZAD|S
ofTH)>M1b
7 ɆSuq
jK4[s xL Ǣ]5 !M! AdƧN><:ǻZ(8)e
/W|
b<T?% :@,-ecMP8umVg9 H6 }=5 AbĎ찁ΙV:_ le ɹ
v `0!$`GA"I;$^?Ke O N(սYy5BwV%ju;)lFoa7xڸ4-% $ֹ/zskǘ(sh>DDŃtT7rur0 Ң`ܴh5
5 S}4hrvalc!ZjB]xDbTxzYS 6_)op>#@PS*bS\q ƋxYfQ><"
Y 6I E r_7Ұ VH! IrEL6!N q"' daqMvA % v n<Eб;,w2pO% rXH`uI#/K ;5 6LL.MI8q 4Unrɡ"s9(@=}N) ?S .r0L3m7V K HG/yQ2/WwF) d) s F 7|vQ̴AIz`\䄛<> .; A/2ʲa8D$GWv#̏
9k'o؟o@ (]gk+}/ (nqK(f Ɵиp 2 3Yw pDdGq2$}KӯA"E&Ntg'Nes!Ю4qo}쿝S ,ojr/s TMT&Qf\12h'&ctN'Tx7]2 ;G ʅ|T++:%/ 1T ˀ<4͔˗ ,0~!WO ' :suҦن(^ﮎ )7 fmlҹ1ūt Zh
L0 6X"J҂
49 ֩B }ԭ``Ӓ #Jn_F H|$OK=œ i17o-Hq p[ɫ%%:Ɉi3 ۠G C LL4S:dBj|pYSDP >pv 5KLe{t0yEND$*;z 5NBIgn.N|nRaSZJcH mXek;_ 6,y b0#ZA
e|wG
U1lLD7ÄVqt[xuEQULPBlZSh.1Q0Uٱ8Rip;{H#GON!?t>Q |pkq!gT,j2sǍ4툊tjnƛ/IOE!ˋnF4M& 1x$ew+vS
bm]e%8 P
!s_06)Q2JB [t9'Ԝ,[f Æג] BB @r&Bs|Q
gOC1J D<Uμ(o!hKH 0qAV'pfy"Q
O 2Zq#d"@bQ, w)P\ b`x O)ޢ dMC$[HoWަva4{DZ`52 5;Xao K;6%R(хx98 2rD c@وF<d(AN#FIz m EF=ƚSf
48<'j-'ǘ<Tb2vEtq3qODd_{`/hh`9_1hAY|/ U-͕Ao("$r؆TPR;.-w>&LJiC`A^#X8tH?daĖTSTa H0@U)^e}Jb7%ܔ%:ƿ@ M+ysq L Y00ÔGD >ĩAW 2I:F 32<k}[{*"Az0:@1A:ܤhXC98EUeu)[?mt-5r~JݪV2li)՞<ҳ?(D;)o (X II$$)'i(*_E K*4CkwkOIFfQ$8γ;(0+.9 9u$0t 170fȦ
ǒaO=T,m;n ˸ Χc<90<
_=g QV&B܀%f3`5F ݶ~`6d.2`?]}O0^AKN\Q(I { p[Ꜫ4$6xP& : ' 7u &Rd'
ʹ#{*W lDQ̎.*ZE
c7|4 Ղor\*
HX'#k?WRmP x $ٓ]
ׄFK ~4;
[Ҋh2 Aɉf <P
dg )!b#Z?0o[EhX$ Sؾe N$= 8Ш"^ VcFDxRXCX.:Fq,1)bB1
+Q)_OyE
n Tp }1`#
ףd-֥#Oℚt:5Ћ/<b0'moqIBFW.\kc5ߦ-vT[͂ -4:dݗu[ 8:P 금BTUQ,F24lEO?Dk{
1k6)R̘GI6Yp^U!A@{xg#^/ ETzĒʻ@:F'\Q6t,pT!i
N! dGB^
$@yn_ uUCK_K62B|
^TmrLDgʿf)!- och}@o[rE] /iWJ8OgbӁFe(/EΠyO LB]IkTډabV
2ց%bjg'2-6DJZe' oBi2 +]x;SP{ {Jum f^L
S0~o-SEc*vl pOm@ v - SD;<U CYnA)pxO@iL7E`K\J`9U$ p'Տ3v
+ n%lS}ANj0*׳48i%8P5c#T$F?$L~IQN_MC
TnL`)e|Ȑ!dܑ[sD\VogF G(1 OJB JFR%p 3NP CS@pM vA f,- +HFt,wfA )y^Ƹ}N+s8Z$jNFi#lhP!9ge ]ihfv'l! ynO]3 iяF Pkc\
`@92
zX;]۩i%[5p8Q cd\Lo;jP/ng[qBQP;,Ve3P r'ط4Y 8[% c
^` P jL>ʠq:6S]K"g[ ϑH B5V EqLJX{CB!PI q9Llxʪ7>֤]@!@9H!p ə$ ?)l/"́+@`}}:\ 8zQgS+C}R:HUF\Xg/AZ%c 1wlET wX ZNhyf2D ø&vLq 47z\iJyJ-kN3 -sJ5 )V0N0d\ӛd0d-E[mf\UmxCR<(`ѕ p4^!hQ `!l ~ƙ:JɠlW9˸ZXB=l)`j eVJUG!s1?Ƽ3Ê. }bIa6ʕ
t?SxZJ'p
i,.R2T`5 -R
BxrWH JPe#Bb|-[ PEh(5S fr /] IƊ
dE#OS39ӻ]e ۮɹ.9_beM9b #e(- 0Ra 9"U,%~X܀ z۽{'6[@t[W%* .d'vR {h !AedCE}x=E[|B$7J* B- ,=k7[_-I J5e̶{
( ;WMw`~pAz 8f))(@ Īم<.a%N n@bz>%T*?lgbd<ĵw9Na8;<^*%y:tDҕZ< @0q4l\
1 `/$IJ ғsN);:A;)$ו
Wwy%KrIv\bV\ nd{6tv/~ *O
7U>8rAC<jE-j 牷xs)D1Ì/qp**̸$ّ,
Bȼpk MhpK7U]h&-$鎻Y;q6wzW˄֭AhD^R "s5 fw
+Q& /9ȂwN bz{ Y>
]NEc,ߞ# BF:0/-EȾ׃F\I{tAZCORuk i)ytkdN&vA P{P'>xƆ`.%,;:Կ:aFoTQ}v#ףQk's ~z5h MQʒY>Cʍ i UNF#J0uC8k!
fv {E/ IKIE> pyde
ʾ=z:@7J|5g8x 3O
3 H1F.yfzWIM j[.w%i?҆Uf|}@+[8k7CxSEOޯp$Q+:<]K3T-y[Nz;y-HZY^.M *'h8A.N2rLB 7:Or}CS˚S9Jq#WI}*8D!# g#Y>8`
В ?a2H, ^'?^nhOƒi<Ya2+ 6aFa<!02]c:eK XX[UgOu5iyPcVT5 RIA6OԸi
C\ QZMDƃB!X: \!^"{E Vax$P \$ DBBTFt~{O
w 5a#`= gЁY2> MG-Gkè1TbL
`*ـVX
*xe§֊Z*c`VSbJU *6TK@zqPhg*ߔU(QU49L
cM*TR!R,BȅE*C|TzpF@4*텰جXb L. T2 y` Upb
T , %@` # ?@ t GLŞ S)ÿztϲFy 14 Lh f e(.)pK@\ Xe@ TbvhD&0-IbD d@ ZD1@ Dyѧ CN|
94Ӛ#Nc l;,
`cX@(2$0 "@- $B@ <$ А8p7C b(@
PA@ F 0 t GORIJI TySMW52\ToRKV0Ȏ(
-$
!6wHGO r~e~/]V~/P~7SzKFv`;`9v#
JBN, ӭ' ` '`\LTApBs)r!
(
i` | N AM LP ', ( G L Y P H I C O N S H a l f l i n g s R e g u l a r x V e r s i o n 1 . 0 0 9 ; P S 0 0 1 . 0 0 9 ; h o t c o n v 1 . 0 . 7 0 ; m a k e o t f . l i b 2 . 5 . 5 8 3 2 9 8 G L Y P H I C O N S H a l f l i n g s R e g u l a r BSGP M M F٣(uʌ<0DB/X
N CC^ rmR2skPJ"5+glW*iW/E4#ԣU~fUDĹJ1/!/s7k(h N8od$yq19@-HGS"Fjؠ6C3& W51BaQaRU/{* =@dh$ 1Tۗnc+cA Zɀ@Qcal2>Km' CHMĬfBX,Ype
U *Ҕz
miO1nE.
hx!aC
XTV R %|IHP5"bN=r/_R_ %҄uzҘ52ġP)F7SqF{nia@Ds; }9⬥?ź R{Tk;ǜU\NZQ-^s7f 0S3A
_n`W 7Ppi!g/_pZ-=ץ~WZ#/4 KF ` z0| Dѵ &däIÏ;M{'omm I !w i9|H:ۧ{~qO, L]&J09/9&Y 蓰{;'3` e @vHyDZ$ 3Dx28 W Cx5xwB`$C$'El yh Ԁ
DJ
$(pQAA܉A@'$
hp 0V0 `se$4$"t2=f4A{Tk0|rH`L&sh]A<`R'!1N;_t3# V *veF`E O${)W=p:F`22ړC^.ćG<<?~z>.p Ne2ִ+Ysl:˼ ܫu5tu^86 ȄTmyQ%u~%~1rҘawߚ^_ZZa0!N`.
uqYB\ᨀ[e:@J'Eہ,3 ubj@pfeW9( ޅ=lG 7gj SM609OˑlBa݁ <Bՙ(VRApf^+g9qMt ] تpEr@]@ VkV
ud^X R@?E Y2 ]#Ǽ4JK'dPC|mmn#$+48u'e&[n[L %{BCDL:^!bƙ:&g3-3ub
iLZڂWFSId6.k5Pl77UzT:NN.")['|U"A Ivwptdk9嫫9 nDmq7I|6Kbc]MBABȪ _JT q 6@Fhd`GT:M 7'L,IhFP ~j $¡ 3hA -S^چ-%qe~Qqln"i&Qe?FlK"As(3 Y;"Let 'Rz<MW!S3$rZ:b-^ DŽ/$QqJB'WdGAO`.( o 3B0ɑ1p((*o^ǪkJ`v[C|9=#AQ# 7;.]L:ϸcdiEsr6?} e@H- bƖC1;.
v. ɾ$`T JW%BZI04^:kU,C^WVF` Fb (OO 2<@Xu g~ɑW t&1\1L:φ"!P 3/^ǰqw`IAD
)qCfO 02Y293Nfp\ Cah&6p`ځzgB
hRf ]; ]#pw_t(p q꿏ٷ,bdkRBT?22cFy2%Cn909E&#lT__Sлg)eh/ڷ+#:F Gotk5Gbr;Cb˴:#ɜ & QCwmxlNq P)͐3f-v5Kh0AכjnSp ^HGFf H "%[ѻ @ p aα $$͂*_\@>M1 0{=) K%$C
9M4c EotjVGD)l8,\w ! %$3t TBzҴ iUJ[xgd Br$!eq"J> )\~3(^
R8#>bHG'7_ fӫcκtD oAA߃(qB<` `VΫ֘*buP4v@+.Qԥ$V@C0
R ܐP[ z:XH#e s>?EWO>@I$|si
ES)0A?9ab,@K̩o&Q% ϞLu+
+H|Ɛ?NK4CnPt
'OT.j5Ĵ8vw֜I&+`yScaO[#gQd[KI矗`ČLP # )27aTi@c\ސ 0nCpߖ運4͵x*RzYbT[\ kUvHʈqpIIŗ) bB
XPNtz 2
I== ;}bqjiކa#" >11Ap1PO OuxQ
Fϲ(h݄O'MDxLK$ȵh&
14SirHJPt DM;rM+
*ؗ5u2$f3K <PLrcI)^ da>
%ѳb (@,2f,~"7R;E ;HX( 42Z ' Tۿ2J+^!#oY~4-׃GW *!A0&8f{`W=DP8'= R g}iP>#4EBRY^4eN8V,[BĨD#X],LBsNC>
+o^x
jC.4Ya_{eA2=r+ 9POA!!
}YPJeGn%x1/}RgHa ^3- 5
|qSaWK{ 1al`I1 Qf_yyCZ)L3X] W6@DMT<.uGK8DsбWr\7Z\V"ISd>CUjeD 3MtWcPӉ6#3QnቩJ\7#磱`K lV6 & T ~l. <BP
*!zRZeљٷT#CLHW)DpYU#51{WJ4^f̼Zy6ӑT2d4H=B Ҋ}&݃,aPçv+:2~*0dɓփd !"A+r Hn sAڗU
bHN6$.l};@iK \҂:v QE : ,|Q Y0|%@ ܁qcdqh諹vCGV-(m1q89KFä
"2}Rrz,j^q\ݖ#p+`f l :k t5EOaIJP
@psEj14;6/aH.ӰT XpLL8Fܚil1Y؊8
%!/{霋 Xb NxpPWcI9g*%: LuCAO%/œ(Y^? &I'uh[xQ$zҵŽ ߳(=V׀
mU) lΠΒid㦈~fjGR{D%>@61`! ` wYk/a0A¹ԁYhdxk:f <WL4` 8IYMBSlc-E҂'ڌ:, DƩ84)~2jǠiB(L| "a4,b8ԓi 94jWщ 6*Tc4g̓UMbRE C5)jȴ 16pbƎHFxģ%4QCʈ $9:M>Eao̟^<Iw Ygq7s[ -y1ع5aMKאRBYFq}8*Nt'.YbZ vK
(]&ɜ ( ՙ 2:0
oΏх PKiBH4UX,[$
0mXش f50VR
8%ާDtUs` -BPzP svI8z-t1DiB
"˶YTJ .?07jLN[2tĮ̎ #6?E:ɞY;A&qSIR)ss
9*x0Bj)mHAhyЏhMm&4Ŋ4 gV&tY OCS0Yd7MvNj)wA(o
"͢[
E`7ezď-Q]6+Bca@^I:һ =sSn c 6
OB4LGpBq/<zAC A~x0 6rihh IطON,:ok/{H,zЂgfȻz5FTrn/t``l*H6j T tG/x@P@(Ip
e!`wv,:A쑜N 4}09zqC$r M`YQM䕫(|B!> >O pwj A*@ JC[h&3B Qbϩ8 :%f~v/lS00a"<TX@&Jg
3ϕHF oI8{:YTb( Pj<za{ wXoa04 3lGȶN0>B8(f uGoǚgyt_y~͔
% mL
!I$X<T+ 3dq
DMt2|fEV([]NdbD3Sp'RG mK<Tٰ }5iܷʹp#&jF
Z'2%y9Q#2H]wA}vf%XӚ)X_S0t(-ⰓjHpӖv/詵,9w<`E
FagAٓЉt)le
; $9{C ()? pIF b3l[):drr]?Ֆ?BdiD7hJ:
U%n3aƬJ.>t0~ePz]Ug
Н=_?.j#+`li BM5 őGp7a
֒ %Y[UG9@\bD Y {{ED0
$Q+FvC`ݨ3Q E\uC9![$l 6DoDgG*+X!%#Cq ?8ZUB)U@opgީZq89|uccAќW;@">Ph_9}.6V/O:3}Z S {:~y kcO6;OB=bV. Rk
o ^GV= }oI"+
]wFzϷ`<30 h3]R f859s`K M8
XUq<\ZOssM&j &
.%PBL~^Gˈ3pD:Z<\ǠiW̆"( :zX~0PG]8RQMNT qfW~!0R%Ց0xvGFy/F-wu/ *+ \8@6c<L;c[ º nr QS'oQuT{qҐ_ͿSdA*ð:m8Yuz2PB
Hh`lkpLLh
cEb6eۏ ҋ ?!>| *=VK@rx0G`%ryr[6Y37 f**n%9df11ޢځ^']
Rq. ,^%l
e#wW s56!=!q[ %Ԯ]5^:m5)?V b|u7fw,:Y e R%
[
o gFAzFP x{dxíw8ٔ{{L> d2C LL,L ,(mS$=|%֝lu& ą83
N Xx \VnJ[)Iw/鹻 |GźYDH*Sp60cJ2@W%Ѧc_^$#*:G6n>D;~`9hXB UJB_вˈ%w'$v|#T<68KMϑ-5U+'B
ĪNbJOv'|+*Mk(d
}C˱@q&aR%}
!VЃs3w2a2awHz/Q0F ]~;ä NDP
mK3xke_
S!V&=v_PL9Yi
NU_)J69f*S 1 7F|BR$y,Ʊ.&=uqsODB R=ɳeؽɇBH
2lu'h7^#S)Xi2..P e/@FK$](%|2 Y1pC8tI11N//+\pjd WmI=߽YZx MЉP81/ JG^U ,Pd1O^ypql2h$jv I%]V
. '[+WU8[D,-=[ O
wE)3J&dقݶR¡S\. 5J$I&o Hȳ~ lz>
Ux/Hu;?Gt{?;TH L|F8}{ p:2t͆<LCA`ʘ Ç득+' oR0D ?AClIZ1F?j᧴ {^ EdGIT&#eJ} ɣ_m iA3K["oCTJEߞ4c$jݍbYnathY `YGei(a#psWi-1b,ʎTcm b hv9jh3t4@zKꙆf jĖ\$5P!hR$P
Mњ`CC^%2]u OsLTxpY !UƜ{' yL +lJ8 )@w$F5t4$,34aT&݄Ui+--,{!/\ς'& S 0xkY 0I)'~ j#m!-TQ`==KR ,.isgI&jf-I(~ o,i傌t&\`͞ҕ,YGܑuI(~[!2= h &I{8~4
j(*aATR?b0IKP
M ^cYf3-Jcr;ruGuAT1?Q8Dpyy+ c@6![ofZp ɲ`$Q!O 4|qiL^_ǀM+ƾQb#7ՃX
5=qQ!i m~u ݢ r(48zrY;*1yNk$9jip +q]giffԥ>aѧp65Y"LD.rVS_
k]n&Hz~9æ
p
$ 4ق'{&M\ΰч!qi (.h' B T| {I6cL . 빍iI\! ;g`1 j%C o3*60E؎]t.-%0
Y K_nft] *VFC tJT+\WZ8gF^
ޞf 5I=#6.@2z;W`B/ęQghjyJNAX3, K66ڲM0T@O{4kj |"ftџۄU<-a5b)^R8:il Ka6@!]buv Ώ$ oU~:.Lte JξP
l$S[z~Rq39钺9Q/m"%ʤ7 5MKL鑧"IߏG XTގXLFݧV
jp^/Mgۻ{w
*9Oʈ<"a Aq. M 2@mp^'wߕmkxO8 $[&|YZy`2_|%r/J?QṈl3ÞKE$wvCh a@U1M%0?1* $GZ{!|ʿ$ە-٪Ev;͓:`Bl˸쌧ɬoQ0&,F?^s,ch˕$Ecl0w`⏺ň@/r^l8cT3k@JݔuP&ʪNdJjTKi *uX{tj~ɡ}i\BK enȵ|N u#]@ lCZ$iPa㸩t04y20
s֪,Au!QBϖ^@Vsɑ\Za7쾉ш6-TrU u~1HJ(<α bRԖqi J? eG
*jVħ ":Y);-Fd!HG~ ux cb6m)&;0 dU?8X~12ۼtI x5{(z
'[ŃkZЅi,b1̇`(mHNeK/
[(#QGduT^m%!(7K gP=h ϕkɐU+.[eC"GDΨ<*<h )` AU @O]hlf2!HF# QB=uȾ9fh;"R K3-(G )PT],7ec
F4hH s73ᖟ `RTwfͳ;6B>Ř
9&܂?)\<&Ŏ 5 LJu@Y, 냲ھ_w0^17p*>D8_)$UźR!jOF>{ t,- bP,m`D"/zA
͔إQZG&U]xejxLwv~=)@B6?!;53/ps@tOZS7ؙnlxZ?Zj
a{6L41 2Qi&֥l]o= 7 ļ ofЖr MEV@H/aD٦HlK5)Z OE 3IG'г;D'zl(E$.ٜ-W R'\w+)w3꺾 @%R).~9;].g+)%ȝk҉^ NW>b1z: soD
K2w[|>9vWMFu` axchիU`*ʆe]OV'6xd ?H]_rA+zdFH ʋ< Ǵ kUsFzaH9- gvb =L/E).x9j%B)$AB t b.bAEZRbH(Jya 9Wj0fF'Xz $DQ6q` o i={#4FYH@J3
3i~tYТhkHP17YD"pĦ;'16fpu>FoDQin̒- @P# hj ނŀfC 7°T5HVXpklĭ]yXr)?ͺBNJ B#9e &&_0 =pZ6h)
̗a b=(p);.N,W^ *hԺCm}E7 i6aIvͲxp*Ac#4N&`)ĉHWey7jl oEh_n3 jp?4p2WE 'kT_
&!ȖjVlHӻ_kɚʳaY s@[G"bYLܫXi
Cq8&zVaY{#I@ 2m!d[1 AƢnKeם/> dmuX:xʷ\pN l+H+ctSǶ C[~3e}6 \,Ʉ|Yݧv]'|&M2 d dsx-((76aXm=ӊQ<$ Q \
qiH阇i'i$"{S*VwF/t<Q`ʒZ +pr)(.j鸫Ik5 <ʆˮ, kODTJ&^7ĪQve
&Z
^4^sD+`WHb6 LW{ZZ @mqvɷ(D\+l0*V߇Vm hƏ/S`|^\<-62N3"
Tolre!H2 pA ֛{ȼ/ udU2*2"c"p${y, 饋 &\m&` |x pCw#W9DIiіCKs燝 S3 ,M; jB4P2if ɿbA]aid"i!aQhCNOY
xF$g9Z`W VBg#j\˂eG [. ]0~X{2D? "3Bj,K~ b#0ɒLkc(6
aE7λ/Վ% ġR^JCϏZ+71XUO,}#-e٤43łt8Z7i<:i?FtFkC W'f0i<Xdj0W#ieC
zI7Bs.K *VdDlj@%
܈
Zsﮐsh̸%^
@8? N8gGgrXS
Ap 4z*4,ít4GndS>fQC WUZ{S;Nx}H&* 9qU1 a`(M-aG}n̽0 pmcn
ɘ_\l} 9F vHþkJZNO mZQҤ aSf
)QC+2
d[ H"t*
c*bڢq,#S#u'Ҭ:4 asCDMF|ɸm_1L]Y\*X>tgD d@&[)8;<{8<+VG\H ^aae-4sJA \ hM[\`#pD5Z97g;BWmqTXX%0 v&]E 4]FIJ&S_4R0D+meY gO+M{03v 'ͅft :;ر Nn\ǔ^,)1laBZZ[ ZSUYh߆wS\/*?zQЋ`X4 gr[CWG.Y0Q|RԃE[wy),ш$NK@c /b
-#ZI
G$ƗtmH#)XwPZAD|S
ofTH)>M1b
7 ɆSuq
jK4[s xL Ǣ]5 !M! AdƧN><:ǻZ(8)e
/W|
b<T?% :@,-ecMP8umVg9 H6 }=5 AbĎ찁ΙV:_ le ɹ
v `0!$`GA"I;$^?Ke O N(սYy5BwV%ju;)lFoa7xڸ4-% $ֹ/zskǘ(sh>DDŃtT7rur0 Ң`ܴh5
5 S}4hrvalc!ZjB]xDbTxzYS 6_)op>#@PS*bS\q ƋxYfQ><"
Y 6I E r_7Ұ VH! IrEL6!N q"' daqMvA % v n<Eб;,w2pO% rXH`uI#/K ;5 6LL.MI8q 4Unrɡ"s9(@=}N) ?S .r0L3m7V K HG/yQ2/WwF) d) s F 7|vQ̴AIz`\䄛<> .; A/2ʲa8D$GWv#̏
9k'o؟o@ (]gk+}/ (nqK(f Ɵиp 2 3Yw pDdGq2$}KӯA"E&Ntg'Nes!Ю4qo}쿝S ,ojr/s TMT&Qf\12h'&ctN'Tx7]2 ;G ʅ|T++:%/ 1T ˀ<4͔˗ ,0~!WO ' :suҦن(^ﮎ )7 fmlҹ1ūt Zh
L0 6X"J҂
49 ֩B }ԭ``Ӓ #Jn_F H|$OK=œ i17o-Hq p[ɫ%%:Ɉi3 ۠G C LL4S:dBj|pYSDP >pv 5KLe{t0yEND$*;z 5NBIgn.N|nRaSZJcH mXek;_ 6,y b0#ZA
e|wG
U1lLD7ÄVqt[xuEQULPBlZSh.1Q0Uٱ8Rip;{H#GON!?t>Q |pkq!gT,j2sǍ4툊tjnƛ/IOE!ˋnF4M& 1x$ew+vS
bm]e%8 P
!s_06)Q2JB [t9'Ԝ,[f Æג] BB @r&Bs|Q
gOC1J D<Uμ(o!hKH 0qAV'pfy"Q
O 2Zq#d"@bQ, w)P\ b`x O)ޢ dMC$[HoWަva4{DZ`52 5;Xao K;6%R(хx98 2rD c@وF<d(AN#FIz m EF=ƚSf
48<'j-'ǘ<Tb2vEtq3qODd_{`/hh`9_1hAY|/ U-͕Ao("$r؆TPR;.-w>&LJiC`A^#X8tH?daĖTSTa H0@U)^e}Jb7%ܔ%:ƿ@ M+ysq L Y00ÔGD >ĩAW 2I:F 32<k}[{*"Az0:@1A:ܤhXC98EUeu)[?mt-5r~JݪV2li)՞<ҳ?(D;)o (X II$$)'i(*_E K*4CkwkOIFfQ$8γ;(0+.9 9u$0t 170fȦ
ǒaO=T,m;n ˸ Χc<90<
_=g QV&B܀%f3`5F ݶ~`6d.2`?]}O0^AKN\Q(I { p[Ꜫ4$6xP& : ' 7u &Rd'
ʹ#{*W lDQ̎.*ZE
c7|4 Ղor\*
HX'#k?WRmP x $ٓ]
ׄFK ~4;
[Ҋh2 Aɉf <P
dg )!b#Z?0o[EhX$ Sؾe N$= 8Ш"^ VcFDxRXCX.:Fq,1)bB1
+Q)_OyE
n Tp }1`#
ףd-֥#Oℚt:5Ћ/<b0'moqIBFW.\kc5ߦ-vT[͂ -4:dݗu[ 8:P 금BTUQ,F24lEO?Dk{
1k6)R̘GI6Yp^U!A@{xg#^/ ETzĒʻ@:F'\Q6t,pT!i
N! dGB^
$@yn_ uUCK_K62B|
^TmrLDgʿf)!- och}@o[rE] /iWJ8OgbӁFe(/EΠyO LB]IkTډabV
2ց%bjg'2-6DJZe' oBi2 +]x;SP{ {Jum f^L
S0~o-SEc*vl pOm@ v - SD;<U CYnA)pxO@iL7E`K\J`9U$ p'Տ3v
+ n%lS}ANj0*׳48i%8P5c#T$F?$L~IQN_MC
TnL`)e|Ȑ!dܑ[sD\VogF G(1 OJB JFR%p 3NP CS@pM vA f,- +HFt,wfA )y^Ƹ}N+s8Z$jNFi#lhP!9ge ]ihfv'l! ynO]3 iяF Pkc\
`@92
zX;]۩i%[5p8Q cd\Lo;jP/ng[qBQP;,Ve3P r'ط4Y 8[% c
^` P jL>ʠq:6S]K"g[ ϑH B5V EqLJX{CB!PI q9Llxʪ7>֤]@!@9H!p ə$ ?)l/"́+@`}}:\ 8zQgS+C}R:HUF\Xg/AZ%c 1wlET wX ZNhyf2D ø&vLq 47z\iJyJ-kN3 -sJ5 )V0N0d\ӛd0d-E[mf\UmxCR<(`ѕ p4^!hQ `!l ~ƙ:JɠlW9˸ZXB=l)`j eVJUG!s1?Ƽ3Ê. }bIa6ʕ
t?SxZJ'p
i,.R2T`5 -R
BxrWH JPe#Bb|-[ PEh(5S fr /] IƊ
dE#OS39ӻ]e ۮɹ.9_beM9b #e(- 0Ra 9"U,%~X܀ z۽{'6[@t[W%* .d'vR {h !AedCE}x=E[|B$7J* B- ,=k7[_-I J5e̶{
( ;WMw`~pAz 8f))(@ Īم<.a%N n@bz>%T*?lgbd<ĵw9Na8;<^*%y:tDҕZ< @0q4l\
1 `/$IJ ғsN);:A;)$ו
Wwy%KrIv\bV\ nd{6tv/~ *O
7U>8rAC<jE-j 牷xs)D1Ì/qp**̸$ّ,
Bȼpk MhpK7U]h&-$鎻Y;q6wzW˄֭AhD^R "s5 fw
+Q& /9ȂwN bz{ Y>
]NEc,ߞ# BF:0/-EȾ׃F\I{tAZCORuk i)ytkdN&vA P{P'>xƆ`.%,;:Կ:aFoTQ}v#ףQk's ~z5h MQʒY>Cʍ i UNF#J0uC8k!
fv {E/ IKIE> pyde
ʾ=z:@7J|5g8x 3O
3 H1F.yfzWIM j[.w%i?҆Uf|}@+[8k7CxSEOޯp$Q+:<]K3T-y[Nz;y-HZY^.M *'h8A.N2rLB 7:Or}CS˚S9Jq#WI}*8D!# g#Y>8`
В ?a2H, ^'?^nhOƒi<Ya2+ 6aFa<!02]c:eK XX[UgOu5iyPcVT5 RIA6OԸi
C\ QZMDƃB!X: \!^"{E Vax$P \$ DBBTFt~{O
w 5a#`= gЁY2> MG-Gkè1TbL
`*ـVX
*xe§֊Z*c`VSbJU *6TK@zqPhg*ߔU(QU49L
cM*TR!R,BȅE*C|TzpF@4*텰جXb L. T2 y` Upb
T , %@` # ?@ t GLŞ S)ÿztϲFy 14 Lh f e(.)pK@\ Xe@ TbvhD&0-IbD d@ ZD1@ Dyѧ CN|
94Ӛ#Nc l;,
`cX@(2$0 "@- $B@ <$ А8p7C b(@
PA@ F 0 t GORIJI TySMW52\ToRKV0Ȏ(
-$
!6wHGO r~e~/]V~/P~7SzKFv`;`9v#
JBN, ӭ' ` '`\LTApBs)r!
(
i` | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-core/src/test/resources/META-INF/services/com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface4 | com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface1Impl
| com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface1Impl
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./doc/images/logo/logo-stack.svg | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.17383 147.65549"><defs><style>.cls-1{fill:#8fa896;}.cls-2{fill:#636060;}.cls-3{fill:#2c2929;}.cls-4{fill:#383635;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M61.83769.00028a25.77375,25.77375,0,0,1,5.74589.5201C78.61014,2.97542,86.579,12.70226,87.64871,23.87653a31.16932,31.16932,0,0,1-.31078,8.31906c-.15717.91542-.47579,1.18124-1.4402.90669C83.22,32.34,80.51842,31.65445,77.8072,31.02c-.96815-.22656-1.16623-.588-.97906-1.57887A15.92677,15.92677,0,0,0,63.1612,10.85355,16.19138,16.19138,0,0,0,46.04126,21.65232a15.80728,15.80728,0,0,0,7.207,18.77454c1.09407.64046,2.16748,1.32071,3.29054,1.90556.77278.40244.886.74854.39833,1.53627-4.115,6.647-8.17893,13.32562-12.26217,19.9923-.88293,1.44154-1.76336,2.88524-2.6805,4.305a2.47287,2.47287,0,0,0-.24315,2.46183c1.54633,4.2036.9427,8.15821-2.18877,11.40269A10.21393,10.21393,0,0,1,28.379,84.71369c-4.99169-1.64127-7.71778-6.38172-7.028-11.95955.54683-4.42225,4.84919-8.33969,9.70824-8.73781a2.056,2.056,0,0,0,1.80192-1.1076q4.74164-7.8733,9.5462-15.70846a1.32464,1.32464,0,0,0-.2285-1.92663A26.16012,26.16012,0,0,1,34.582,24.99931,25.80624,25.80624,0,0,1,43.64624,6.63293,26.39121,26.39121,0,0,1,57.87279.22206C57.973.20827,60.87391.07144,61.83769.00028Z"/><path class="cls-2" d="M87.90166,101.28077a27.05243,27.05243,0,0,1-20.1095-8.95242c-.59672-.63781-.78409-.99414.053-1.62949,2.25469-1.7114,4.4556-3.49734,6.61765-5.32491.69553-.58792,1.0237-.426,1.58481.15969,4.38881,4.58079,9.71824,6.43115,15.88862,4.75325a15.37359,15.37359,0,0,0,11.44514-11.88237A15.9665,15.9665,0,0,0,89.94749,59.08581a17.42231,17.42231,0,0,0-11.25955,2.56045c-1.01306.60027-2.21938,1.75307-3.04652,1.53752-.80252-.20914-1.25178-1.83944-1.82173-2.86477Q67.75853,49.41506,61.725,38.49585a2.10943,2.10943,0,0,0-1.802-1.26733,10.60067,10.60067,0,0,1-9.36853-11.65546,10.66286,10.66286,0,1,1,20.41106,5.26977,2.57307,2.57307,0,0,0,.17916,2.58054c2.80726,4.912,5.59611,9.83508,8.32439,14.79117a1.34292,1.34292,0,0,0,1.86973.77413A26.48383,26.48383,0,0,1,114.43508,70.3821a26.86993,26.86993,0,0,1-21.23629,30.37376A22.53272,22.53272,0,0,1,87.90166,101.28077Z"/><path class="cls-3" d="M63.28336,69.28619c4.65173,0,9.30378-.029,13.9549.0239a2.248,2.248,0,0,0,2.0839-1.05922A10.54518,10.54518,0,0,1,91.2998,64.54038a10.685,10.685,0,0,1,.1176,20.16215,10.56244,10.56244,0,0,1-11.93616-3.4917,2.87461,2.87461,0,0,0-2.6249-1.29321q-8.75276.0906-17.50674-.00424c-1.06649-.01217-1.38656.334-1.65634,1.30624C54.71475,91.95336,47.658,98.502,36.855,100.83089,22.69068,103.8844,7.94215,93.63441,5.62042,79.33222A26.73471,26.73471,0,0,1,23.89973,49.16486c1.04538-.3369,1.45384-.18041,1.70164.91427.58648,2.59084,1.22632,5.1738,1.97388,7.722.32566,1.11012.02537,1.47606-1.01147,1.85735A15.98352,15.98352,0,0,0,15.8911,74.68141C15.72627,82.14169,21.66854,89.165,29.15382,90.357A16.00639,16.00639,0,0,0,47.87028,74.45586c.02014-1.31064.06117-2.62531-.01642-3.93163-.05692-.9583.19047-1.27823,1.221-1.26494C53.81032,69.3204,58.54706,69.2862,63.28336,69.28619Z"/><path class="cls-4" d="M13.061,107.39378h3.05957l13.63476,30.18554H25.2998l-4.05273-8.89453H8.27344l-3.79981,8.89453H0Zm6.396,17.46679-4.90576-10.87109-4.54981,10.87109Z"/><path class="cls-4" d="M32.28027,147.65549V117.8137h6.93555q5.32543,0,8.29346,2.62109a9.26336,9.26336,0,0,1,2.96777,7.32617,10.01466,10.01466,0,0,1-2.793,7.30469,9.52323,9.52323,0,0,1-7.11719,2.85742,12.61666,12.61666,0,0,1-4.23828-.83789v10.57031Zm6.8501-26.18945H36.32861V133.6262a8.3495,8.3495,0,0,0,3.82276.92383,5.91983,5.91983,0,0,0,4.55029-1.91211,6.95428,6.95428,0,0,0,1.77051-4.91993,6.83155,6.83155,0,0,0-.83643-3.416,5.03764,5.03764,0,0,0-2.28027-2.15918A10.31426,10.31426,0,0,0,39.13037,121.466Z"/><path class="cls-4" d="M64.40771,117.77073a10.52024,10.52024,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06933,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52243,10.52243,0,0,1-7.53174-2.86816,10.03588,10.03588,0,0,1,.03271-14.39453A10.73491,10.73491,0,0,1,64.40771,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66579,6.66579,0,0,0,4.81055,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78435,6.78435,0,0,0,64.18994,121.29417Z"/><path class="cls-4" d="M79.51416,107.56565h3.96143v30.01367H79.51416Z"/><path class="cls-4" d="M89.2876,107.56565H93.249v30.01367H89.2876Z"/><path class="cls-4" d="M108.55127,117.77073a10.52026,10.52026,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06934,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52245,10.52245,0,0,1-7.53174-2.86816,10.03587,10.03587,0,0,1,.03272-14.39453A10.73489,10.73489,0,0,1,108.55127,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66576,6.66576,0,0,0,4.81054,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78431,6.78431,0,0,0,108.3335,121.29417Z"/></g></g></svg> | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.17383 147.65549"><defs><style>.cls-1{fill:#8fa896;}.cls-2{fill:#636060;}.cls-3{fill:#2c2929;}.cls-4{fill:#383635;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M61.83769.00028a25.77375,25.77375,0,0,1,5.74589.5201C78.61014,2.97542,86.579,12.70226,87.64871,23.87653a31.16932,31.16932,0,0,1-.31078,8.31906c-.15717.91542-.47579,1.18124-1.4402.90669C83.22,32.34,80.51842,31.65445,77.8072,31.02c-.96815-.22656-1.16623-.588-.97906-1.57887A15.92677,15.92677,0,0,0,63.1612,10.85355,16.19138,16.19138,0,0,0,46.04126,21.65232a15.80728,15.80728,0,0,0,7.207,18.77454c1.09407.64046,2.16748,1.32071,3.29054,1.90556.77278.40244.886.74854.39833,1.53627-4.115,6.647-8.17893,13.32562-12.26217,19.9923-.88293,1.44154-1.76336,2.88524-2.6805,4.305a2.47287,2.47287,0,0,0-.24315,2.46183c1.54633,4.2036.9427,8.15821-2.18877,11.40269A10.21393,10.21393,0,0,1,28.379,84.71369c-4.99169-1.64127-7.71778-6.38172-7.028-11.95955.54683-4.42225,4.84919-8.33969,9.70824-8.73781a2.056,2.056,0,0,0,1.80192-1.1076q4.74164-7.8733,9.5462-15.70846a1.32464,1.32464,0,0,0-.2285-1.92663A26.16012,26.16012,0,0,1,34.582,24.99931,25.80624,25.80624,0,0,1,43.64624,6.63293,26.39121,26.39121,0,0,1,57.87279.22206C57.973.20827,60.87391.07144,61.83769.00028Z"/><path class="cls-2" d="M87.90166,101.28077a27.05243,27.05243,0,0,1-20.1095-8.95242c-.59672-.63781-.78409-.99414.053-1.62949,2.25469-1.7114,4.4556-3.49734,6.61765-5.32491.69553-.58792,1.0237-.426,1.58481.15969,4.38881,4.58079,9.71824,6.43115,15.88862,4.75325a15.37359,15.37359,0,0,0,11.44514-11.88237A15.9665,15.9665,0,0,0,89.94749,59.08581a17.42231,17.42231,0,0,0-11.25955,2.56045c-1.01306.60027-2.21938,1.75307-3.04652,1.53752-.80252-.20914-1.25178-1.83944-1.82173-2.86477Q67.75853,49.41506,61.725,38.49585a2.10943,2.10943,0,0,0-1.802-1.26733,10.60067,10.60067,0,0,1-9.36853-11.65546,10.66286,10.66286,0,1,1,20.41106,5.26977,2.57307,2.57307,0,0,0,.17916,2.58054c2.80726,4.912,5.59611,9.83508,8.32439,14.79117a1.34292,1.34292,0,0,0,1.86973.77413A26.48383,26.48383,0,0,1,114.43508,70.3821a26.86993,26.86993,0,0,1-21.23629,30.37376A22.53272,22.53272,0,0,1,87.90166,101.28077Z"/><path class="cls-3" d="M63.28336,69.28619c4.65173,0,9.30378-.029,13.9549.0239a2.248,2.248,0,0,0,2.0839-1.05922A10.54518,10.54518,0,0,1,91.2998,64.54038a10.685,10.685,0,0,1,.1176,20.16215,10.56244,10.56244,0,0,1-11.93616-3.4917,2.87461,2.87461,0,0,0-2.6249-1.29321q-8.75276.0906-17.50674-.00424c-1.06649-.01217-1.38656.334-1.65634,1.30624C54.71475,91.95336,47.658,98.502,36.855,100.83089,22.69068,103.8844,7.94215,93.63441,5.62042,79.33222A26.73471,26.73471,0,0,1,23.89973,49.16486c1.04538-.3369,1.45384-.18041,1.70164.91427.58648,2.59084,1.22632,5.1738,1.97388,7.722.32566,1.11012.02537,1.47606-1.01147,1.85735A15.98352,15.98352,0,0,0,15.8911,74.68141C15.72627,82.14169,21.66854,89.165,29.15382,90.357A16.00639,16.00639,0,0,0,47.87028,74.45586c.02014-1.31064.06117-2.62531-.01642-3.93163-.05692-.9583.19047-1.27823,1.221-1.26494C53.81032,69.3204,58.54706,69.2862,63.28336,69.28619Z"/><path class="cls-4" d="M13.061,107.39378h3.05957l13.63476,30.18554H25.2998l-4.05273-8.89453H8.27344l-3.79981,8.89453H0Zm6.396,17.46679-4.90576-10.87109-4.54981,10.87109Z"/><path class="cls-4" d="M32.28027,147.65549V117.8137h6.93555q5.32543,0,8.29346,2.62109a9.26336,9.26336,0,0,1,2.96777,7.32617,10.01466,10.01466,0,0,1-2.793,7.30469,9.52323,9.52323,0,0,1-7.11719,2.85742,12.61666,12.61666,0,0,1-4.23828-.83789v10.57031Zm6.8501-26.18945H36.32861V133.6262a8.3495,8.3495,0,0,0,3.82276.92383,5.91983,5.91983,0,0,0,4.55029-1.91211,6.95428,6.95428,0,0,0,1.77051-4.91993,6.83155,6.83155,0,0,0-.83643-3.416,5.03764,5.03764,0,0,0-2.28027-2.15918A10.31426,10.31426,0,0,0,39.13037,121.466Z"/><path class="cls-4" d="M64.40771,117.77073a10.52024,10.52024,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06933,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52243,10.52243,0,0,1-7.53174-2.86816,10.03588,10.03588,0,0,1,.03271-14.39453A10.73491,10.73491,0,0,1,64.40771,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66579,6.66579,0,0,0,4.81055,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78435,6.78435,0,0,0,64.18994,121.29417Z"/><path class="cls-4" d="M79.51416,107.56565h3.96143v30.01367H79.51416Z"/><path class="cls-4" d="M89.2876,107.56565H93.249v30.01367H89.2876Z"/><path class="cls-4" d="M108.55127,117.77073a10.52026,10.52026,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06934,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52245,10.52245,0,0,1-7.53174-2.86816,10.03587,10.03587,0,0,1,.03272-14.39453A10.73489,10.73489,0,0,1,108.55127,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66576,6.66576,0,0,0,4.81054,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78431,6.78431,0,0,0,108.3335,121.29417Z"/></g></g></svg> | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf | pFFTMm* GDEFD OS/2gk 8 `cmapڭ rcvt ( gasp glyf}]o headM/ 6hhea
D $hmtx ` tlocao 0maxpj name, post5
webfTP T = vu vs Z 2 UKWN @ { ,
h ,
h @ ( +
/ _ "#%&&' ' )9IY`iy )9FIYiy !'9IY` * / _ "#%&&' ' 0@P`bp 0@HP`p !#0@P`fbߵiY !
| v p j d c ] W Q K E D 5 * +
/ / _ _ " " # # % % & & & & ' ' ' ' ! & ) 0 0 9 : @ I D P Y N ` ` X b i Y p y a k u } ) 0 9 @ F H I P Y ` i p y ! ! # ' 0 9 @ I P Y ` `
( ( h . /< 2< 2 /< 2< 23!%3#(@ ( d dLL [ 2 7> 32+ &/#"&/.=/&6?#"&'&546?>;'.?6 54676X&
j
j
)"&
j
j
)L
j
)"&
j
j
)"&
j
LL # 32!2 #!+"&5!"&=463!46 ^ ^ L ^ ^ p @L E 32!2+!2++"&=!"&?>;5!"&?>;&'&6;2 2?69
x
}
x
}
x
}
x
v
L
d d l
d ; 2#4.#"!!!! 32>53#"'.'#7367#73>76p<#4@9+820{dd 09B49@4# bkv$B dpd> uhi-K0! .O2d22dJtB+"0J+ku0wd/5dW% { L > G !2 +!2++"&=!"&?>;5!"&?>;4632654&#^CjB0 0BjC
x
x
u
x
u@--@$?2O*$ $*P2@%d
d
BVT@ L !2 #!"&=46 % A + 32 !546;5467.=#"&= !54&'.467>= 2cQQc2 2cQQc2 A7 7AA7 7A d[##[ [##[d d<c 2<2 c<<c 2<2 c<d 1 ,A 2632#!"&5467&546n,,.xxOqUBAwaxyrPEk d 32 !546;'&> 76!'
P ԇ
$
op zy#%**%$ p dL # 7 !2"'&6&546 6'&4#!"&762 2?62~
\l
lL
7
&
l
2 '7' &
c_"f n
&\`tfjpO 32 !546;! 22 && L %6.676.67646p'0SFO$WOHBXAO$WOHB "7Q)mr *`)nq&* ) 2 "'#'".4>" 2>4&ȶNN;)wdNNrVVVVNdy%:MNȶ[VVV d XD > .54> 0{xuX6Cy>>xC8ZvxyDH-Sv@9yUUy9@vS-H ^{ 62!2'%&7%&63 a o ^{ " 62!2'%&7%&63#7'7#'JJN a o d⋌ & 2 # #!"&=467%>="&=46X|>& f
f &>|.hK
]
]
Kh.|
L # ' + / 3 7 G K O S W !2#!"&54635)"3!2654&33535!3535!35!"3!2654&35!3535!35~
Ud
&
sdd dd d
&
d dd dL
ddd
^
ddddddddddd
^
ddddddddd LL / ? !2#!"&546)2#!"&546!2#!"&546)2#!"&5462 p m p p m p L p p p p LL / ? O _ o 32 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=462 L p p L / ? O _ 32 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=462 D D D L p p & , 62 "'&4?62 2;; n nBB # "' "/&47 &4?62 62 ; % I 2 "'#".4>" 2>4&32 32 ++"&=#"&=46;546ijMN,mwbMMoXXXX
K
K
K
KMbyl+MMijMXXX#
K
K
K
K
% 5 2 "'#".4>" 2>4&!2 #!"&=46ijMN,mwbMMoXXXXX^
Mbyl+MMijMXXX
- 32+"&5465".547 2>54&&d d [֛[ҧg|rr| p >ٸu֛[[u'>7xtrrtx d / ? 32+"&54632+"&54632+"&54632 +"&=46
ޖ
ޖ
ޖ
~
p
>
G O 2 7 '#"/&/&'7'&/&54?6?'6776?6"264X!)&1-=+PP08,2&+ !)&1-<,P
P/:-1&+x~~~P09,1&+ "(&1,=,QQ09-0&* !(&0-=,P~~~ d ! % ) - 1 !2 !2 !5463!546!5#!"&53333333,);
;),,;)D);dddddddd;)d
KK
d);ddd);;) dDDDD 62++"&5!+"&5#"&l`
j`
w
?
d 3!#!"&5463#"&=X;), R p);v L p 0 2 ".4>" 2>4&3232 +"&546֛[[֛[[rrrr|2
[֛[[֛;rrr
2
^
)#!3333))p,p, d / 3232"'&6;4632#!"&546;2 !546&
&
T2
2
>p
^
1 2 ".4>" 2>4&3232"'&6;46֛[[֛[[rrrr|
&
[֛[[֛;rrr
1 2 ".4>" 2>4&%++"&5#"&762֛[[֛[[rrrr
&[֛[[֛;rrr
9 !2#!"&'&547>!";2 ;26?>;26'.
W
&
&
W
tW
>
' 2 ".4>" 2>4&&546֛[[֛[[rrrr[֛[[֛;rrr] $ ( 76#!"&?&#" 2>53".4>32
mtrrr[֛[[u$
Lrrrtu֛[[֛[ 5 76#!"&?&#"#4>323#"'&5463!232> ntr[u[u h
ntr$ Krtu֛[u֛[v
h Lr
d / ? O _ o !2#!"&546!"3!2654&32 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=46}
R
2
2
>
2
2
>
2
2
>
2
2
>
~
R
d
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
L # 54&#!" #"3!2654&#!546;2 uSRvd);;));;) SuvR;));;)X); d LL 7 32#462#".'.#"#"'&5>76 3276}2
d!C@1 ?*'),G UKx;(.9)-E gPL
3
0[;P$
97W W ! 1 A 2 +"&54. +"&54>32+"&546!32+"&546ޣc
2
2
c* ` ct
,rr
,tޣ 4 4 G 9 %6'%&+"&546;2762 "/"/&4?'&4?62A
Xx"xx"xx"ww".
^
x"xx"ww"xx" r / %6'%&+"&546;2%3"/.7654'&6?6A
`Z HN .
^
d g~j b 1 K 3#"/.7654&'&6?6%6'%&+"&546;2%3"/.7654'&6?6 D@
*o;7 *
`Z HN iT "ZG !
^
d g~j
! % - ; ? C G K O 3#!#!#3!##5!!!!#53#533!3533##5#535#5!!#53#53#53!5!ddpddX,,ddddD dddd,D,ddddd dd,dddX d,,d,,ddd dddddd,dddddd # 7#3#3#3#3#3!5!#53#53#53ddddddd,,dddd,Pdd[[[[[
"'463&"260V
C;S;;S;V0
;;T;;
! "'463!"/ &"260V
08D;S;;S;V0
V08;;T;; d & !2&54&#!"3!2#!"&54?6,9K@
D@
K|@
@
J
L
!2 46 >> C E U !" 3!26?6'.#"#!"&/.+";26=463!2 ;2654&!"3!26/.6D N9
>SV
N
N
&
X
&
l l-
p
v
dL ! ) 1 32 32#!"&546;>35"264$2"&48]4$);;));;) '3]dϾV<<V<L);;;));;)X);E5+ddF<V<<V 5 # !526/! 3!567>?!(%
_5,Ry:" *2 8 T2*BBW-ޑY". BB %
Z d ' 2 ; #!5>54.'52 %32654.+32654&+50;* 7Xml0 ); !9uc> --Ni*S>vPR}^ 3:R.CuN7Y3(; G)IsC3[:+ 1aJ);4ePZ o !56764.'&'5mSB ,J
95(1(aaR@ 9 % / #4.+ !52>5#"#!#3'3#72 &2p"& 2KK}}KK} dd R ,১ ! % / #4.+ !52>5#"#!5!'7!5L2 &2p"& 2C১ vdd ,}KK}}KK L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=462X L L d d d d d d d d L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=46 D L D L L d d d d d d d d L / ? 5463!2 #!"&5463!2 #!"&5463!2 #!"&5463!2 #!"& X p L d d d d d d d d L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=462L L L L L d d d d d d d d L / ? O _ o 32 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=462d d A d d A d d A d d A L d d d d d d d d d d d d d d d d L # * : J !#;2 +"&=46!2 #!"&=465#535!2 #!"&=46!2 #!"&=46ddd d , X L d d d d }KdK d d d d L # * : J 32 +"&=46#3!2 #!"&=463#'7!2 #!"&=46!2 #!"&=462d d gdd /ȧ, X L d d L d d dK}} d d d d !2#!"&546 K ,, ,,,, v ,, ,D,, L !2#!"&5467'2"&4,XJ*J%pNNpNL d >tNoOOo 6 2 .'&54>"264usFE66 !^Xm)<Dsxusm?>!fhHuXyHÂ 2 ".4>" ֛[[֛[[Ktrr[֛[[֛oVrr u 5 .54> 6?6&'.'&76#&*IOWN>%3Vp}?T|J$?LWPI)(!1 ) HuwsuEG^F&:cYEvsxv!K:%A'# "
A)Y l * / 7> %!2!"3!26=7#!"&546 7l
l27);;));Ȼp87cs*
s
;) );;)2c L 6 !#"3!2657#!"&546&'5&>75>^i4);;));ȹpS 9dTX
.9I@F* L6;) );;)g
0!;bA4
L 5 !2!"3!26=7#!"&546 62 "/&4?62 2^^<C);;));ȹpeeoL;) );;)Eۥ3eeo
; 62+3546&=#32"'&6;5#'&476 35#"&>
Ȫ
ȯ
ȭ
ȭ
L 326'+"&546d 0 d L JJ L # 3266''+"&5462d 00 d L JJJJ 3 ''&47660J*J 36 &546.2 d 32+"&546!32+"&546 dL #!"&5463!2L 3 46&5&5460d * ; O # 72#"&5&5&5464646d d 12 N : 9 > = , L 32+"&5&54646Rd d 0 L ;; d H #!"&762!2 #!"&=46 * 9 H d d uJ u`((& ;(J ' 7(a#aa 3 2 ".4>#" #" ;;26=326=4&+54&֛[[֛[[}d d [֛[[֛ d d 2 ".4>!" 3!26=4&֛[[֛[[E [֛[[֛~ d d 3 2 ".4>"'&" 2?2?64/764/֛[[֛[[ xx xx xx xx [֛[[֛ xx xx xx xx $ 2 ".4>'&" 2764/&"֛[[֛[[Tw[֛[[֛1Uw ; K 2 ".4>";7>32";2>54.#" ;26=4&֛[[֛[[? <B2!
(#"3D<:
[֛[[֛ /O2 *(8\6/H*
> 2 ".4>#" ;26=4&#" ;#" 3!26=4&+4&֛[[֛[[
KK
^
K[֛[[֛V
2
2
2
/ _ 32 32 ++"&=.'#"&=46;>7546+"&=32 + 546;2 >7#"&=46;.
g
g
g
g
Df
fD
Df
f
g
g
g
g
ͨ
fD
Df
fD
Df ? 2 ".4>" 2>4&"/"/&4?'&4?62 762֛[[֛[[rrrr@||@||@||@||[֛[[֛;rrrZ@||@||@||@|| 0 2 ".4>" 2>4&"/&4?62 762֛[[֛[[rrrrjjO[֛[[֛;rrr}jjO ! 2 ".4>"&32>54֛[[֛[[KtrAKihstr[֛[[֛;rtxiKA>rts S 6!2 #!'&4'
& F
& S &5!"&=463!46
&U
&
U
# #
] #!+"&5!"&762
& &
] 32!2"'&63!46& #
U
&
U
#
& ] &5>746
^$,[~UU
&
U
#$DuMiqF
+ !2/"/&4?'&6!"&546 762 R, ^j^! ^j^ ^j^P ,^j^ I Igg + #!"&546 762!2/"/&4?'&6j^ ^ , ^j^`j^ ,^ ^j^ / 2 ".4>#" ;2676&#" ;26=4&֛[[֛[[:#6#:1
[֛[[֛ .
I U a h o 2 76?67632 ;2 +" !#!54&+"&=46;2654?67>;26/.'&;26!"&5)#! &0
=
2
pp
2
=
353
X
v
v
!{,
2
,ԯ
2
0y
r
w
+ I 6.'&&&547>7>'.>7>&67>7>7>-BlabD8=3*U :1'Ra\{% &=>8\tYR-!q[Fak[)ȕX1 "@&J< 7_?3J5%#/D &/q!! 6ROg58<'( [@1%@_U2 ] r O .>7 '&767>.'&'.'&>7 7>.'&>'
'8GB
`H
>JS>H7
'+" NA
5M[`/Pg!;( '2 "&"IbYCe\D9$ 88 6#1%)*J7gG:
8G\au9hoK $]54<<E"5cQ8
.@AU!UhQ) jF ? Q 2 ".4>&"&5476& 2>76&'&6?6&'&'.{nO9 :On{{nO: 9On{FZ
2Z__Z2 Z# %8-#,- "F-I\b\I*I\b\I--I\b\I*I\b\I9>||;7Es1$F^D10E^E$1u $/D0
"%,I ' ; L !#7.54>32737 7>76&'&% 7.5476&6?'&'.P [vY, 9On{R=A &/l'PjR.Mv& 6QFZ
*HLh5)k|# %8- ,- "xatzbI\b\I-yRU4Zrnc1?1FrEs1 <QA9
n;7p$/D0
V,I ( '6#!"&%!546;2 !32+"&/&6Z8%%
Y
YCh:#6#:d* ! GDK
K d ( 2 '% /&=47&=4674L|XkddkX>1)
]@ @]
)1ES> L ' + / 3 7 ; ? C G K O S W [ _ c 32 32 !546;546;2 !546#!"&5353353353353353533533533533535335335335335Rd 2 2 d dddddddddd|ddddddddd|ddddddddd 2 2 22 p dddddddddddddddddddddddddddddd w % 7 &=#!"&=46;3546'#"&=463!&=#'73546o Xz #z* d Xz d M*z L !2#!#"&546d);;)d);;L;));,;)X); d L ? 32 !546!32 !546".5! 2>&54= (LffL(,
'6B6' p)IjV\>((>\VjI), +'%! !%'* L 'L'a' M 7 Maa'a Q d_ ) !232"/&6;!%+!!"&5#"&?62 * * p & 0 32 !2#!!2+"&=!"&=#"&/#"&468^ & d,!0 2 * * 6 %%+ * 2 22 2
* L !53463!2!!P;),);DPdd);;) L 3463!2!!;),*:,P, pX);;)dD E k +32"/&6;#"&?62{**Y Dk &=!/&4?6 !546X`) ) ! .#!"!" 3!26=4&53353$`$-);;));;ddd-( d;)d);;)d);dddd dL # 1 2"&54%##"+"&'=454>;%".=4>7i* * d]&/T 7 " L R Q
) 2( J f , 5 32 32#"./.46;7>7'&6327"&)^Sz?v djO9t\U>/ v?zS$2451 7F8%M )(
() GM~ 1== 7'''7'7'7'77 N괴N--N괴N-N--N괴N--N괴 d ! - = 32 !2 +"&/#"&54?>335!7532+"&5462(< H(< ,F =-7`
1dd>2vd d Q,}Q,d- !2$'$ (ddw} L 0 < 32 #! +"&/&546;632+"&546!# 35'!5X, <( <(21
`7-=|d d _dd22L! -d,Qv,Q( $'$dd dԯ}w dO 7 G %6 !2+#!"&5467!>;26&#!*.'&?'32+"&546dk n
T.TlnTj :d%8
VOd d ip
&yLN(
%
H YS(22S dO 6 F #!"&'#"&463!'&6?6*#!32!7%32+"&546n
jUmlT.U
nJ
% &jPd d O
(SNLy&
pd(Y a L 7 G 2 #!"&/&?> 454& /!7%.!2 #!"&=46ސNS(
%
p
&y22SY( nTj k n
T.T8
Vd% d d - I !26=4&#!" "&5&/&7>3!276 6=467%'^ NLy&
p
(S22(SYL d d jTnlT.T
n k V
8%d % 2 ".4>%& !" 3!7%64֛[[֛[[
[֛[[֛9
& % 2 ".4>
6=!26=4&#!54&֛[[֛[[%
[֛[[֛
&
% 2 ".4>&";;265326֛[[֛[[K
&
[֛[[֛@
% 2 ".4>#"#"276&+4&֛[[֛[[
&
[֛[[֛
2 ".4>%&2 7 7>7.'.'"'&65.'6.'&767 >'&>7>7&72267.'4>&' ?6.' .'>72>՛\\՛\\d+ :
=?1 " "/ ?9
#hu !$
0 E.(,3) (
*!A 7 ,8
!?*
\՛\\՛ ' "r"v G
. &*
r $> #1
%
*
'"
$ g2( %
67'"/&47&6PM<;+oX"O\e~Y+" n+We ` # ' 7 ; !2 #!"&=46#3!2 #!"&=46!!!2 #!"&=46!!d);;));;);;));; );;));;,;)d);;)d);dd;)d);;)d);dd;)d);;)d);dd d L !2#!"&46! | ; * * D d % 32 !2!5#!463!54635#!"&=);,); ;),;);));;)d;)pdd);d);dddD);;) + A W !2"/&546)2/"/&4?'&6#!"&546 76276#!"&?'&4?622,^j^ 5, ^j^/j^ ^^ ^j^j^, ^j^&j^ ,^^ ^j # ; C K 2 ".4>" 2>4&$2"&4$2#"'"&546?&542"&4$2"&4ݟ__ݠ^^oooo-- - L- 73H3) z - - - - _ݠ^^ݟWooo -!!- -!
$33$ 1~ - - - - Z [ %676&'&#" 3276'.#"&47 7>32 #"&'&6767632 '."[v_"A0?! -
Y7J3$$
) G"#A.,=
# (wnkV8@Fv"0DG([kPHNg8B *[eb2! 5(7 >B3$$' )M"#!7)/c# *xnfL@9NDH7!$W]B$& d XD D > .54> "".#" 2>767>54&0{xuX6Cy>>xC8Zvxy#!?2-*!')-?"CoA23:+1!
"3)@ +)? jDH-Sv@9yUUy9@vS-H-&65&&56&oM8J41<*.0(@ )*D*2Om 9w . 2 &/7'/&477 "/&4? BB8" ._{iBBi
BBBBBB7 ._BB^*k" 5._{jBBFi BBBBBB77/_ 2 #!"&54>! "264d:;));<f>XV==V= .2G);;)3-D=V==V "/''!'&462 *$3, # ** #4$* ' 2 @ K #.' #5&'.'3 '.54>75 >4.&ER<,
3'@"<P7(dW(WJ.BN0 2Uh: **& h)1"37N,?iB$.,
-<d> MOW(kVMbO/9X6FpH*M 6& + 4C4% d f J 2 #4.#" 3#>36327#".'>7>'#53&'.>761T^'<;%T)-6"b "S52 68 jt&'V7 0 $ݦ
-$aPN(?" ,9J0* d2 >2
" "
7Gd/9+DAL!X 32"/&6;3+##"&?62*Ȗ*,| % #5##!32"/&6;3353!57#5!ddd,*dc,dd|ddd ! % 32"/&6;33!57#5!#5##!35*X,ddd,d,ddPddd L 32"/&6;3##53#5#!35*Xdddd,d, dPdd L 32"/&6;3#5#!35##53*d,ddd, ddd 32"/&6;3#53!5!!5!!5!*d,dpd , 32"/&6;3!5!!5!!5!#53* dpd,d, LL !2#!"&546!"3!2654&^pg );;));;Lp;) );;)); LL + !2#!"&546!"3!2654&&546^pd );;));;oLp;) );;)); $ LL + !2#!"&546!"3!2654&!2"/&6^pg );;));; $ Lp;) );;)); LL + !2#!"&546!"3!2654&#!"&?62^pg );;));; p $Lp;) );;)); L 5 !2#!"&=463!2654&#!"&=46&=#"&=46;546&p );;)> D Lp d ;)); d &
# %2"+'&7>?!"'&76 6763 , P''
K
S# nnV/ L 5 !2 #!"3!2 #!"&546&=#"&=46;546^ >);;) pD L d ;) ); d &
1 !2/"/&47'&6#"3!26=7#!"&5463! m)8m);;));Ȼp, pm)8m;) );;)֥ # 2 ".4>" 2>4&2"&4ٝ]]ٝ]]qqqq{rrr]ٝ]]ٝGqqqsrrr L # 3232"'&6;46!2 !54635
'
gd V^ | d22 L # ++"&=#"&7>!2 !54635Gz
" ' gdM ! d22 LK " 62 "'&4?62!2 !54635q gdq# d22 L # ' 762 '&476#"&?'7!2 !54635*MM К= gdML* Л: d22 L # ' /'7'&6"/&4?!2 !54635^W ЛԛL*M gd КԚPM*MX d22 % ! q3gq dL +!#"&546;!3#53L D ddd p , E / '&"!#"&546;!3#53"/&4?62 62L_ Ȗ dddj\jO)_ p ,j[jO)
> '.!#"&546;!3#53"/"/&4?'&4?62 762Lg% dddFF))FF))gp ,F))FF))F / !" !#"&546;!3#5332 32"/&6;546L dddd * p , / '&"!#"&546;!3#53++"&=#"&?62L*n ddd d *pp , L !2 !546#!"&5!52L P dL & } - 1 ; &=!5!546#"&=46;#5376 !!/&4#5;2 +p/2 2ddpddd3 3*Ȗ d Ȗ*y d d Q %6+"&5.546%2 +"&5.54>32 3<>32 34>^% "%
"
d d 1t 5 g D
> ?1) A ..@
^
^
d L 3 " !5265!3!52>54&/5!"!4"2pK Kp"2KKL8
88
%v%
88
x88
%v%
8 LL $ ( 4 !2 #5'!7!!2#!"&546!55%!5#!!'!73w ipdw%,);;));;),p, ddi bbd;) );;));df dd & 76 7> ".'.7.wfw3
.1LOefx;JwF2 1vev/ 5Cc;J|sU@ L # A 2 /.=& &=>2 #!"&=46754>ud?,
1;ftpR&m m&L!(("
""""
'$+
22 2/2
!
' !'3353353!2+!7#"&46!2 !546L J L P * dd * 22 d L #"!4&#"!4&!46;2d);,;gd);,;;)d);L;));;)D););;) L % ) !2#!"&546!#3!535#!#33||D| ,dddL| |||Dddd,ddd, L % ) !2#!"&546!#5##3353#33||D| dddddddddL| |||Dddd, L # !2#!"&546!#3!!#3!!||D| ,,L| |||Dddd L !2#!"&546!-
||D| ,L| |||D , L ) !2#!"&546!!!#";32654&#||D|dDd&96) )69&L| |||DdVAAT,TAAV L % ) !2#!"&546!#3!535#!##53#53||D| ,ddddL| |||Dddd, d d L # ' !2#!"&546!3!3##5335#53||D|DdXddd,ddL| |||Dp dd L " & !2#!"&546!#575#5!##53#53||D| d,ddddL| |||Dp2Ȗd d d % 2 ".4>" 2>4&!!!'57!۞^^۞^^qqqql,dd,^۞^^۞Lqqqddd ' + 2 ".4>" 2>4&#'##!35۞^^۞^^qqqql2dddd,^۞^^۞Lqqqd2d2ddddd A 6 2632+54&#!" #"&5467&54>3232"/&6;46n,,.xx PpVAbz
&
Awa sOEkdb
A 3 2632&"#"&5467&54>++"&5#"&76762n,+.yxZ
%
OqVAb
Awaxc hsOEkdc
d Lm %5!33 33!#" !54&#Ԫ2 dd,,Md 22 y 7 / 2 #"'2 !54635#"&547.546324&546X^Y{;2 iJ7- -7Ji/9iJqYZ=g Ji 22 iJX5Jit ' * B J b { "&'&7>2" 3276767>/&'&" 327>7>/&'&&"267" 327>76&/&" 327>76&/&oOOoSSoOOoS=y"
$GF`
Pu
"Q9 ccccVQ: Pu
"GF`
y"
$ooSWWSo++oSWW "y `FG #
uP
:Q # cccc:Q # uP
$`FG #
"y d " !#5!!463!#53'353!"&5+,
?,dԢdu
d ! ! 463!#5##5#7!"&=)+5,
?,>dԪ
|
^G
|d
77
P #3!#732 !!34>3!!ddԢ!,d!s, d,+$d$+pp LL 2 9 32 32 #!"&=46;54652#!"'74633!265#535d 2 2 s);;);)X>,>XL 2 d d 2 ;));FD);>XXԢd d L 6 = 32 32 #!"&=46;54652#3#!"&54633!265#535d 2 2 s);!);;)X>,>XL 2 d d 2 ;) $+;) );>XXԢd #!"&762#" ;2676&35} ,, }@D:#6#:&77&P'L . dd LL / ? O _ o 32 +"&=4632 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=46
L
) 3 3#!2!&/&63!5#5353!2+!7#"&46!2 !546dd^>1 B)(()B 1>^dd> J
L P dO7S33S7Odd| * dd * 22 + 5 2#4!!2!'&63!&54!2+!%5#"&46!2 !5460P9<:H)"Z"
)H J L P ;))%&!!& * * 22 $ . 2"&432!65463!2+!7#"&46!2 !546
jjj."+''+#
J L P jjj9:LkkL:9r * dd * 22 , 6 2 "&5477'632!65463!2+!7#"&46!2 !546X/[3oo"o" ."+''+#
J L P k6NooN>Qo
9:LkkL:9r * dd * 22 " , ! !.54>7!2+!7#"&46!2 !546X,%??M<=BmJ
J L P 9fQ?HSTTvK~ * dd * 22 ) 2 !546754!2#3#3#3#!"&546/R;.6p6.d6\uSpSuu;)N\6226\N)G6.dddddSuuSSu dLL / 3 !2#!"&546!2 #!"/!"&4?!"&=46!' |
%
XW
&
dDdL D
2
%
XX
%
2
ddd L # - 7 !2 #4&+"#4&+"#546!2!46+"&=!+"&= Sud;));d;));du);P; d d LuS);;));;)Su ;),); 2 22 2
!&4762 !2 !546 ' YV/ | U Y Y ( n0U 22 ! / .#!"3!26=326!546;546;332 32!'p'q * } 2 0/ 2 2 2 , 2
" !#!5463!#5!#!"&5463!#5,
w,,
v
w,
O,T
dG F V 32 676'&7>++"&?+"'+"&?&/.=46;67'&6;6#" ;26=4&KjI C
)V=>8 '"d 1*) "dT, | -otE
GAkI
! "% ,=?W7|& F@ Je5&2 WO_e_
2
2
~ $ 4 < R b %6 %32 !2 &'&#!"&=46#" ;2654&'&"2647> ?&/&6% ?6'.'.. +jCH f7 " *:>XXP* @--@- -?0
!3P/|)( )f !%
= &*
x"6 2&CX>>X 83 D -@--@ۂ
# =I+E( //} X&+ 5!H d 9 Q ` o 32 2 #+"&=#+"&=#"&=46;#"&=46;546;2 3546!2>574.#!2>574.#q
Oh ..40:* "6-@#
d
KK
d ) ) k ) )
m!mJ.M- (2N-;]<* K
KK
K
X
K
KK
"p
" ) , !2#!"&'.546"!7.# Vz$ RR (z }VG+ 0 )IU!zV`3BBWwvX Z3Vz&--% ,(1# 32#!"&546+"&=ۖgT)>)TH66g )TT)g66 33#!"&546+"&=`T)>)TH66B)TT)g66 %'5754&>?' %5%Ndd/\^^<ǔȖ
(Ab d 2"&4$2"&4$2"&4|XX|X|XX|X|XX|X X|XX|XX|XX|XX|XX| L 2"&42"&42"&4|XX|XX|XX|XX|XX|XLX|XX|X|XX|X|XX| d dLL / !2 #!"&=46!2 #!"&=46!2 #!"&=46}
J
J
J
L
p
p
/ 3 !2#!"&546!"3!2654&!2#!"&546!5^ );;)X);; G ;));;)X);d , d d dL ; !2+32+32+32#!"&46;5#"&46;5#"&46;5#"&46 22 22 22 22 22 22 L * * * * * * * * ,
* .62"&%#462"&%#46"&=32W??WW??|||||| * (CBB||||||||Ӑ B 76 +2+"47&"+".543#"&'&676 /!'.6E*
'?)
T 0I' *L
#3{,#
n
6F82 *<SC#
(#( (# % C #4.+ !52>5#"#!#4.+3#525#"#5!2 &2p"& 2D
d
2d
dd R ,
W
22
L 0 5"'./#!5"&?!##!"&=463!2 E 1;E%=
!'y ,2 "
# 22+."A2Vd d G J !2#!"&546#" 3!26=4&#"'&?!#" 3!26=4&'"'&'#L FF
& 7
?
9 9 g L R
2 2 2 2 $ # ' !5!!2#!"&546)2#!"&546!P p m p G,Ld | p d, # ' !2#!"&546!2#!"&546!!5!2 p m p G,P | p d,d d ' + !235463!2 3##!"&=##!"&546!2 d dd p d p , d , ' 3#3!2#!"&546!!2#!"&546ddd p G, | d p d, p d L ' + 32+!2#!"&5463!5#"&546;53!X | ^ d,L p d p d d, ' !#3!2#!"&546!!2#!"&546ddv p G, | d p d, p , 0o #"&54632a5* A 2~ 6'&4O ** { )) * 2A~ !2"'&6d) * * * 2,~o #!"&762{ )) *a ** (
5-5!5!Lc d 1 #3!35#5!34>;!5".532 3!,P2 &d2"d& 2dd,dd dd & , L % 1 #4.+ !52>5#"#!#3!35#5! 2 &d2p"d& 2 ,, dd & ,dd,dd frJ 32 +"'&476
0
)
J 00 > fJ 32+"&7 &6S
)
0
J )) f Jr "'&=46 4 )) w
)
0 f>J ' &=4762j 00 )
0
= : #4632 67> "&#""'./.> '&6|Vd&O "(P3G*+*3M,
:I G79_7&%*>7F1
|| 5KmCKG\JBktl$#?hI7 !2+&5#"&546!5X , p ddd L !2%!#4675'=DXDd
dQ,[u}4]dd Mo__< vs vsQ Q ( d p E H E d { d & n d d d d d d d 5 d ! u
, d ; I ] d d Q E J a d d 9 ' d d d d d y ' d d d d d d d d, d ,A 2 2 > f f * * * * NNNNNNNNNNNNNN"~Fn2b\r b b 6
(
L
0 X
*
^
h(T*v
8|t*<6`R.j(h6h^ 2 D l . v b F !2!v!"@""##"#8#z##$$0$^$$%4%`%&&~&'P''(4(p())*&*J*+
+z,,h,,- --.(.f..//F/~//0>0011`112$2^223"3>3h344`445,556>6|677N7788B889
9J99: :l::;;<<P<<=2=>:>>?(?n??@H@@AA~BBBCCBCvCCDD`DDEZEFFtFFG6GvGGHH2HNHjHHII8I^IIJJ.JR @ . j ( | L 8 x6 6 $ $4 $X | 0 www.glyphicons.com C o p y r i g h t 2 0 1 4 b y J a n K o v a r i k . A l l r i g h t s r e s e r v e d . G L Y P H I C O N S H a l f l i n g s R e g u l a r 1 . 0 0 9 ; U K W N ; G L Y P H I C O N S H a l f l i n g s - R e g u l a r G L Y P H I C O N S H a l f l i n g s R e g u l a r V e r s i o n 1 . 0 0 9 ; P S 0 0 1 . 0 0 9 ; h o t c o n v 1 . 0 . 7 0 ; m a k e o t f . l i b 2 . 5 . 5 8 3 2 9 G L Y P H I C O N S H a l f l i n g s - R e g u l a r J a n K o v a r i k J a n K o v a r i k w w w . g l y p h i c o n s . c o m w w w . g l y p h i c o n s . c o m w w w . g l y p h i c o n s . c o m W e b f o n t 1 . 0 W e d O c t 2 9 0 6 : 3 6 : 0 7 2 0 1 4 F o n t S q u i r r e l 2
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
glyph1glyph2uni00A0uni2000uni2001uni2002uni2003uni2004uni2005uni2006uni2007uni2008uni2009uni200Auni202Funi205FEurouni20BDuni231Buni25FCuni2601uni26FAuni2709uni270FuniE001uniE002uniE003uniE005uniE006uniE007uniE008uniE009uniE010uniE011uniE012uniE013uniE014uniE015uniE016uniE017uniE018uniE019uniE020uniE021uniE022uniE023uniE024uniE025uniE026uniE027uniE028uniE029uniE030uniE031uniE032uniE033uniE034uniE035uniE036uniE037uniE038uniE039uniE040uniE041uniE042uniE043uniE044uniE045uniE046uniE047uniE048uniE049uniE050uniE051uniE052uniE053uniE054uniE055uniE056uniE057uniE058uniE059uniE060uniE062uniE063uniE064uniE065uniE066uniE067uniE068uniE069uniE070uniE071uniE072uniE073uniE074uniE075uniE076uniE077uniE078uniE079uniE080uniE081uniE082uniE083uniE084uniE085uniE086uniE087uniE088uniE089uniE090uniE091uniE092uniE093uniE094uniE095uniE096uniE097uniE101uniE102uniE103uniE104uniE105uniE106uniE107uniE108uniE109uniE110uniE111uniE112uniE113uniE114uniE115uniE116uniE117uniE118uniE119uniE120uniE121uniE122uniE123uniE124uniE125uniE126uniE127uniE128uniE129uniE130uniE131uniE132uniE133uniE134uniE135uniE136uniE137uniE138uniE139uniE140uniE141uniE142uniE143uniE144uniE145uniE146uniE148uniE149uniE150uniE151uniE152uniE153uniE154uniE155uniE156uniE157uniE158uniE159uniE160uniE161uniE162uniE163uniE164uniE165uniE166uniE167uniE168uniE169uniE170uniE171uniE172uniE173uniE174uniE175uniE176uniE177uniE178uniE179uniE180uniE181uniE182uniE183uniE184uniE185uniE186uniE187uniE188uniE189uniE190uniE191uniE192uniE193uniE194uniE195uniE197uniE198uniE199uniE200uniE201uniE202uniE203uniE204uniE205uniE206uniE209uniE210uniE211uniE212uniE213uniE214uniE215uniE216uniE218uniE219uniE221uniE223uniE224uniE225uniE226uniE227uniE230uniE231uniE232uniE233uniE234uniE235uniE236uniE237uniE238uniE239uniE240uniE241uniE242uniE243uniE244uniE245uniE246uniE247uniE248uniE249uniE250uniE251uniE252uniE253uniE254uniE255uniE256uniE257uniE258uniE259uniE260uniF8FFu1F511u1F6AA TP | pFFTMm* GDEFD OS/2gk 8 `cmapڭ rcvt ( gasp glyf}]o headM/ 6hhea
D $hmtx ` tlocao 0maxpj name, post5
webfTP T = vu vs Z 2 UKWN @ { ,
h ,
h @ ( +
/ _ "#%&&' ' )9IY`iy )9FIYiy !'9IY` * / _ "#%&&' ' 0@P`bp 0@HP`p !#0@P`fbߵiY !
| v p j d c ] W Q K E D 5 * +
/ / _ _ " " # # % % & & & & ' ' ' ' ! & ) 0 0 9 : @ I D P Y N ` ` X b i Y p y a k u } ) 0 9 @ F H I P Y ` i p y ! ! # ' 0 9 @ I P Y ` `
( ( h . /< 2< 2 /< 2< 23!%3#(@ ( d dLL [ 2 7> 32+ &/#"&/.=/&6?#"&'&546?>;'.?6 54676X&
j
j
)"&
j
j
)L
j
)"&
j
j
)"&
j
LL # 32!2 #!+"&5!"&=463!46 ^ ^ L ^ ^ p @L E 32!2+!2++"&=!"&?>;5!"&?>;&'&6;2 2?69
x
}
x
}
x
}
x
v
L
d d l
d ; 2#4.#"!!!! 32>53#"'.'#7367#73>76p<#4@9+820{dd 09B49@4# bkv$B dpd> uhi-K0! .O2d22dJtB+"0J+ku0wd/5dW% { L > G !2 +!2++"&=!"&?>;5!"&?>;4632654&#^CjB0 0BjC
x
x
u
x
u@--@$?2O*$ $*P2@%d
d
BVT@ L !2 #!"&=46 % A + 32 !546;5467.=#"&= !54&'.467>= 2cQQc2 2cQQc2 A7 7AA7 7A d[##[ [##[d d<c 2<2 c<<c 2<2 c<d 1 ,A 2632#!"&5467&546n,,.xxOqUBAwaxyrPEk d 32 !546;'&> 76!'
P ԇ
$
op zy#%**%$ p dL # 7 !2"'&6&546 6'&4#!"&762 2?62~
\l
lL
7
&
l
2 '7' &
c_"f n
&\`tfjpO 32 !546;! 22 && L %6.676.67646p'0SFO$WOHBXAO$WOHB "7Q)mr *`)nq&* ) 2 "'#'".4>" 2>4&ȶNN;)wdNNrVVVVNdy%:MNȶ[VVV d XD > .54> 0{xuX6Cy>>xC8ZvxyDH-Sv@9yUUy9@vS-H ^{ 62!2'%&7%&63 a o ^{ " 62!2'%&7%&63#7'7#'JJN a o d⋌ & 2 # #!"&=467%>="&=46X|>& f
f &>|.hK
]
]
Kh.|
L # ' + / 3 7 G K O S W !2#!"&54635)"3!2654&33535!3535!35!"3!2654&35!3535!35~
Ud
&
sdd dd d
&
d dd dL
ddd
^
ddddddddddd
^
ddddddddd LL / ? !2#!"&546)2#!"&546!2#!"&546)2#!"&5462 p m p p m p L p p p p LL / ? O _ o 32 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=462 L p p L / ? O _ 32 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=462 D D D L p p & , 62 "'&4?62 2;; n nBB # "' "/&47 &4?62 62 ; % I 2 "'#".4>" 2>4&32 32 ++"&=#"&=46;546ijMN,mwbMMoXXXX
K
K
K
KMbyl+MMijMXXX#
K
K
K
K
% 5 2 "'#".4>" 2>4&!2 #!"&=46ijMN,mwbMMoXXXXX^
Mbyl+MMijMXXX
- 32+"&5465".547 2>54&&d d [֛[ҧg|rr| p >ٸu֛[[u'>7xtrrtx d / ? 32+"&54632+"&54632+"&54632 +"&=46
ޖ
ޖ
ޖ
~
p
>
G O 2 7 '#"/&/&'7'&/&54?6?'6776?6"264X!)&1-=+PP08,2&+ !)&1-<,P
P/:-1&+x~~~P09,1&+ "(&1,=,QQ09-0&* !(&0-=,P~~~ d ! % ) - 1 !2 !2 !5463!546!5#!"&53333333,);
;),,;)D);dddddddd;)d
KK
d);ddd);;) dDDDD 62++"&5!+"&5#"&l`
j`
w
?
d 3!#!"&5463#"&=X;), R p);v L p 0 2 ".4>" 2>4&3232 +"&546֛[[֛[[rrrr|2
[֛[[֛;rrr
2
^
)#!3333))p,p, d / 3232"'&6;4632#!"&546;2 !546&
&
T2
2
>p
^
1 2 ".4>" 2>4&3232"'&6;46֛[[֛[[rrrr|
&
[֛[[֛;rrr
1 2 ".4>" 2>4&%++"&5#"&762֛[[֛[[rrrr
&[֛[[֛;rrr
9 !2#!"&'&547>!";2 ;26?>;26'.
W
&
&
W
tW
>
' 2 ".4>" 2>4&&546֛[[֛[[rrrr[֛[[֛;rrr] $ ( 76#!"&?&#" 2>53".4>32
mtrrr[֛[[u$
Lrrrtu֛[[֛[ 5 76#!"&?&#"#4>323#"'&5463!232> ntr[u[u h
ntr$ Krtu֛[u֛[v
h Lr
d / ? O _ o !2#!"&546!"3!2654&32 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=4632 +"&=463!2 #!"&=46}
R
2
2
>
2
2
>
2
2
>
2
2
>
~
R
d
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
L # 54&#!" #"3!2654&#!546;2 uSRvd);;));;) SuvR;));;)X); d LL 7 32#462#".'.#"#"'&5>76 3276}2
d!C@1 ?*'),G UKx;(.9)-E gPL
3
0[;P$
97W W ! 1 A 2 +"&54. +"&54>32+"&546!32+"&546ޣc
2
2
c* ` ct
,rr
,tޣ 4 4 G 9 %6'%&+"&546;2762 "/"/&4?'&4?62A
Xx"xx"xx"ww".
^
x"xx"ww"xx" r / %6'%&+"&546;2%3"/.7654'&6?6A
`Z HN .
^
d g~j b 1 K 3#"/.7654&'&6?6%6'%&+"&546;2%3"/.7654'&6?6 D@
*o;7 *
`Z HN iT "ZG !
^
d g~j
! % - ; ? C G K O 3#!#!#3!##5!!!!#53#533!3533##5#535#5!!#53#53#53!5!ddpddX,,ddddD dddd,D,ddddd dd,dddX d,,d,,ddd dddddd,dddddd # 7#3#3#3#3#3!5!#53#53#53ddddddd,,dddd,Pdd[[[[[
"'463&"260V
C;S;;S;V0
;;T;;
! "'463!"/ &"260V
08D;S;;S;V0
V08;;T;; d & !2&54&#!"3!2#!"&54?6,9K@
D@
K|@
@
J
L
!2 46 >> C E U !" 3!26?6'.#"#!"&/.+";26=463!2 ;2654&!"3!26/.6D N9
>SV
N
N
&
X
&
l l-
p
v
dL ! ) 1 32 32#!"&546;>35"264$2"&48]4$);;));;) '3]dϾV<<V<L);;;));;)X);E5+ddF<V<<V 5 # !526/! 3!567>?!(%
_5,Ry:" *2 8 T2*BBW-ޑY". BB %
Z d ' 2 ; #!5>54.'52 %32654.+32654&+50;* 7Xml0 ); !9uc> --Ni*S>vPR}^ 3:R.CuN7Y3(; G)IsC3[:+ 1aJ);4ePZ o !56764.'&'5mSB ,J
95(1(aaR@ 9 % / #4.+ !52>5#"#!#3'3#72 &2p"& 2KK}}KK} dd R ,১ ! % / #4.+ !52>5#"#!5!'7!5L2 &2p"& 2C১ vdd ,}KK}}KK L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=462X L L d d d d d d d d L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=46 D L D L L d d d d d d d d L / ? 5463!2 #!"&5463!2 #!"&5463!2 #!"&5463!2 #!"& X p L d d d d d d d d L / ? !2 #!"&=46!2 #!"&=46!2 #!"&=46!2 #!"&=462L L L L L d d d d d d d d L / ? O _ o 32 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=4632 +"&=46)2 #!"&=462d d A d d A d d A d d A L d d d d d d d d d d d d d d d d L # * : J !#;2 +"&=46!2 #!"&=465#535!2 #!"&=46!2 #!"&=46ddd d , X L d d d d }KdK d d d d L # * : J 32 +"&=46#3!2 #!"&=463#'7!2 #!"&=46!2 #!"&=462d d gdd /ȧ, X L d d L d d dK}} d d d d !2#!"&546 K ,, ,,,, v ,, ,D,, L !2#!"&5467'2"&4,XJ*J%pNNpNL d >tNoOOo 6 2 .'&54>"264usFE66 !^Xm)<Dsxusm?>!fhHuXyHÂ 2 ".4>" ֛[[֛[[Ktrr[֛[[֛oVrr u 5 .54> 6?6&'.'&76#&*IOWN>%3Vp}?T|J$?LWPI)(!1 ) HuwsuEG^F&:cYEvsxv!K:%A'# "
A)Y l * / 7> %!2!"3!26=7#!"&546 7l
l27);;));Ȼp87cs*
s
;) );;)2c L 6 !#"3!2657#!"&546&'5&>75>^i4);;));ȹpS 9dTX
.9I@F* L6;) );;)g
0!;bA4
L 5 !2!"3!26=7#!"&546 62 "/&4?62 2^^<C);;));ȹpeeoL;) );;)Eۥ3eeo
; 62+3546&=#32"'&6;5#'&476 35#"&>
Ȫ
ȯ
ȭ
ȭ
L 326'+"&546d 0 d L JJ L # 3266''+"&5462d 00 d L JJJJ 3 ''&47660J*J 36 &546.2 d 32+"&546!32+"&546 dL #!"&5463!2L 3 46&5&5460d * ; O # 72#"&5&5&5464646d d 12 N : 9 > = , L 32+"&5&54646Rd d 0 L ;; d H #!"&762!2 #!"&=46 * 9 H d d uJ u`((& ;(J ' 7(a#aa 3 2 ".4>#" #" ;;26=326=4&+54&֛[[֛[[}d d [֛[[֛ d d 2 ".4>!" 3!26=4&֛[[֛[[E [֛[[֛~ d d 3 2 ".4>"'&" 2?2?64/764/֛[[֛[[ xx xx xx xx [֛[[֛ xx xx xx xx $ 2 ".4>'&" 2764/&"֛[[֛[[Tw[֛[[֛1Uw ; K 2 ".4>";7>32";2>54.#" ;26=4&֛[[֛[[? <B2!
(#"3D<:
[֛[[֛ /O2 *(8\6/H*
> 2 ".4>#" ;26=4&#" ;#" 3!26=4&+4&֛[[֛[[
KK
^
K[֛[[֛V
2
2
2
/ _ 32 32 ++"&=.'#"&=46;>7546+"&=32 + 546;2 >7#"&=46;.
g
g
g
g
Df
fD
Df
f
g
g
g
g
ͨ
fD
Df
fD
Df ? 2 ".4>" 2>4&"/"/&4?'&4?62 762֛[[֛[[rrrr@||@||@||@||[֛[[֛;rrrZ@||@||@||@|| 0 2 ".4>" 2>4&"/&4?62 762֛[[֛[[rrrrjjO[֛[[֛;rrr}jjO ! 2 ".4>"&32>54֛[[֛[[KtrAKihstr[֛[[֛;rtxiKA>rts S 6!2 #!'&4'
& F
& S &5!"&=463!46
&U
&
U
# #
] #!+"&5!"&762
& &
] 32!2"'&63!46& #
U
&
U
#
& ] &5>746
^$,[~UU
&
U
#$DuMiqF
+ !2/"/&4?'&6!"&546 762 R, ^j^! ^j^ ^j^P ,^j^ I Igg + #!"&546 762!2/"/&4?'&6j^ ^ , ^j^`j^ ,^ ^j^ / 2 ".4>#" ;2676&#" ;26=4&֛[[֛[[:#6#:1
[֛[[֛ .
I U a h o 2 76?67632 ;2 +" !#!54&+"&=46;2654?67>;26/.'&;26!"&5)#! &0
=
2
pp
2
=
353
X
v
v
!{,
2
,ԯ
2
0y
r
w
+ I 6.'&&&547>7>'.>7>&67>7>7>-BlabD8=3*U :1'Ra\{% &=>8\tYR-!q[Fak[)ȕX1 "@&J< 7_?3J5%#/D &/q!! 6ROg58<'( [@1%@_U2 ] r O .>7 '&767>.'&'.'&>7 7>.'&>'
'8GB
`H
>JS>H7
'+" NA
5M[`/Pg!;( '2 "&"IbYCe\D9$ 88 6#1%)*J7gG:
8G\au9hoK $]54<<E"5cQ8
.@AU!UhQ) jF ? Q 2 ".4>&"&5476& 2>76&'&6?6&'&'.{nO9 :On{{nO: 9On{FZ
2Z__Z2 Z# %8-#,- "F-I\b\I*I\b\I--I\b\I*I\b\I9>||;7Es1$F^D10E^E$1u $/D0
"%,I ' ; L !#7.54>32737 7>76&'&% 7.5476&6?'&'.P [vY, 9On{R=A &/l'PjR.Mv& 6QFZ
*HLh5)k|# %8- ,- "xatzbI\b\I-yRU4Zrnc1?1FrEs1 <QA9
n;7p$/D0
V,I ( '6#!"&%!546;2 !32+"&/&6Z8%%
Y
YCh:#6#:d* ! GDK
K d ( 2 '% /&=47&=4674L|XkddkX>1)
]@ @]
)1ES> L ' + / 3 7 ; ? C G K O S W [ _ c 32 32 !546;546;2 !546#!"&5353353353353353533533533533535335335335335Rd 2 2 d dddddddddd|ddddddddd|ddddddddd 2 2 22 p dddddddddddddddddddddddddddddd w % 7 &=#!"&=46;3546'#"&=463!&=#'73546o Xz #z* d Xz d M*z L !2#!#"&546d);;)d);;L;));,;)X); d L ? 32 !546!32 !546".5! 2>&54= (LffL(,
'6B6' p)IjV\>((>\VjI), +'%! !%'* L 'L'a' M 7 Maa'a Q d_ ) !232"/&6;!%+!!"&5#"&?62 * * p & 0 32 !2#!!2+"&=!"&=#"&/#"&468^ & d,!0 2 * * 6 %%+ * 2 22 2
* L !53463!2!!P;),);DPdd);;) L 3463!2!!;),*:,P, pX);;)dD E k +32"/&6;#"&?62{**Y Dk &=!/&4?6 !546X`) ) ! .#!"!" 3!26=4&53353$`$-);;));;ddd-( d;)d);;)d);dddd dL # 1 2"&54%##"+"&'=454>;%".=4>7i* * d]&/T 7 " L R Q
) 2( J f , 5 32 32#"./.46;7>7'&6327"&)^Sz?v djO9t\U>/ v?zS$2451 7F8%M )(
() GM~ 1== 7'''7'7'7'77 N괴N--N괴N-N--N괴N--N괴 d ! - = 32 !2 +"&/#"&54?>335!7532+"&5462(< H(< ,F =-7`
1dd>2vd d Q,}Q,d- !2$'$ (ddw} L 0 < 32 #! +"&/&546;632+"&546!# 35'!5X, <( <(21
`7-=|d d _dd22L! -d,Qv,Q( $'$dd dԯ}w dO 7 G %6 !2+#!"&5467!>;26&#!*.'&?'32+"&546dk n
T.TlnTj :d%8
VOd d ip
&yLN(
%
H YS(22S dO 6 F #!"&'#"&463!'&6?6*#!32!7%32+"&546n
jUmlT.U
nJ
% &jPd d O
(SNLy&
pd(Y a L 7 G 2 #!"&/&?> 454& /!7%.!2 #!"&=46ސNS(
%
p
&y22SY( nTj k n
T.T8
Vd% d d - I !26=4&#!" "&5&/&7>3!276 6=467%'^ NLy&
p
(S22(SYL d d jTnlT.T
n k V
8%d % 2 ".4>%& !" 3!7%64֛[[֛[[
[֛[[֛9
& % 2 ".4>
6=!26=4&#!54&֛[[֛[[%
[֛[[֛
&
% 2 ".4>&";;265326֛[[֛[[K
&
[֛[[֛@
% 2 ".4>#"#"276&+4&֛[[֛[[
&
[֛[[֛
2 ".4>%&2 7 7>7.'.'"'&65.'6.'&767 >'&>7>7&72267.'4>&' ?6.' .'>72>՛\\՛\\d+ :
=?1 " "/ ?9
#hu !$
0 E.(,3) (
*!A 7 ,8
!?*
\՛\\՛ ' "r"v G
. &*
r $> #1
%
*
'"
$ g2( %
67'"/&47&6PM<;+oX"O\e~Y+" n+We ` # ' 7 ; !2 #!"&=46#3!2 #!"&=46!!!2 #!"&=46!!d);;));;);;));; );;));;,;)d);;)d);dd;)d);;)d);dd;)d);;)d);dd d L !2#!"&46! | ; * * D d % 32 !2!5#!463!54635#!"&=);,); ;),;);));;)d;)pdd);d);dddD);;) + A W !2"/&546)2/"/&4?'&6#!"&546 76276#!"&?'&4?622,^j^ 5, ^j^/j^ ^^ ^j^j^, ^j^&j^ ,^^ ^j # ; C K 2 ".4>" 2>4&$2"&4$2#"'"&546?&542"&4$2"&4ݟ__ݠ^^oooo-- - L- 73H3) z - - - - _ݠ^^ݟWooo -!!- -!
$33$ 1~ - - - - Z [ %676&'&#" 3276'.#"&47 7>32 #"&'&6767632 '."[v_"A0?! -
Y7J3$$
) G"#A.,=
# (wnkV8@Fv"0DG([kPHNg8B *[eb2! 5(7 >B3$$' )M"#!7)/c# *xnfL@9NDH7!$W]B$& d XD D > .54> "".#" 2>767>54&0{xuX6Cy>>xC8Zvxy#!?2-*!')-?"CoA23:+1!
"3)@ +)? jDH-Sv@9yUUy9@vS-H-&65&&56&oM8J41<*.0(@ )*D*2Om 9w . 2 &/7'/&477 "/&4? BB8" ._{iBBi
BBBBBB7 ._BB^*k" 5._{jBBFi BBBBBB77/_ 2 #!"&54>! "264d:;));<f>XV==V= .2G);;)3-D=V==V "/''!'&462 *$3, # ** #4$* ' 2 @ K #.' #5&'.'3 '.54>75 >4.&ER<,
3'@"<P7(dW(WJ.BN0 2Uh: **& h)1"37N,?iB$.,
-<d> MOW(kVMbO/9X6FpH*M 6& + 4C4% d f J 2 #4.#" 3#>36327#".'>7>'#53&'.>761T^'<;%T)-6"b "S52 68 jt&'V7 0 $ݦ
-$aPN(?" ,9J0* d2 >2
" "
7Gd/9+DAL!X 32"/&6;3+##"&?62*Ȗ*,| % #5##!32"/&6;3353!57#5!ddd,*dc,dd|ddd ! % 32"/&6;33!57#5!#5##!35*X,ddd,d,ddPddd L 32"/&6;3##53#5#!35*Xdddd,d, dPdd L 32"/&6;3#5#!35##53*d,ddd, ddd 32"/&6;3#53!5!!5!!5!*d,dpd , 32"/&6;3!5!!5!!5!#53* dpd,d, LL !2#!"&546!"3!2654&^pg );;));;Lp;) );;)); LL + !2#!"&546!"3!2654&&546^pd );;));;oLp;) );;)); $ LL + !2#!"&546!"3!2654&!2"/&6^pg );;));; $ Lp;) );;)); LL + !2#!"&546!"3!2654&#!"&?62^pg );;));; p $Lp;) );;)); L 5 !2#!"&=463!2654&#!"&=46&=#"&=46;546&p );;)> D Lp d ;)); d &
# %2"+'&7>?!"'&76 6763 , P''
K
S# nnV/ L 5 !2 #!"3!2 #!"&546&=#"&=46;546^ >);;) pD L d ;) ); d &
1 !2/"/&47'&6#"3!26=7#!"&5463! m)8m);;));Ȼp, pm)8m;) );;)֥ # 2 ".4>" 2>4&2"&4ٝ]]ٝ]]qqqq{rrr]ٝ]]ٝGqqqsrrr L # 3232"'&6;46!2 !54635
'
gd V^ | d22 L # ++"&=#"&7>!2 !54635Gz
" ' gdM ! d22 LK " 62 "'&4?62!2 !54635q gdq# d22 L # ' 762 '&476#"&?'7!2 !54635*MM К= gdML* Л: d22 L # ' /'7'&6"/&4?!2 !54635^W ЛԛL*M gd КԚPM*MX d22 % ! q3gq dL +!#"&546;!3#53L D ddd p , E / '&"!#"&546;!3#53"/&4?62 62L_ Ȗ dddj\jO)_ p ,j[jO)
> '.!#"&546;!3#53"/"/&4?'&4?62 762Lg% dddFF))FF))gp ,F))FF))F / !" !#"&546;!3#5332 32"/&6;546L dddd * p , / '&"!#"&546;!3#53++"&=#"&?62L*n ddd d *pp , L !2 !546#!"&5!52L P dL & } - 1 ; &=!5!546#"&=46;#5376 !!/&4#5;2 +p/2 2ddpddd3 3*Ȗ d Ȗ*y d d Q %6+"&5.546%2 +"&5.54>32 3<>32 34>^% "%
"
d d 1t 5 g D
> ?1) A ..@
^
^
d L 3 " !5265!3!52>54&/5!"!4"2pK Kp"2KKL8
88
%v%
88
x88
%v%
8 LL $ ( 4 !2 #5'!7!!2#!"&546!55%!5#!!'!73w ipdw%,);;));;),p, ddi bbd;) );;));df dd & 76 7> ".'.7.wfw3
.1LOefx;JwF2 1vev/ 5Cc;J|sU@ L # A 2 /.=& &=>2 #!"&=46754>ud?,
1;ftpR&m m&L!(("
""""
'$+
22 2/2
!
' !'3353353!2+!7#"&46!2 !546L J L P * dd * 22 d L #"!4&#"!4&!46;2d);,;gd);,;;)d);L;));;)D););;) L % ) !2#!"&546!#3!535#!#33||D| ,dddL| |||Dddd,ddd, L % ) !2#!"&546!#5##3353#33||D| dddddddddL| |||Dddd, L # !2#!"&546!#3!!#3!!||D| ,,L| |||Dddd L !2#!"&546!-
||D| ,L| |||D , L ) !2#!"&546!!!#";32654&#||D|dDd&96) )69&L| |||DdVAAT,TAAV L % ) !2#!"&546!#3!535#!##53#53||D| ,ddddL| |||Dddd, d d L # ' !2#!"&546!3!3##5335#53||D|DdXddd,ddL| |||Dp dd L " & !2#!"&546!#575#5!##53#53||D| d,ddddL| |||Dp2Ȗd d d % 2 ".4>" 2>4&!!!'57!۞^^۞^^qqqql,dd,^۞^^۞Lqqqddd ' + 2 ".4>" 2>4&#'##!35۞^^۞^^qqqql2dddd,^۞^^۞Lqqqd2d2ddddd A 6 2632+54&#!" #"&5467&54>3232"/&6;46n,,.xx PpVAbz
&
Awa sOEkdb
A 3 2632&"#"&5467&54>++"&5#"&76762n,+.yxZ
%
OqVAb
Awaxc hsOEkdc
d Lm %5!33 33!#" !54&#Ԫ2 dd,,Md 22 y 7 / 2 #"'2 !54635#"&547.546324&546X^Y{;2 iJ7- -7Ji/9iJqYZ=g Ji 22 iJX5Jit ' * B J b { "&'&7>2" 3276767>/&'&" 327>7>/&'&&"267" 327>76&/&" 327>76&/&oOOoSSoOOoS=y"
$GF`
Pu
"Q9 ccccVQ: Pu
"GF`
y"
$ooSWWSo++oSWW "y `FG #
uP
:Q # cccc:Q # uP
$`FG #
"y d " !#5!!463!#53'353!"&5+,
?,dԢdu
d ! ! 463!#5##5#7!"&=)+5,
?,>dԪ
|
^G
|d
77
P #3!#732 !!34>3!!ddԢ!,d!s, d,+$d$+pp LL 2 9 32 32 #!"&=46;54652#!"'74633!265#535d 2 2 s);;);)X>,>XL 2 d d 2 ;));FD);>XXԢd d L 6 = 32 32 #!"&=46;54652#3#!"&54633!265#535d 2 2 s);!);;)X>,>XL 2 d d 2 ;) $+;) );>XXԢd #!"&762#" ;2676&35} ,, }@D:#6#:&77&P'L . dd LL / ? O _ o 32 +"&=4632 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=4632 +"&=46!32 +"&=46!32 +"&=46
L
) 3 3#!2!&/&63!5#5353!2+!7#"&46!2 !546dd^>1 B)(()B 1>^dd> J
L P dO7S33S7Odd| * dd * 22 + 5 2#4!!2!'&63!&54!2+!%5#"&46!2 !5460P9<:H)"Z"
)H J L P ;))%&!!& * * 22 $ . 2"&432!65463!2+!7#"&46!2 !546
jjj."+''+#
J L P jjj9:LkkL:9r * dd * 22 , 6 2 "&5477'632!65463!2+!7#"&46!2 !546X/[3oo"o" ."+''+#
J L P k6NooN>Qo
9:LkkL:9r * dd * 22 " , ! !.54>7!2+!7#"&46!2 !546X,%??M<=BmJ
J L P 9fQ?HSTTvK~ * dd * 22 ) 2 !546754!2#3#3#3#!"&546/R;.6p6.d6\uSpSuu;)N\6226\N)G6.dddddSuuSSu dLL / 3 !2#!"&546!2 #!"/!"&4?!"&=46!' |
%
XW
&
dDdL D
2
%
XX
%
2
ddd L # - 7 !2 #4&+"#4&+"#546!2!46+"&=!+"&= Sud;));d;));du);P; d d LuS);;));;)Su ;),); 2 22 2
!&4762 !2 !546 ' YV/ | U Y Y ( n0U 22 ! / .#!"3!26=326!546;546;332 32!'p'q * } 2 0/ 2 2 2 , 2
" !#!5463!#5!#!"&5463!#5,
w,,
v
w,
O,T
dG F V 32 676'&7>++"&?+"'+"&?&/.=46;67'&6;6#" ;26=4&KjI C
)V=>8 '"d 1*) "dT, | -otE
GAkI
! "% ,=?W7|& F@ Je5&2 WO_e_
2
2
~ $ 4 < R b %6 %32 !2 &'&#!"&=46#" ;2654&'&"2647> ?&/&6% ?6'.'.. +jCH f7 " *:>XXP* @--@- -?0
!3P/|)( )f !%
= &*
x"6 2&CX>>X 83 D -@--@ۂ
# =I+E( //} X&+ 5!H d 9 Q ` o 32 2 #+"&=#+"&=#"&=46;#"&=46;546;2 3546!2>574.#!2>574.#q
Oh ..40:* "6-@#
d
KK
d ) ) k ) )
m!mJ.M- (2N-;]<* K
KK
K
X
K
KK
"p
" ) , !2#!"&'.546"!7.# Vz$ RR (z }VG+ 0 )IU!zV`3BBWwvX Z3Vz&--% ,(1# 32#!"&546+"&=ۖgT)>)TH66g )TT)g66 33#!"&546+"&=`T)>)TH66B)TT)g66 %'5754&>?' %5%Ndd/\^^<ǔȖ
(Ab d 2"&4$2"&4$2"&4|XX|X|XX|X|XX|X X|XX|XX|XX|XX|XX| L 2"&42"&42"&4|XX|XX|XX|XX|XX|XLX|XX|X|XX|X|XX| d dLL / !2 #!"&=46!2 #!"&=46!2 #!"&=46}
J
J
J
L
p
p
/ 3 !2#!"&546!"3!2654&!2#!"&546!5^ );;)X);; G ;));;)X);d , d d dL ; !2+32+32+32#!"&46;5#"&46;5#"&46;5#"&46 22 22 22 22 22 22 L * * * * * * * * ,
* .62"&%#462"&%#46"&=32W??WW??|||||| * (CBB||||||||Ӑ B 76 +2+"47&"+".543#"&'&676 /!'.6E*
'?)
T 0I' *L
#3{,#
n
6F82 *<SC#
(#( (# % C #4.+ !52>5#"#!#4.+3#525#"#5!2 &2p"& 2D
d
2d
dd R ,
W
22
L 0 5"'./#!5"&?!##!"&=463!2 E 1;E%=
!'y ,2 "
# 22+."A2Vd d G J !2#!"&546#" 3!26=4&#"'&?!#" 3!26=4&'"'&'#L FF
& 7
?
9 9 g L R
2 2 2 2 $ # ' !5!!2#!"&546)2#!"&546!P p m p G,Ld | p d, # ' !2#!"&546!2#!"&546!!5!2 p m p G,P | p d,d d ' + !235463!2 3##!"&=##!"&546!2 d dd p d p , d , ' 3#3!2#!"&546!!2#!"&546ddd p G, | d p d, p d L ' + 32+!2#!"&5463!5#"&546;53!X | ^ d,L p d p d d, ' !#3!2#!"&546!!2#!"&546ddv p G, | d p d, p , 0o #"&54632a5* A 2~ 6'&4O ** { )) * 2A~ !2"'&6d) * * * 2,~o #!"&762{ )) *a ** (
5-5!5!Lc d 1 #3!35#5!34>;!5".532 3!,P2 &d2"d& 2dd,dd dd & , L % 1 #4.+ !52>5#"#!#3!35#5! 2 &d2p"d& 2 ,, dd & ,dd,dd frJ 32 +"'&476
0
)
J 00 > fJ 32+"&7 &6S
)
0
J )) f Jr "'&=46 4 )) w
)
0 f>J ' &=4762j 00 )
0
= : #4632 67> "&#""'./.> '&6|Vd&O "(P3G*+*3M,
:I G79_7&%*>7F1
|| 5KmCKG\JBktl$#?hI7 !2+&5#"&546!5X , p ddd L !2%!#4675'=DXDd
dQ,[u}4]dd Mo__< vs vsQ Q ( d p E H E d { d & n d d d d d d d 5 d ! u
, d ; I ] d d Q E J a d d 9 ' d d d d d y ' d d d d d d d d, d ,A 2 2 > f f * * * * NNNNNNNNNNNNNN"~Fn2b\r b b 6
(
L
0 X
*
^
h(T*v
8|t*<6`R.j(h6h^ 2 D l . v b F !2!v!"@""##"#8#z##$$0$^$$%4%`%&&~&'P''(4(p())*&*J*+
+z,,h,,- --.(.f..//F/~//0>0011`112$2^223"3>3h344`445,556>6|677N7788B889
9J99: :l::;;<<P<<=2=>:>>?(?n??@H@@AA~BBBCCBCvCCDD`DDEZEFFtFFG6GvGGHH2HNHjHHII8I^IIJJ.JR @ . j ( | L 8 x6 6 $ $4 $X | 0 www.glyphicons.com C o p y r i g h t 2 0 1 4 b y J a n K o v a r i k . A l l r i g h t s r e s e r v e d . G L Y P H I C O N S H a l f l i n g s R e g u l a r 1 . 0 0 9 ; U K W N ; G L Y P H I C O N S H a l f l i n g s - R e g u l a r G L Y P H I C O N S H a l f l i n g s R e g u l a r V e r s i o n 1 . 0 0 9 ; P S 0 0 1 . 0 0 9 ; h o t c o n v 1 . 0 . 7 0 ; m a k e o t f . l i b 2 . 5 . 5 8 3 2 9 G L Y P H I C O N S H a l f l i n g s - R e g u l a r J a n K o v a r i k J a n K o v a r i k w w w . g l y p h i c o n s . c o m w w w . g l y p h i c o n s . c o m w w w . g l y p h i c o n s . c o m W e b f o n t 1 . 0 W e d O c t 2 9 0 6 : 3 6 : 0 7 2 0 1 4 F o n t S q u i r r e l 2
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
glyph1glyph2uni00A0uni2000uni2001uni2002uni2003uni2004uni2005uni2006uni2007uni2008uni2009uni200Auni202Funi205FEurouni20BDuni231Buni25FCuni2601uni26FAuni2709uni270FuniE001uniE002uniE003uniE005uniE006uniE007uniE008uniE009uniE010uniE011uniE012uniE013uniE014uniE015uniE016uniE017uniE018uniE019uniE020uniE021uniE022uniE023uniE024uniE025uniE026uniE027uniE028uniE029uniE030uniE031uniE032uniE033uniE034uniE035uniE036uniE037uniE038uniE039uniE040uniE041uniE042uniE043uniE044uniE045uniE046uniE047uniE048uniE049uniE050uniE051uniE052uniE053uniE054uniE055uniE056uniE057uniE058uniE059uniE060uniE062uniE063uniE064uniE065uniE066uniE067uniE068uniE069uniE070uniE071uniE072uniE073uniE074uniE075uniE076uniE077uniE078uniE079uniE080uniE081uniE082uniE083uniE084uniE085uniE086uniE087uniE088uniE089uniE090uniE091uniE092uniE093uniE094uniE095uniE096uniE097uniE101uniE102uniE103uniE104uniE105uniE106uniE107uniE108uniE109uniE110uniE111uniE112uniE113uniE114uniE115uniE116uniE117uniE118uniE119uniE120uniE121uniE122uniE123uniE124uniE125uniE126uniE127uniE128uniE129uniE130uniE131uniE132uniE133uniE134uniE135uniE136uniE137uniE138uniE139uniE140uniE141uniE142uniE143uniE144uniE145uniE146uniE148uniE149uniE150uniE151uniE152uniE153uniE154uniE155uniE156uniE157uniE158uniE159uniE160uniE161uniE162uniE163uniE164uniE165uniE166uniE167uniE168uniE169uniE170uniE171uniE172uniE173uniE174uniE175uniE176uniE177uniE178uniE179uniE180uniE181uniE182uniE183uniE184uniE185uniE186uniE187uniE188uniE189uniE190uniE191uniE192uniE193uniE194uniE195uniE197uniE198uniE199uniE200uniE201uniE202uniE203uniE204uniE205uniE206uniE209uniE210uniE211uniE212uniE213uniE214uniE215uniE216uniE218uniE219uniE221uniE223uniE224uniE225uniE226uniE227uniE230uniE231uniE232uniE233uniE234uniE235uniE236uniE237uniE238uniE239uniE240uniE241uniE242uniE243uniE244uniE245uniE246uniE247uniE248uniE249uniE250uniE251uniE252uniE253uniE254uniE255uniE256uniE257uniE258uniE259uniE260uniF8FFu1F511u1F6AA TP | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./doc/images/apollo-net-apollo-cluster.png | PNG
IHDR 6 h&
iCCPICC Profile HT[Lz$! ҫ@z *6D',"CbCA/CA] DEeX¾ݳgs͝o3? ~P
&3cb8 @es2n W}xdֿ_&dr fr>EP
"K8eEH n?='<a d6[ #gfs:d:f._' p>ҧT'/55$)ϼ˴La*{ [igh!A|CYmJANϟf7b9 e{ϲ8%m٢{YYJ RXRN
D7ksxQ͏ ̔09 ҼH *9Q-}Ǵ̹8ge}zM,wiMaj\>|fv,d_\` O H ]e%Gpb!&pL3-m ڃ3Cނ\a "I svR$ w
?8bQL=u "tԁ60 &H6" b2<D`X6Pݠ TC 'A38.6 @k0
> pAJ C yAP(AI CkPTCUP +t ݄ 4( a5X^ n? / 8·ep5| n/÷~
b4Q&(;*JDPPRT5Պ@CIPoP_X4
D Ѿ4^.FkM{(Qc 0,L4& S)``a `0X,bcb~l#
ۍ Ďp8%1 cpcK 3[x>_?OBKXEF8Lh%! &D}1L@,#6?H$-=)'H'H7H/d*وA^B ( ŕKɢlQPQ>dLeX2\22M2=2oe ndsdKeOޑ}#Gӓc˭;+'7&O7O/?*S~Q\j>
ui<h Fa5 Kק"qz}T`RBႂb1XT6IF/<ynm0gbbbůJL%/ JJOF!+(_S~BWqTTy
V=ک:&T۫vE:CU=Y}E
_c%WL3YƼ TkViviNhkEhi5j=&ji'jn YF^.ANGCw\O_/Jo^ް>K?G^ à!0p]#ڈgTat617o?_0z~ $ۤda`glv;t,afmjv9<ϼǢ%re;+cV4E֛ۭڈllFlullnc۟`pOGǣ &,<pIˉT$qf:9 th]]jr]k\_% s{n.r?>֣YE*z]=cڧ÷X~~kZ\$P7P XA;g T5]F [ v4S{H%uQQ%Qko(cZbq5c^<zIޥKW.LyY eE bWYG9 =\W.HSBIDĒ$I#<^)
߃_\<r$e25*1
vV@L "QM&4%Nxx 9"Vʯ\ej˪99Fn_fÚnkA^~('vqCʆJ>nؚ?gS}Loʟ?be [EfEEߊ9ŷ~6ɭ[l; ]wˎv6b*q7KJ+HZݾ[9A{E>}[9zRA*jCCه^ </u55E5ߏHjCk U= [rq-
&
UƢī_~=ݩӺ)lV56%-1-gζ:9gzy.lHqRΥ6aۛIۗ?}Ր]ݸ}J[ǥN7tyݭ6:;fۙ.;wZm^}ǥ={~7oI?0Gُ& ><)|*
oH. xt>{x3?
忠(}nbW_
xS7{kvF|_AÑV ǂǞ}J41^Ys/ _X
?LMN
"@!'" (1 @ӂf|43>zZs ){ }ev 2--fjkR:98C MNN4ON~A}O3|Jr?Xacf ֳ&At YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y 9,IDATx}Mlu]ׯ_Kݢu'!@ #< {@202 ) @F8`2$AҁdbAKZժoծs=ֹϺ9o}֩{nW߃'c 3`̀0+`K0f 3`763z!<xP
DZKc c30f xުoN 7ǸZtrO~zv P4xWc*͐Rr< c|#Y6f 3pKx쒇fF!8ŴF-+Łh~f 3`fVoVcS]g9FpJ2mf 3`nMLO_8GQrwU}O1>ӟ6SGG;c <P <&.wkr
f 3
~ڨp^D+ ̍,vcSdQ :F,:8#ڏ6Qa8RRa-\zn0f xțܑa¦&?Z 1O )ΐ
cR]v 3` ފ}c-2uG Z<R
w S9FkKwmf 30cN}C7u>y\{U
魠1sJ[5 3`@+N@#8ndz-(qQ>9I;.(4uY<mT\.6O59'ǚ\5I._g?3`̀0c3`뾅Of 3`̀hvF2f 3` sg4f 3`FbH 3`̀76sf 3`H XÚ3`̀03fzΝ 3`̀&%cwؤ&k1[9f 3`Yc3!#A9}[j\Z/{M7f 3fNTMM$es&Yڎ^3`̀o .556"j::)+ v?Ɨr01)\N0/FbWG]/yǹ0f \0?> * N*c eR9OUsѧ65ƾG|E& f 3`@? 폚ŧQB7\:>Mi4Ȝ I'6'*<1f 3ЋBo茆
HMsP#~m~nj`f 3N fsSZ-ol@ꬵl?75c3l|3`̀X;"UTl% Վmj6_36kGݝ9;u#0f 3PEcS66 +rF3`̀0f`n ,q s#3`̀0c`Qhrf3`̀0f` ><b]0f 3`J )c0f 3(,j\0f 3PbM ̀0f E1p[V<oSakc}_G820f 7e6hf64!RK6ͥ}5Ͼf 3`)Lprss35f 1p)55$MHp?u >_
CG 8Θ;˹h̀0f` LؔnyǛ96n A_Lىec
?7Oaքyk 3`|c<tkd xc*թK~jC <FY 3`
H.574717&$3 : qSlxǹ0[ef fsnwާ9۷.
k] M
h̀0[g`DMYoM̵16k1763 #bUO,ꢝ1Ġ eCǣ0f -2pƦtq%y 9̀0f ̅E46MƘkZR8wf 3.جr 3`̀}xx 3`̀.nl^0f 1fu[3`̀.nl^0f 1po %}Iƪw A?֓ ug` pX zJ>;<l6:BG3pK6Dp ob͛W_
sY_'r~swI:RZf 46sije3M@yna3n6>M::|SXjS=}8ms٨V*QSb:ΙK}#::HRsMŨ=?
F f OV~/ݝG>Ƨ].v5VmEZu+_ǜ/j́6Ŏ觲SNWY)̜ة9Ԗur84<jοT
֙3NVH'6 %[.VI~*6rxe,oWKk FM<c`nW:J -3>V`p\7ž73fX} tj_|y
c5N szj l|xMjciA6 sr>)=jnEWRSw-f OT}\ # bJ7֖荒
GII +.bxG}r#cc e eŢCH d,A=erzsQS+F;Vǔkct lgM,|T}` kM<7f ,76Kݹʺ't75-ح%ۂ̀0g 9Â0f 3d6%ok7f 3`pcSǓ̀0f 0f̀0f :Xq a} Zк.CqG>8w|֛3`N l⛇OO|^y T̙W)
7_945S>R8qjGڨԩWϵX 5C1l>WѦu0^iU˧8 3 6&^k_%}X":ѝq4Bב'_,WưLC ǜ5rT0_3©e 3`fE+SD oLc)v6c\D-ߥ# S5 m2rGl9J<>}Qzlꗜ zWKN|
yfM<DwTԕ#&}X0?
j <\a]ʁb`XxPV1f` )]Lќh3αȔlU/9J9nk*: 'W
h;9O5F9TĠ-(mri7=R8[e3`҅M6-l"r ϥ 70Z/5L+J6OSKQNѵ۾f ̓56?'FЧ/3 #QY/d\qC8>TKx?beTRYGVcp.HAjc(I :kGuSYWY56RɼSOif753ƪo{>_ H3ОU46Oۻ'om}=_w웻O_ Z=zb svpn5O8=7Oe#JeG3D臥v#yH $._IG=5 ]E诲:4ݟmh>Ԗ;"fk?0W~iק d ,`~sOyv}f E2Ws7oK/ >|{M"7'ԋ4f +whs}C8> Xlc{z6w{Ww|9=7{H7߸~9f%۹%3`w}w_{o}i ?~|hnwy/36O[Mx v ?II_y_t~zlբ0 gW|~ڽVߒrcM^imlAa xRæѣGG>ȐG3`@?|_>=?{5xb36'v<ll[' hj^xg?|5Omq-f ^c ?l }?}< XdcWq'|
M
}̀X$>xv\O|'d ̈66CtxߗoEaiO .B #oo +j[ű-# %|M̧>0Ӝ303σp}Ckd )o_ԝ)h< ~:CH@%b Y衸`^S74ǘq5{4tO:ޫ\>Տ]5' ]GWq-?w9]a0sd`S_D0ƦnfFø [fvSNz@g]sX :CJƢe.o.tn lEJΟ8/x]ׄ
ǥU/ű?mZ+xwsSzٶ&VT]ȝ[Iǧ/j]MsC)}ԉ(gB*?yG<SPuG11 ڨW 3z$ E,,LEhD#Q h>FڑXĉ2p#&|U91G=dQ8jg306olpȝhNQYmdJ
K]]b鶦|X
:Oɧ 10s>ڣwK17h$ rLTRbqYF2@[ :ekG1Q1Ƅ^CukbчX#olJ'1mZ&ԡŦ*tt!X W{tq6gҏ
J\ UtF*32 }g\x샕Hw,T> 8s'>})]z^mrP50(OBS>חM$c 50oq$N
çʸ5>5cf><HkS3&T1X,c0 Bő5!Ru]cO5sH4Cr?q\`|QI=G̑Kjj(F*G..'Zȁ}3'6D^xxr㭨Ps]rE,,r1es-TpXʊM[ ' z4:֠9զzx FA#F@ dqR\1Fs *d.k:#k>sN{qcz1 F8j=˞ ,M56ؤxlR8ԖºH I@
L1uJI`r7$gW-iИg\\i9Ri >0Kz0szƕs9bٷ[QS<`*u3``9tu ,͓Wyg@dg1g1+ {5qo` }K91t?_ {_ o;;''oÒ0f}Sӓۻ7s44njNx2C~v |7wt3mgHK2f ,g_kGO?
/e^X{5io3}+}̀0` MP3<{Çnnf;."Rx>ؽ/[o xxT8}6ŭuf 2'<>^| /pW9 1 /~~v>:|8/yяέ)ݹG;o GhG -MOW]-0rm_X+8VR
q˘?xC'5g
?{[9ՌV-ϟRn|=hf
6hn?49 ~O>9/voyNy}*,55>IZs*Tov]vZe0R-CӲs35x s=wxRsz+JnK!/Ԝ~xxkI'N@8ﰽnwIu[gv%я%[55>]Eʞ5o5Nޒu CƳa(3 {A\[yS\gapS2qJ&67nl@ N:|8pŦ
2G?ws(v чzQG( $ '?,n/3?~ AHuu~ 9 SXjS=}x߯vY܀}9R)S cj+'1}:1YL5&GmSY爥Lj N891/ 8) q #rrKC i-Ǒ-v <Z ?<66OmCsFGLȵR ґG]jmS9Ys3VVډT mC4 sׅ~cEs76O
3YmG ȩOc<qsbgOQv jؒ'bd1by6177F,'_̥#fɦr SrĠ TyĄM:̥c1)<r#)SO]qGRr7ݷp u(诲S6<T<ʌV}%P ̣xS k}4}JCOv b;@IN. eq+r1Qw{?ղop# *y |q.s?൷@?vg5_!Xj 9ߎZZ{\I5F+JҔ-8?lg5mD2#EL EF|u72*tja8< l/⣽\%՟Ek(fW!CbPT=:wl1K\ܤbk NdF3vǞj9d5[zM8~П65#kѱ&gH-]kx=5c5j֛~nU65A~ܽUIes./ekdkYo
V횆Č9jkYWOm>s)>k c=5f`ԮsUXRmz`^zиV Um-p漾`u!$A a
/(#u̫'O~q8Rҥ|"&Z}K[XbRF\EY}f3}Ԯ6ӗ
jg 1Jc).e+WȫDڣMjW<(b> |4:z %Ź|ц8'1.ƨ]mQ[>I`"6P<OQO?֥C,|Ǒ:]1eU 96ش&x2YLRǵg}Ey 2f{ʎ c gq2wS0 f pccz3`̀0f`q lËl̀0f fMo `̀0f ̕76sè0f fMoʖo帬]-8.a}Qb 82zr,Ko -^yO~M̙gTOxg3NY=Ga ) D2K6=/ڈ
dqh\#_ N߸ rcejruEׁ치v]:9FXWk[ukD^%|/TC--s93Gs,ن0<M] i/ps?sEld,vA#]SBϒmIJ/3ϋ+CF kŨc*rkpb l 30<1 'za>K.BG*C7*XcEM]x(RM __ Ssu]IaYw{6VTE V`ףdS ;nJ u"h"٨g
AOO}s2&K ։9u {͘Z8Zẓ
^G2RR(g0 ))ژq 1ڢ]m1F8c.j]u0 2btnסia-1>olJ' mfT9AjRgJ,r9TUuKB)c2&kQFy ~9jprLTbqv͡wbL+K%[ġ cT9!HٸnFes/}9rլ~ZVؔ^lji;cuRU^|(lSxvGjIʐw'7 nS-\| ?0}0rS[sE(Zբޭc$ʽ0$
z|D|DY,~ZGEͣW}( @uMA'\͕X\}[ɚ3q\~iޖĪYS-ܗ lZOn*Ϧ5z7L pt5uu'<8GNb}7vMc=&ume:o'rL*7͓BM=)EUcKn5ryчzx{1MItAEW=u-vƨ^u z@qC_ʩxh?t8>j8K3aɮTNbT)(:#|F } :UʌFckm\^ꙟQ&G1'rz<x[}\c3/{T3Y6a \u)dRGOo
oÍmxϊG \9Nj F^FU{~?l uϫK3&͋f 3`7/po\0f 3Г76= 0f 30_wo\0f 3Г76= [㧁9.}6>.KX~>[E_1\f_e7}praC,%e̩іc
} ) 9.rx%_*oJ1Gh|ro!s8,bL()HO9\]u\Ls7m|}qՈQsqϏM=BM54ʒ>QϘ3z,1̒mC\ʵX#^m62S)g6bSәWE!\#bT1lKp]8X1[6NPSD%Jέ/Ep i<Ac@R%[ߺc*snpmDz[Q-o%a
v=J6KLѻjJ u"hJ+dҡWSh;\V,Z8uRh;N"Xҕ⢜[&Lԧdb0kc Q&vzd>ƜjvŸ㨏 vqÌzȈ]3+]3 ) hNQYmdJ-K)PWt[SUAIO>,
SP5P~4wn
wK}Ώ(QN% mQGn
91)+~-DY[E 1Fe 2On ]60B@ch\.W\e`MɦFIϝ!3V Xx.@J>?tc% fuq>n b >9_-ʹ_sq-SjQ1V`q^e=s>AD>,i1k50@!娠kpX|:ntJJ֜9[KĿ%V͚j|nd`
zҠM
uWx6%@kaЀcn]FLc=E1ut~Wk>rWfwUguBM=)EUcKn ryчzx{1MIt0EW=u-vƨ^uǼ˖N7 =b9j &|pОþ?zBc Q.()`WەŧS.t GKv\YCp5N{g~FX eSHh5\\Kbn鲫b`sͼQ̈́gلz`W3p C^ץJ =)XM76>+> /s8q+uxW1_ܳu3ֽ>.̀4/֚3`̀0 d`3<qf 3`@O$f 3`|pc3߽qef 3`@O$li渴^/8.a}Xo}-O __ s9fq[E~
0l3NbE[)!|pӋBd/ʌT #~rqlĚbQHO9\]u\Ls7m|}qՈQsqϏM=BM54ʒ>QϘ3z,1̒m̓0c\#NGY/6]ЈEהPd JZ1*ʥ\. -ilxv'F( Okpp)ȉ^Xϒ<=űyƀ|=`Ku1TI5&ފʽh=|+ EmQ_rx]5:o4lT3C '>v
9g W֠:#gԣh]T2 SR"(g0 ))ژq 1ڢ]m1F8c.j]u0 2btnסia-1>olJ' mfT9AjRgJ,r9TUuKB)c2f\ #;>GQ sc((G k團cXq^-"Gu'7jln.|S}s v14.f
Xo_.2ƦdSM$ΐ,<r ¦\ߐ\zY|ǂYj[3j 8 B7ck1̅y /\}/ʹ)swol8r/L}2IBr9 j`" Q4DyEʫa~/x'$'NYJW,dd͙U.p4oK[bլkpK6`z'
P7X{gSb&
8Zk|qVqe@ 9ڳL\l s[LwՎ/*we/yWU}[h) /S[T5,W}Ӕd@ SgzSؒ
jgUGlcN\ b@9GK avG=eGmsXuAQO9ڮ,>EBtԔ?}ԦKP=rXl? r
81wK=7b<(ӟ2FD[N1ZڀsO]}=klEj&<&LՃ .ŔlU)Mmr
Yq(xA+lj]Yh7瞭7yuiؤy 3`̀X K6f 3`z2Ʀ'av7f 3`ˀ+3f 3`z2Ʀ'aKsp40ǥտzo q zKky:1,fۂn_.w;ldS=9p/rL#^"%[W<1gF_0H\5zkbXuqe
Q[h:PW.e|OQCzXS68jD^(ʹ8 }neFèg̙a=[f6!.F^K6@cj f kYXLF,%ۈe_@OMg._
W*p֊Q1ưU.-v`lLcf;1BaxZcLAN}&s\ל/^7y-#q늯 dS?ϧg/
r7Cj 1r/ZP0O_ %%(DZ8)}ԉ(gB*?yG<SPR0KJAuGΨv%m,J`G%Y\3tЄL P֔}m8Ďz[ܘSmѮU#cc 1dѮ:sQ1:PwŴkx76 ͉63* ۠LVe3%J9nk*: ɇ@|
1<P }\15wn
)ڙ;LQ DPc((G k團cXq^-"Gu'7jln.|S}s v14.f
Xo_.2ƦdSM$ΐ,<r a+u9V!\! + `9 h|%j]y¼Fxjr\\ ZԻu76`D>}A!CsP50(KO+=4 ^& l ,٢o+Ys8n 8/X5kM46X^I65ԍ>^%ٔX F @k֪ RХ?T7Eck+Z}ej72W\;W>V_ϛBM=)EUcKn9ryчzx{1MItAEW=u-vƨ^uǼF|F88jN F=0F U%陰dW[*'1*u
>e> Ne?g]1Wzȵ6 i/O(Lm9`kiV<P_̭>]v|^ l=,0Ujc`S]W`7˷6gǣ} 'Nwe_#=k_{nեpcZ3`̀0f` l曇7. 3`̀ɀ 3`̀/nl7 3`̀ ku 3`̀ 7ܯ(~
u śP0f [2p'6@3ӷ
nb }3`̀
7klJMM6Lp&2b 3`MǦqIqjlE<Q jlXƨ :]}0ǡvYm8ݣ0f 500ycuq7sCm@6ă˖4nR_ ϲ0f 20H߿
@KsT.
1 es3`̀X+76 2t|iocnLI3g
;6/чu*?ūzǹ0f` lnjݴkS~}>\v60uiD 75d£0f l?cI南c7qS7sm bL
qM{LjXhg 1Gk8eG3`̀0k`
I&ЉdS9<]0f )Mc3tѸMƘkZR8wf 3<,rWl̀0f ><<ւk̀0f l76{ 3`pc-̀0f l^
~sɇ0f 3`Eck^u쾋o _9-ɜZ̀0f ́f%x4ijj\Z[ỳ0f ̍ScSjjJ1Բ9)Ls3`8|MW㒳ǧڈz $RVB/`<cRa^Ũ3\ 3`xR<SǟZeIẹ@jS=)t9Ʊۓg 3`xȷ80^sC
F k}RPǧ)樉gΒؔر 3`CknrEC9t`c-e?X1̀0f 0p0-ol@#f߸ԌŬq̀0f`M \L@9Ll*RjG^Ō6G/qxz:5{<7f 3U.)6?\G3`̀0f` d-;cikpf 3`u G3`̀0k`5,k0f 3`̀mWò0f`U td< IENDB` | PNG
IHDR 6 h&
iCCPICC Profile HT[Lz$! ҫ@z *6D',"CbCA/CA] DEeX¾ݳgs͝o3? ~P
&3cb8 @es2n W}xdֿ_&dr fr>EP
"K8eEH n?='<a d6[ #gfs:d:f._' p>ҧT'/55$)ϼ˴La*{ [igh!A|CYmJANϟf7b9 e{ϲ8%m٢{YYJ RXRN
D7ksxQ͏ ̔09 ҼH *9Q-}Ǵ̹8ge}zM,wiMaj\>|fv,d_\` O H ]e%Gpb!&pL3-m ڃ3Cނ\a "I svR$ w
?8bQL=u "tԁ60 &H6" b2<D`X6Pݠ TC 'A38.6 @k0
> pAJ C yAP(AI CkPTCUP +t ݄ 4( a5X^ n? / 8·ep5| n/÷~
b4Q&(;*JDPPRT5Պ@CIPoP_X4
D Ѿ4^.FkM{(Qc 0,L4& S)``a `0X,bcb~l#
ۍ Ďp8%1 cpcK 3[x>_?OBKXEF8Lh%! &D}1L@,#6?H$-=)'H'H7H/d*وA^B ( ŕKɢlQPQ>dLeX2\22M2=2oe ndsdKeOޑ}#Gӓc˭;+'7&O7O/?*S~Q\j>
ui<h Fa5 Kק"qz}T`RBႂb1XT6IF/<ynm0gbbbůJL%/ JJOF!+(_S~BWqTTy
V=ک:&T۫vE:CU=Y}E
_c%WL3YƼ TkViviNhkEhi5j=&ji'jn YF^.ANGCw\O_/Jo^ް>K?G^ à!0p]#ڈgTat617o?_0z~ $ۤda`glv;t,afmjv9<ϼǢ%re;+cV4E֛ۭڈllFlullnc۟`pOGǣ &,<pIˉT$qf:9 th]]jr]k\_% s{n.r?>֣YE*z]=cڧ÷X~~kZ\$P7P XA;g T5]F [ v4S{H%uQQ%Qko(cZbq5c^<zIޥKW.LyY eE bWYG9 =\W.HSBIDĒ$I#<^)
߃_\<r$e25*1
vV@L "QM&4%Nxx 9"Vʯ\ej˪99Fn_fÚnkA^~('vqCʆJ>nؚ?gS}Loʟ?be [EfEEߊ9ŷ~6ɭ[l; ]wˎv6b*q7KJ+HZݾ[9A{E>}[9zRA*jCCه^ </u55E5ߏHjCk U= [rq-
&
UƢī_~=ݩӺ)lV56%-1-gζ:9gzy.lHqRΥ6aۛIۗ?}Ր]ݸ}J[ǥN7tyݭ6:;fۙ.;wZm^}ǥ={~7oI?0Gُ& ><)|*
oH. xt>{x3?
忠(}nbW_
xS7{kvF|_AÑV ǂǞ}J41^Ys/ _X
?LMN
"@!'" (1 @ӂf|43>zZs ){ }ev 2--fjkR:98C MNN4ON~A}O3|Jr?Xacf ֳ&At YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y 9,IDATx}Mlu]ׯ_Kݢu'!@ #< {@202 ) @F8`2$AҁdbAKZժoծs=ֹϺ9o}֩{nW߃'c 3`̀0+`K0f 3`763z!<xP
DZKc c30f xުoN 7ǸZtrO~zv P4xWc*͐Rr< c|#Y6f 3pKx쒇fF!8ŴF-+Łh~f 3`fVoVcS]g9FpJ2mf 3`nMLO_8GQrwU}O1>ӟ6SGG;c <P <&.wkr
f 3
~ڨp^D+ ̍,vcSdQ :F,:8#ڏ6Qa8RRa-\zn0f xțܑa¦&?Z 1O )ΐ
cR]v 3` ފ}c-2uG Z<R
w S9FkKwmf 30cN}C7u>y\{U
魠1sJ[5 3`@+N@#8ndz-(qQ>9I;.(4uY<mT\.6O59'ǚ\5I._g?3`̀0c3`뾅Of 3`̀hvF2f 3` sg4f 3`FbH 3`̀76sf 3`H XÚ3`̀03fzΝ 3`̀&%cwؤ&k1[9f 3`Yc3!#A9}[j\Z/{M7f 3fNTMM$es&Yڎ^3`̀o .556"j::)+ v?Ɨr01)\N0/FbWG]/yǹ0f \0?> * N*c eR9OUsѧ65ƾG|E& f 3`@? 폚ŧQB7\:>Mi4Ȝ I'6'*<1f 3ЋBo茆
HMsP#~m~nj`f 3N fsSZ-ol@ꬵl?75c3l|3`̀X;"UTl% Վmj6_36kGݝ9;u#0f 3PEcS66 +rF3`̀0f`n ,q s#3`̀0c`Qhrf3`̀0f` ><b]0f 3`J )c0f 3(,j\0f 3PbM ̀0f E1p[V<oSakc}_G820f 7e6hf64!RK6ͥ}5Ͼf 3`)Lprss35f 1p)55$MHp?u >_
CG 8Θ;˹h̀0f` LؔnyǛ96n A_Lىec
?7Oaքyk 3`|c<tkd xc*թK~jC <FY 3`
H.574717&$3 : qSlxǹ0[ef fsnwާ9۷.
k] M
h̀0[g`DMYoM̵16k1763 #bUO,ꢝ1Ġ eCǣ0f -2pƦtq%y 9̀0f ̅E46MƘkZR8wf 3.جr 3`̀}xx 3`̀.nl^0f 1fu[3`̀.nl^0f 1po %}Iƪw A?֓ ug` pX zJ>;<l6:BG3pK6Dp ob͛W_
sY_'r~swI:RZf 46sije3M@yna3n6>M::|SXjS=}8ms٨V*QSb:ΙK}#::HRsMŨ=?
F f OV~/ݝG>Ƨ].v5VmEZu+_ǜ/j́6Ŏ觲SNWY)̜ة9Ԗur84<jοT
֙3NVH'6 %[.VI~*6rxe,oWKk FM<c`nW:J -3>V`p\7ž73fX} tj_|y
c5N szj l|xMjciA6 sr>)=jnEWRSw-f OT}\ # bJ7֖荒
GII +.bxG}r#cc e eŢCH d,A=erzsQS+F;Vǔkct lgM,|T}` kM<7f ,76Kݹʺ't75-ح%ۂ̀0g 9Â0f 3d6%ok7f 3`pcSǓ̀0f 0f̀0f :Xq a} Zк.CqG>8w|֛3`N l⛇OO|^y T̙W)
7_945S>R8qjGڨԩWϵX 5C1l>WѦu0^iU˧8 3 6&^k_%}X":ѝq4Bב'_,WưLC ǜ5rT0_3©e 3`fE+SD oLc)v6c\D-ߥ# S5 m2rGl9J<>}Qzlꗜ zWKN|
yfM<DwTԕ#&}X0?
j <\a]ʁb`XxPV1f` )]Lќh3αȔlU/9J9nk*: 'W
h;9O5F9TĠ-(mri7=R8[e3`҅M6-l"r ϥ 70Z/5L+J6OSKQNѵ۾f ̓56?'FЧ/3 #QY/d\qC8>TKx?beTRYGVcp.HAjc(I :kGuSYWY56RɼSOif753ƪo{>_ H3ОU46Oۻ'om}=_w웻O_ Z=zb svpn5O8=7Oe#JeG3D臥v#yH $._IG=5 ]E诲:4ݟmh>Ԗ;"fk?0W~iק d ,`~sOyv}f E2Ws7oK/ >|{M"7'ԋ4f +whs}C8> Xlc{z6w{Ww|9=7{H7߸~9f%۹%3`w}w_{o}i ?~|hnwy/36O[Mx v ?II_y_t~zlբ0 gW|~ڽVߒrcM^imlAa xRæѣGG>ȐG3`@?|_>=?{5xb36'v<ll[' hj^xg?|5Omq-f ^c ?l }?}< XdcWq'|
M
}̀X$>xv\O|'d ̈66CtxߗoEaiO .B #oo +j[ű-# %|M̧>0Ӝ303σp}Ckd )o_ԝ)h< ~:CH@%b Y衸`^S74ǘq5{4tO:ޫ\>Տ]5' ]GWq-?w9]a0sd`S_D0ƦnfFø [fvSNz@g]sX :CJƢe.o.tn lEJΟ8/x]ׄ
ǥU/ű?mZ+xwsSzٶ&VT]ȝ[Iǧ/j]MsC)}ԉ(gB*?yG<SPuG11 ڨW 3z$ E,,LEhD#Q h>FڑXĉ2p#&|U91G=dQ8jg306olpȝhNQYmdJ
K]]b鶦|X
:Oɧ 10s>ڣwK17h$ rLTRbqYF2@[ :ekG1Q1Ƅ^CukbчX#olJ'1mZ&ԡŦ*tt!X W{tq6gҏ
J\ UtF*32 }g\x샕Hw,T> 8s'>})]z^mrP50(OBS>חM$c 50oq$N
çʸ5>5cf><HkS3&T1X,c0 Bő5!Ru]cO5sH4Cr?q\`|QI=G̑Kjj(F*G..'Zȁ}3'6D^xxr㭨Ps]rE,,r1es-TpXʊM[ ' z4:֠9զzx FA#F@ dqR\1Fs *d.k:#k>sN{qcz1 F8j=˞ ,M56ؤxlR8ԖºH I@
L1uJI`r7$gW-iИg\\i9Ri >0Kz0szƕs9bٷ[QS<`*u3``9tu ,͓Wyg@dg1g1+ {5qo` }K91t?_ {_ o;;''oÒ0f}Sӓۻ7s44njNx2C~v |7wt3mgHK2f ,g_kGO?
/e^X{5io3}+}̀0` MP3<{Çnnf;."Rx>ؽ/[o xxT8}6ŭuf 2'<>^| /pW9 1 /~~v>:|8/yяέ)ݹG;o GhG -MOW]-0rm_X+8VR
q˘?xC'5g
?{[9ՌV-ϟRn|=hf
6hn?49 ~O>9/voyNy}*,55>IZs*Tov]vZe0R-CӲs35x s=wxRsz+JnK!/Ԝ~xxkI'N@8ﰽnwIu[gv%я%[55>]Eʞ5o5Nޒu CƳa(3 {A\[yS\gapS2qJ&67nl@ N:|8pŦ
2G?ws(v чzQG( $ '?,n/3?~ AHuu~ 9 SXjS=}x߯vY܀}9R)S cj+'1}:1YL5&GmSY爥Lj N891/ 8) q #rrKC i-Ǒ-v <Z ?<66OmCsFGLȵR ґG]jmS9Ys3VVډT mC4 sׅ~cEs76O
3YmG ȩOc<qsbgOQv jؒ'bd1by6177F,'_̥#fɦr SrĠ TyĄM:̥c1)<r#)SO]qGRr7ݷp u(诲S6<T<ʌV}%P ̣xS k}4}JCOv b;@IN. eq+r1Qw{?ղop# *y |q.s?൷@?vg5_!Xj 9ߎZZ{\I5F+JҔ-8?lg5mD2#EL EF|u72*tja8< l/⣽\%՟Ek(fW!CbPT=:wl1K\ܤbk NdF3vǞj9d5[zM8~П65#kѱ&gH-]kx=5c5j֛~nU65A~ܽUIes./ekdkYo
V횆Č9jkYWOm>s)>k c=5f`ԮsUXRmz`^zиV Um-p漾`u!$A a
/(#u̫'O~q8Rҥ|"&Z}K[XbRF\EY}f3}Ԯ6ӗ
jg 1Jc).e+WȫDڣMjW<(b> |4:z %Ź|ц8'1.ƨ]mQ[>I`"6P<OQO?֥C,|Ǒ:]1eU 96ش&x2YLRǵg}Ey 2f{ʎ c gq2wS0 f pccz3`̀0f`q lËl̀0f fMo `̀0f ̕76sè0f fMoʖo帬]-8.a}Qb 82zr,Ko -^yO~M̙gTOxg3NY=Ga ) D2K6=/ڈ
dqh\#_ N߸ rcejruEׁ치v]:9FXWk[ukD^%|/TC--s93Gs,ن0<M] i/ps?sEld,vA#]SBϒmIJ/3ϋ+CF kŨc*rkpb l 30<1 'za>K.BG*C7*XcEM]x(RM __ Ssu]IaYw{6VTE V`ףdS ;nJ u"h"٨g
AOO}s2&K ։9u {͘Z8Zẓ
^G2RR(g0 ))ژq 1ڢ]m1F8c.j]u0 2btnסia-1>olJ' mfT9AjRgJ,r9TUuKB)c2&kQFy ~9jprLTbqv͡wbL+K%[ġ cT9!HٸnFes/}9rլ~ZVؔ^lji;cuRU^|(lSxvGjIʐw'7 nS-\| ?0}0rS[sE(Zբޭc$ʽ0$
z|D|DY,~ZGEͣW}( @uMA'\͕X\}[ɚ3q\~iޖĪYS-ܗ lZOn*Ϧ5z7L pt5uu'<8GNb}7vMc=&ume:o'rL*7͓BM=)EUcKn5ryчzx{1MItAEW=u-vƨ^u z@qC_ʩxh?t8>j8K3aɮTNbT)(:#|F } :UʌFckm\^ꙟQ&G1'rz<x[}\c3/{T3Y6a \u)dRGOo
oÍmxϊG \9Nj F^FU{~?l uϫK3&͋f 3`7/po\0f 3Г76= 0f 30_wo\0f 3Г76= [㧁9.}6>.KX~>[E_1\f_e7}praC,%e̩іc
} ) 9.rx%_*oJ1Gh|ro!s8,bL()HO9\]u\Ls7m|}qՈQsqϏM=BM54ʒ>QϘ3z,1̒mC\ʵX#^m62S)g6bSәWE!\#bT1lKp]8X1[6NPSD%Jέ/Ep i<Ac@R%[ߺc*snpmDz[Q-o%a
v=J6KLѻjJ u"hJ+dҡWSh;\V,Z8uRh;N"Xҕ⢜[&Lԧdb0kc Q&vzd>ƜjvŸ㨏 vqÌzȈ]3+]3 ) hNQYmdJ-K)PWt[SUAIO>,
SP5P~4wn
wK}Ώ(QN% mQGn
91)+~-DY[E 1Fe 2On ]60B@ch\.W\e`MɦFIϝ!3V Xx.@J>?tc% fuq>n b >9_-ʹ_sq-SjQ1V`q^e=s>AD>,i1k50@!娠kpX|:ntJJ֜9[KĿ%V͚j|nd`
zҠM
uWx6%@kaЀcn]FLc=E1ut~Wk>rWfwUguBM=)EUcKn ryчzx{1MIt0EW=u-vƨ^uǼ˖N7 =b9j &|pОþ?zBc Q.()`WەŧS.t GKv\YCp5N{g~FX eSHh5\\Kbn鲫b`sͼQ̈́gلz`W3p C^ץJ =)XM76>+> /s8q+uxW1_ܳu3ֽ>.̀4/֚3`̀0 d`3<qf 3`@O$f 3`|pc3߽qef 3`@O$li渴^/8.a}Xo}-O __ s9fq[E~
0l3NbE[)!|pӋBd/ʌT #~rqlĚbQHO9\]u\Ls7m|}qՈQsqϏM=BM54ʒ>QϘ3z,1̒m̓0c\#NGY/6]ЈEהPd JZ1*ʥ\. -ilxv'F( Okpp)ȉ^Xϒ<=űyƀ|=`Ku1TI5&ފʽh=|+ EmQ_rx]5:o4lT3C '>v
9g W֠:#gԣh]T2 SR"(g0 ))ژq 1ڢ]m1F8c.j]u0 2btnסia-1>olJ' mfT9AjRgJ,r9TUuKB)c2f\ #;>GQ sc((G k團cXq^-"Gu'7jln.|S}s v14.f
Xo_.2ƦdSM$ΐ,<r ¦\ߐ\zY|ǂYj[3j 8 B7ck1̅y /\}/ʹ)swol8r/L}2IBr9 j`" Q4DyEʫa~/x'$'NYJW,dd͙U.p4oK[bլkpK6`z'
P7X{gSb&
8Zk|qVqe@ 9ڳL\l s[LwՎ/*we/yWU}[h) /S[T5,W}Ӕd@ SgzSؒ
jgUGlcN\ b@9GK avG=eGmsXuAQO9ڮ,>EBtԔ?}ԦKP=rXl? r
81wK=7b<(ӟ2FD[N1ZڀsO]}=klEj&<&LՃ .ŔlU)Mmr
Yq(xA+lj]Yh7瞭7yuiؤy 3`̀X K6f 3`z2Ʀ'av7f 3`ˀ+3f 3`z2Ʀ'aKsp40ǥտzo q zKky:1,fۂn_.w;ldS=9p/rL#^"%[W<1gF_0H\5zkbXuqe
Q[h:PW.e|OQCzXS68jD^(ʹ8 }neFèg̙a=[f6!.F^K6@cj f kYXLF,%ۈe_@OMg._
W*p֊Q1ưU.-v`lLcf;1BaxZcLAN}&s\ל/^7y-#q늯 dS?ϧg/
r7Cj 1r/ZP0O_ %%(DZ8)}ԉ(gB*?yG<SPR0KJAuGΨv%m,J`G%Y\3tЄL P֔}m8Ďz[ܘSmѮU#cc 1dѮ:sQ1:PwŴkx76 ͉63* ۠LVe3%J9nk*: ɇ@|
1<P }\15wn
)ڙ;LQ DPc((G k團cXq^-"Gu'7jln.|S}s v14.f
Xo_.2ƦdSM$ΐ,<r a+u9V!\! + `9 h|%j]y¼Fxjr\\ ZԻu76`D>}A!CsP50(KO+=4 ^& l ,٢o+Ys8n 8/X5kM46X^I65ԍ>^%ٔX F @k֪ RХ?T7Eck+Z}ej72W\;W>V_ϛBM=)EUcKn9ryчzx{1MItAEW=u-vƨ^uǼF|F88jN F=0F U%陰dW[*'1*u
>e> Ne?g]1Wzȵ6 i/O(Lm9`kiV<P_̭>]v|^ l=,0Ujc`S]W`7˷6gǣ} 'Nwe_#=k_{nեpcZ3`̀0f` l曇7. 3`̀ɀ 3`̀/nl7 3`̀ ku 3`̀ 7ܯ(~
u śP0f [2p'6@3ӷ
nb }3`̀
7klJMM6Lp&2b 3`MǦqIqjlE<Q jlXƨ :]}0ǡvYm8ݣ0f 500ycuq7sCm@6ă˖4nR_ ϲ0f 20H߿
@KsT.
1 es3`̀X+76 2t|iocnLI3g
;6/чu*?ūzǹ0f` lnjݴkS~}>\v60uiD 75d£0f l?cI南c7qS7sm bL
qM{LjXhg 1Gk8eG3`̀0k`
I&ЉdS9<]0f )Mc3tѸMƘkZR8wf 3<,rWl̀0f ><<ւk̀0f l76{ 3`pc-̀0f l^
~sɇ0f 3`Eck^u쾋o _9-ɜZ̀0f ́f%x4ijj\Z[ỳ0f ̍ScSjjJ1Բ9)Ls3`8|MW㒳ǧڈz $RVB/`<cRa^Ũ3\ 3`xR<SǟZeIẹ@jS=)t9Ʊۓg 3`xȷ80^sC
F k}RPǧ)樉gΒؔر 3`CknrEC9t`c-e?X1̀0f 0p0-ol@#f߸ԌŬq̀0f`M \L@9Ll*RjG^Ō6G/qxz:5{<7f 3U.)6?\G3`̀0f` d-;cikpf 3`u G3`̀0k`5,k0f 3`̀mWò0f`U td< IENDB` | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/scripts/services/ConsumerService.js | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
appService.service('ConsumerService', ['$resource', '$q', 'AppUtil',
function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
create_consumer: {
method: 'POST',
isArray: false,
url: AppUtil.prefixPath() + '/consumers'
},
get_consumer_token_by_appId: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/consumers/by-appId'
},
assign_role_to_consumer: {
method: 'POST',
isArray: true,
url: AppUtil.prefixPath() + '/consumers/:token/assign-role'
}
});
return {
createConsumer: function (consumer) {
return AppUtil.ajax(resource.create_consumer, {}, consumer);
},
getConsumerTokenByAppId: function (appId) {
return AppUtil.ajax(resource.get_consumer_token_by_appId, {
appId: appId
});
},
assignRoleToConsumer: function (token, type, appId, namespaceName, envs) {
return AppUtil.ajax(resource.assign_role_to_consumer,
{
token: token,
type: type,
envs: envs
},
{
appId: appId,
namespaceName: namespaceName
}
)
}
}
}]);
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
appService.service('ConsumerService', ['$resource', '$q', 'AppUtil',
function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
create_consumer: {
method: 'POST',
isArray: false,
url: AppUtil.prefixPath() + '/consumers'
},
get_consumer_token_by_appId: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/consumers/by-appId'
},
assign_role_to_consumer: {
method: 'POST',
isArray: true,
url: AppUtil.prefixPath() + '/consumers/:token/assign-role'
}
});
return {
createConsumer: function (consumer) {
return AppUtil.ajax(resource.create_consumer, {}, consumer);
},
getConsumerTokenByAppId: function (appId) {
return AppUtil.ajax(resource.get_consumer_token_by_appId, {
appId: appId
});
},
assignRoleToConsumer: function (token, type, appId, namespaceName, envs) {
return AppUtil.ajax(resource.assign_role_to_consumer,
{
token: token,
type: type,
envs: envs
},
{
appId: appId,
namespaceName: namespaceName
}
)
}
}
}]);
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./doc/images/namespace-publish-permission.png | PNG
IHDR u t 4 IDATx UՕ*bdY@QTǠ!1q펉&YN3&iWwLcQS8 Ddg
w~ցGYLEQg;WϿg(MT^pN 8'5QpN 8'`\pN 8&@E]DpN 8'\3pN 8&@E]DpN 8'\3pN 8&@E]DpN 8'J pN 8'X776e#IT\퉌pN 4<YHܭt ivkބM7[JiIңK8A$Q *[;JN 8'@H,^)rSKQ;mK_WW,UZZj.2jpN 8 0] 5\,%T%^FziUTIZyo Z6+UYYr&x%w6f;'h {HZL*m~J*+FJ6oRU빳oڠciQC(i 뢮IsN 8'8 s(BUVj QJ6oQ2ǹ](35>f[jIhϾ+9_7lP4QfTRRbEpN 8'P *+VDREi3V,T^^nX2,TZznݪ$Iڴiۋ~%)-U]HWjkVUhTu/pN 8'%j*sqfjZje?[lM Dޡlۡ{۶mZr6oެ{vY3ŭ[t ڱc*++M"]Ϳ8'pEA 7dAa1 Zl-ZgŋuG{Y
.m4 uw}WN:O)-/eu ;,碮ȇ%>o<-]E\opN 8Z;`r+],1\<ܭ]2uBD+}Y~:w5lWqQ/B
x A7uT02ipN R Ν6kT>MU3ORBJCڸzU .DQxBE3i֤ "qN 8"!СCs>Z|9)m )=/EJ ]xpN `u*pu[" [% pNp"@l]p N>ؾ;X~pN 8'@u7ne_Zĥ[Nw}ϟW ,/};ГO>iW%K,;s8'pN>4o^tM&fϞ:DެY+G ml-Zdǂ_}~%%ӧeԈ6 S~sùK.c N 8'~83sL {;w`gJ!
E*P
ӦM?qۦ+Z-ϙ3tE?
~V~Y
d8a͘1A$ |&K3/~Q+VК5k췵kꭷ28 rs&MyN 8'@ @x:3|Ez{-h b;N9唝wHVǏ[1|h2nӦMfe۰a,p
nRV" ]ve:stꩧڀ=#~kժUfѣ1jZn?M {\`V;rɱZ7ɓձcǝ'pN8_rկ#_/oxw={ch
r #ۓW].wk؏1O~F}Ɉ:6ETaUCSW/A5¶" qw{N8WA>x?\s%FKm0'Nh]D ;]O 8'hx#G G "? !G >Xƌ~4wu9ԅ7- [|a@"5Y}&# T)S+}g}{c@jUʖ#^uX + =D nXPޱ]xv/e &y <x#'pN`? 6wC8;r[b,jժv| 6lwu-DbAr-qvXylMݝ֤Vs'1" |A=CNq ;T3<6mژxc5{<"Y
(YJmW^;餓 ˽P |ݍpN `d m;^{i B oGHOS0a4b$9JA0Ͼ69QXn CQel_]}ձX8 8K B[Q}x:ޏ:(sDzB/N 8'@F ޱ {ܜ
Mk<s/o
7,s7#w7[ ="¼HLaqd&%V^mPͤ!NoQ[G;cɻ+Ma.e|qxu رcm09F(wGQ/} 'p)O<akKV!~ ?ofaWBꪫ/|A?,Sƙnܲ
aV!N4{uX xrjŴ:j(FXXp"Ă+<gV"y8SE]dy <LyIk|7,JpN 8Í 396MQx3c
YhLX \Cx7ꫯLC m@|&!U:rΑG)A$FڑSG Ў
{饗 aPM2K`ɿ&"?ϘO=N_ߝpN .X="¢u̯|fl=ZV%Ŗd@b% NҔ!D/ jUs(h*Mb+'x-9o~cc9F%a
iF ػwo$ !w,x` fc HOygxJ 8'Fy%^s)
1xG7 z a~;w͛g< RD? '/ouԧL%XX
qq !Ђ8-(n1$U[{_}& ]UߝpNp!\˜XlpG?X| ?7̊0я~V¤1C< - ī*Y L>g.,MB 1"| 1}@/(*
KOpN bm_-揅xoБo BHoB& c~_} .\,sQcgi2>pN 8K + 4,6l2@
ܯ,-,t!q|&E
nWّ % )Y\'mpN 8'TFūT:! YLJC_5կ;'pNp%p ypN 8'ФkRqN 8'W
&X%Bp 6dI/,+^~]KʢEΡ>Ax~/ Wӽ7'pN JuPb֬Y:Ж.]jZ
c%9\X B^V. , p ٚߋB<ye~f}gː;wlI~KG"yVA Xa ]np K:$ݻ
r<Ö\xO@!CX^%[<zz'p@K{-ؚ;e]f&lQAt!X`K u \C?!' -ze"^^wÆ
Y/QxX.BYÚǹ,If)2}ʕ+wZWZelӧO$˗/7!g,ŹSHjX`kpN 4Fv[̹tE 1oomD`xM9(Q# aÆYeDn =l4]%) -ܦCgӟ, {"eX(1w{g4uTh 袋̲|D0{,9fbX ]
"n˖-v Xdy̙z'Xz7u"ް!I~LAbn*y0$DžٸQn?_pN^ `=mWmޢ_jn:-(+k>qaڔu 8묳L ,K=7,V@GI#~Z@D 9b|tD:Ru,sXרQ}P5 wa"l2e Cf|D`!x x}|'v¹| 'p.ԋ@>}͂,}־퉴uTg뜀pN H*/D7'؏`B0'o U)x M9(Q{ ƄL˸\WW7nՅ? q!W܇zP )ܓٳg̒5?MaꪫZr?h<V7` ?iops>@b+L RaC t<p+6I7ZW!U#55sN 8'pHK]ZEJ#Py^4]V6Q=B(X*WqPx3n ,jFуko% 'k31uM͛1c|2ܭ "+& ǎ k3ܰb+{,ua=cC9|p3byĝJ_~ 4,qHܟÁW R7?Xꢬ$[mJ{Z:pN jQ[XGwmN9锯ZĈkrJ/kyܵXZm+LHՑ2}{CTC S XQgX҈1C}V/!^Xp".boKDA|=./~6m4 =FLnZbw0DS(fӦMmժ 5ڋ(!XkAa߅ ޭWͩfJ5m2_좮82'(&VT $6eRbZ٣L& T٦*Me-Z(jLi "êH: ͠IMa [VH%Rm;FzPg_3#BA WX~IRXx!9Ğ=fy#ɫjXqy"H?pk+f)EY
`)\ Dﴅ{f q[߃!C=d%K(8X+Sn*
ۤ[~ Ih|*⃩߯uN 8'PrQ++4sZ,m8_'w|[֫ǃH UA5T{5 욕II^ۺSNW\FtPX:DnKVRgFR .Sy(_\7h sX=\X?74w9s, bmҤIG%HvCmQBȢӬd>H=%B;
IL qrAB
V"}"e6XqLRi{b
iPZejQ_pN l.mؚLT;:)Bu-J*N&KW:$-w?iU GyBD J~[g}Ҭ.bHBV%n2k7')IN;4A"_ܪdJ`-0 #UG9D FBh "AVhi:SGl p,x-
=uRG]eb@֨:'JsRڭxVx5N 8'u8W4lIR&q_S45WGj1kGBOȎ F(-4բa)#]HV5
>c VǂEspb+,KYks_\C ;mf1GTvN2fνLtOQ'*n^.N5uQy GhLvjspN 'IUhUNidH;6^inՆ-[~fCSL8u(Zti.gb VhAYh4y宿=5,U0@9Յs= :c91gOa'AZx
bS {Of'h\Li4(3aD9HTad!-:
tA:KF ظksm%2m/N 8' ƅ`d@`
Q{ND]C
`yqN 8'B,t c9 E]!
l
U#qN 8' nƆnOY.'pN 8=pK 4c/ R_13, e tuIBei<:'ppQYf \s%rK`c[v xǏ ޛ8qΊW%_uU]6<'puM`Cev`w?=cJ#襗^^xKIsW%z$sFyqN 8'ukjl-y l;o`q7o^Ga۳nZe,F=s&7 ؼ8'p5^{lq _,nXzmۨ3L"ܴ 9r u zO~lx3?pN uE7$k p>/_n[ f̘aַoY+V0+tiW^mIᦽ{5y5rN 8'4iPuw2
6D jEcEq$ndo
JȖ#krN 8'P_RW_>iӦiȐ!; 3fd.*M{Gkܸq:uҙg{ ZpN 8'ꒀuS_v~\VZcǎұcǚE;sc+"opN\Z1_(^G :trW?;'hl<X=k~ 'puH-uuTuz2'8l;lz;X/N 8'@"5^Z'pN HE]XǨ-tN 8'W> t?#k rTlhx pN Ԗ-]CH4 RIKURI7/N 8''\ iJk<⮬$|vx zyԦL2Ҽ8 WiM
8'4I+m.#VWuV"ܭ[EIJuMHWcwsN 8CC ]֑vlcR;.jǭޯRJeX+Z]:'Kx5ԩE]|墮<KRI7ܛpN`?bT*Ѕo?.S
+Q WoJ=G˲ H"7MPypNp<Ulc toEE~\CxcymPXn+9'@ `kɾuTaT" lDT֤sN 8'P0a$>
Zaߋǵ~ݜpNa|W{kίtN 8'@pQW4C
qN 8'@ =; 8'pECE] 7P`<OwOcuyo 8'@}MgĒoQF-:;nKM٦' IDAT h h&5+m~o[.moyJiD]I] )^hn*
9g'@}pQW^"sxҖmVgu% jBpl^Yڰuk4en''*
b,WJ;LJ:W[mgOϙ[E|&7Y1Sg떲kY URYiXژc%{m٥%Sp'ࢮ$ ) =Fb ٯh ӣc\<,BX kpL`]O7۪Mt혜r-ˤe*Ԯ #MkRں={3 %җ鞗M|; ⑱E˙KR=j&h&`ަԦ<Ҋ
< 61,vŎ6pN)hSNS k -$άI|7D/XIxquq}6N?F^|\}ad eׄ:õӮE&o A[Hm.};6ޗa-o>"M~7ՆǽJ~gս}ju&{\uihiDSK%h.洷4'mX¶VgwS
ov)a<Lw{Sa̳k0'sZ!o˛5sl reB^O߅oK ѱJ-[/DUfl$< ; *!>S~|| ǽ8'umĪD5vP#m.M5 :CS0'uR2iDXKץ{Dy+SMMGw4I|ejaOs o'݃Mm s6-c"
)#m!M_qb og-M5,l&zoEV }= VJ5= x%Y|ZA"D^%Ҩ~cΌպy[R
]w?{?~C4쐵L_j+SHrYSs ;"Rv2 #3-Xq,o&5 .ҙK3ϧ`m&^
9ψ4K$,dduriTL^g
uHk6KRF:)%ymߑ,yt,ڻ~kf%]2tbXS%o&HԌFQ) 'k }lq
-{$7҈^qzu~b HקzvVbq=SoR7GnxvmҤw{dN 8b&ࢮGg/mC(}&5S-4nh>թ8q1Bl"I2kϊbU bO s;`(k]cM"[+
+_X ,q_'%R aFt&Vͥs'ZAsjLڲF:O[̛ {jf2K;Y\ܢ5{]s]KiiHwUy8c^g*K _)GE̜s19>A>vll 1pbn:7cL^82SڭO'ky3UcXy~~d^/KuƠL<nR^㎉x{D-"]t|l'Nt(e\,ТYƚ(yōK?url18L 5h>vN2$ >Z*W?,iCbcrxN=goԣ"DkƊ?Po#C"j <= m1;GpN 4<u
?&F܊cƚTy 3ҍr:wd(ïoZ^fnGˉYټon #]vbN6&/YH&쳎BT7u|oVn墬 &WV"D.=1g[f 95gV<T.m2qeefD̚T0:6w* ,5g O]VL \3Og"hiƒJ5CTbGV{[PC*±?'%OccE9䉼VoLϧ 7S=4%ĹaK"{tz o/xHU^"Ե}dƲ ɛu+ ͙|mA~#"5+'%V?"赅1<XJt椺N 8գS_x2J9ܠnY֮ RxG?לe5/Ib=?;1 <ߟ ?'&+ EAyD<é9]0<%&_t|dKsSrOkH;Fz냴FQ\#T 8'P\ hH7o#N TwLssX*on5&s!QY}mf"Z77B0a[a"ƝF!v#%Vf-#fi_kFJ#D<[
Wߛ d1q,99^)Y_OU~ #iފD?{"%kG^O]S@ ^'bl'Z U_y qXwyؚX$w:ݼQ*k/{ԌD'˩W]o^Hdd 3}Gu1%*?ԮǙ!> D V.Xqw3rZ)n,$yTk7x̕O0sf%
r;,OhT?nYԃY\>+K Y&<T
τ*sʳ3E WeYEhL\5Ѫj+'uXGw\EJbqb݂ Q&,&o31bBA|lp *YRO,lLH,0 N5wycL`\P䄜C^ILs .f\9-\{g!"cZ% 7".۞IY|aF#k- O,ށXO
Kxhhf1VaAD}p És(YdVND,{~~%"t4*iy=zS
[Q{T-bscbU?rf."8F$c}gqeusK1y9Ƅ{Q켪E'+)X`˷9S+'/U|5snl ON 8FBRIf2a>~XJ?UZ:&8Iέ#\XgU0I-`#X}_ &HD^z^_;oAFړT[&, 6,6rX.c_cHެHg
bsu]y=Fj-D
.Vp0nͬt6y9[,B VP kg ' AR, G8g_qqy=f*a-:gEuiDQi{C qAsnvx?"ք+X^ ÿ~=YmjXeZs2p+Axuli6{H?,gqt
,Bi(a1%$n Y$)8"~^N?+gXYB ZDsqEqN 42nkdGĺcR"sAؘ+x3U+#2-sVU4nH$bX!ĸD٫Co,J=\ ϼO Bp wk+~j1P=;:e@sBE[u=r^bQ/&V^3:639CV7.WSs!ܰtѾ`A@bB+Nռ ;\vnFm$+SN[quhkQVe''M}/11ynNꟳja,N{uVWHu狉hr7zDW [㟧&P Aal*Y>24&i2xmb\x7ҟ~ѐ*+ )ϝ ++cx^[;:ut4V'&8xGdг'i2^ =xa=}Z:'ucvk% qG|)1K7>-qBZSuj-:,TEڭmd1H7b,է,
WRJh NơQ?NB\42'dn[\Ŀk 4<
p
Yj\NzF\0<)Jԟ^J,Z6 7ghU߿bp31{T [0>+2+#@- Aul Y\RaGrbw"oc^X7#zpwmH]pᗍ
.gb$R[xA 3S(Kb1vDv 3XθSrb(ش?MIJX(8 [g[7ENkzYL#s,8b,!| *ayu[qٲ%D<#6 \5K`} ~ztlr/;#S5o gm9}p nlVrcwݎGN 8b$/f m8I7o֧ װw7<9UZثcv w(LLWAt qIMjL,ɿ|$gy4%o+?D@}NNY MU+ PvojZzB*~`e]()][6oOM(bܰGbуc=EZ%>h !Oק4qF"RY: J/o b~X % C'Q/}p Yܕ<>$&L ) xN³f˔$!Dxc^pn6
29'hVn 1G>ł_^Ybɉ 3 q.iTGbD,7E:j,pu蛿;'Pje쏌7;"/pS1!dDjfneW"0x++dwΒ
ߙ`bҤ /<皎S-^'+}D+ӄHN+)rI ƕcYlʔl'
6hO,,{$治gEQ`|g EP˾w.1iNXuAd+\;}@[eфoH9^ƛ Xa1qhUu1dz^gqt/Y8;'vkSY m Cl /vN ;u>BhM{8goǪ_ć'e 1sD$a~umR)˞ļs.Kp 0E,X@D|
3^ ܾƏ{j+'s,/#ʲkG.N, N
o/J-ZKv}]'fBO9)1簾We 3۽ cZV 8'T k#[~1Bs19ZT]4K((hmzW]?5Jvܢu]'xq Yb`[}pCM_}2-0h5 >m*szO{Ub 8'pN?~''pN 2.Z 8'pGE]>;LpN 8')R hQH[p
~w٣IՎOpN 8'и XiIN={l iֻk {^>5srIyE{MyN 8'@F>}۩g"noVăcMKZB-YT[+{k}N 8'jMݻg#ȓj (HuJwN 8'@E8($'pN (uJwN 8'@pQWMrN 8'~]e IENDB` | PNG
IHDR u t 4 IDATx UՕ*bdY@QTǠ!1q펉&YN3&iWwLcQS8 Ddg
w~ցGYLEQg;WϿg(MT^pN 8'5QpN 8'`\pN 8&@E]DpN 8'\3pN 8&@E]DpN 8'\3pN 8&@E]DpN 8'J pN 8'X776e#IT\퉌pN 4<YHܭt ivkބM7[JiIңK8A$Q *[;JN 8'@H,^)rSKQ;mK_WW,UZZj.2jpN 8 0] 5\,%T%^FziUTIZyo Z6+UYYr&x%w6f;'h {HZL*m~J*+FJ6oRU빳oڠciQC(i 뢮IsN 8'8 s(BUVj QJ6oQ2ǹ](35>f[jIhϾ+9_7lP4QfTRRbEpN 8'P *+VDREi3V,T^^nX2,TZznݪ$Iڴiۋ~%)-U]HWjkVUhTu/pN 8'%j*sqfjZje?[lM Dޡlۡ{۶mZr6oެ{vY3ŭ[t ڱc*++M"]Ϳ8'pEA 7dAa1 Zl-ZgŋuG{Y
.m4 uw}WN:O)-/eu ;,碮ȇ%>o<-]E\opN 8Z;`r+],1\<ܭ]2uBD+}Y~:w5lWqQ/B
x A7uT02ipN R Ν6kT>MU3ORBJCڸzU .DQxBE3i֤ "qN 8"!СCs>Z|9)m )=/EJ ]xpN `u*pu[" [% pNp"@l]p N>ؾ;X~pN 8'@u7ne_Zĥ[Nw}ϟW ,/};ГO>iW%K,;s8'pN>4o^tM&fϞ:DެY+G ml-Zdǂ_}~%%ӧeԈ6 S~sùK.c N 8'~83sL {;w`gJ!
E*P
ӦM?qۦ+Z-ϙ3tE?
~V~Y
d8a͘1A$ |&K3/~Q+VК5k췵kꭷ28 rs&MyN 8'@ @x:3|Ez{-h b;N9唝wHVǏ[1|h2nӦMfe۰a,p
nRV" ]ve:stꩧڀ=#~kժUfѣ1jZn?M {\`V;rɱZ7ɓձcǝ'pN8_rկ#_/oxw={ch
r #ۓW].wk؏1O~F}Ɉ:6ETaUCSW/A5¶" qw{N8WA>x?\s%FKm0'Nh]D ;]O 8'hx#G G "? !G >Xƌ~4wu9ԅ7- [|a@"5Y}&# T)S+}g}{c@jUʖ#^uX + =D nXPޱ]xv/e &y <x#'pN`? 6wC8;r[b,jժv| 6lwu-DbAr-qvXylMݝ֤Vs'1" |A=CNq ;T3<6mژxc5{<"Y
(YJmW^;餓 ˽P |ݍpN `d m;^{i B oGHOS0a4b$9JA0Ͼ69QXn CQel_]}ձX8 8K B[Q}x:ޏ:(sDzB/N 8'@F ޱ {ܜ
Mk<s/o
7,s7#w7[ ="¼HLaqd&%V^mPͤ!NoQ[G;cɻ+Ma.e|qxu رcm09F(wGQ/} 'p)O<akKV!~ ?ofaWBꪫ/|A?,Sƙnܲ
aV!N4{uX xrjŴ:j(FXXp"Ă+<gV"y8SE]dy <LyIk|7,JpN 8Í 396MQx3c
YhLX \Cx7ꫯLC m@|&!U:rΑG)A$FڑSG Ў
{饗 aPM2K`ɿ&"?ϘO=N_ߝpN .X="¢u̯|fl=ZV%Ŗd@b% NҔ!D/ jUs(h*Mb+'x-9o~cc9F%a
iF ػwo$ !w,x` fc HOygxJ 8'Fy%^s)
1xG7 z a~;w͛g< RD? '/ouԧL%XX
qq !Ђ8-(n1$U[{_}& ]UߝpNp!\˜XlpG?X| ?7̊0я~V¤1C< - ī*Y L>g.,MB 1"| 1}@/(*
KOpN bm_-揅xoБo BHoB& c~_} .\,sQcgi2>pN 8K + 4,6l2@
ܯ,-,t!q|&E
nWّ % )Y\'mpN 8'TFūT:! YLJC_5կ;'pNp%p ypN 8'ФkRqN 8'W
&X%Bp 6dI/,+^~]KʢEΡ>Ax~/ Wӽ7'pN JuPb֬Y:Ж.]jZ
c%9\X B^V. , p ٚߋB<ye~f}gː;wlI~KG"yVA Xa ]np K:$ݻ
r<Ö\xO@!CX^%[<zz'p@K{-ؚ;e]f&lQAt!X`K u \C?!' -ze"^^wÆ
Y/QxX.BYÚǹ,If)2}ʕ+wZWZelӧO$˗/7!g,ŹSHjX`kpN 4Fv[̹tE 1oomD`xM9(Q# aÆYeDn =l4]%) -ܦCgӟ, {"eX(1w{g4uTh 袋̲|D0{,9fbX ]
"n˖-v Xdy̙z'Xz7u"ް!I~LAbn*y0$DžٸQn?_pN^ `=mWmޢ_jn:-(+k>qaڔu 8묳L ,K=7,V@GI#~Z@D 9b|tD:Ru,sXרQ}P5 wa"l2e Cf|D`!x x}|'v¹| 'p.ԋ@>}͂,}־퉴uTg뜀pN H*/D7'؏`B0'o U)x M9(Q{ ƄL˸\WW7nՅ? q!W܇zP )ܓٳg̒5?MaꪫZr?h<V7` ?iops>@b+L RaC t<p+6I7ZW!U#55sN 8'pHK]ZEJ#Py^4]V6Q=B(X*WqPx3n ,jFуko% 'k31uM͛1c|2ܭ "+& ǎ k3ܰb+{,ua=cC9|p3byĝJ_~ 4,qHܟÁW R7?Xꢬ$[mJ{Z:pN jQ[XGwmN9锯ZĈkrJ/kyܵXZm+LHՑ2}{CTC S XQgX҈1C}V/!^Xp".boKDA|=./~6m4 =FLnZbw0DS(fӦMmժ 5ڋ(!XkAa߅ ޭWͩfJ5m2_좮82'(&VT $6eRbZ٣L& T٦*Me-Z(jLi "êH: ͠IMa [VH%Rm;FzPg_3#BA WX~IRXx!9Ğ=fy#ɫjXqy"H?pk+f)EY
`)\ Dﴅ{f q[߃!C=d%K(8X+Sn*
ۤ[~ Ih|*⃩߯uN 8'PrQ++4sZ,m8_'w|[֫ǃH UA5T{5 욕II^ۺSNW\FtPX:DnKVRgFR .Sy(_\7h sX=\X?74w9s, bmҤIG%HvCmQBȢӬd>H=%B;
IL qrAB
V"}"e6XqLRi{b
iPZejQ_pN l.mؚLT;:)Bu-J*N&KW:$-w?iU GyBD J~[g}Ҭ.bHBV%n2k7')IN;4A"_ܪdJ`-0 #UG9D FBh "AVhi:SGl p,x-
=uRG]eb@֨:'JsRڭxVx5N 8'u8W4lIR&q_S45WGj1kGBOȎ F(-4բa)#]HV5
>c VǂEspb+,KYks_\C ;mf1GTvN2fνLtOQ'*n^.N5uQy GhLvjspN 'IUhUNidH;6^inՆ-[~fCSL8u(Zti.gb VhAYh4y宿=5,U0@9Յs= :c91gOa'AZx
bS {Of'h\Li4(3aD9HTad!-:
tA:KF ظksm%2m/N 8' ƅ`d@`
Q{ND]C
`yqN 8'B,t c9 E]!
l
U#qN 8' nƆnOY.'pN 8=pK 4c/ R_13, e tuIBei<:'ppQYf \s%rK`c[v xǏ ޛ8qΊW%_uU]6<'puM`Cev`w?=cJ#襗^^xKIsW%z$sFyqN 8'ukjl-y l;o`q7o^Ga۳nZe,F=s&7 ؼ8'p5^{lq _,nXzmۨ3L"ܴ 9r u zO~lx3?pN uE7$k p>/_n[ f̘aַoY+V0+tiW^mIᦽ{5y5rN 8'4iPuw2
6D jEcEq$ndo
JȖ#krN 8'P_RW_>iӦiȐ!; 3fd.*M{Gkܸq:uҙg{ ZpN 8'ꒀuS_v~\VZcǎұcǚE;sc+"opN\Z1_(^G :trW?;'hl<X=k~ 'puH-uuTuz2'8l;lz;X/N 8'@"5^Z'pN HE]XǨ-tN 8'W> t?#k rTlhx pN Ԗ-]CH4 RIKURI7/N 8''\ iJk<⮬$|vx zyԦL2Ҽ8 WiM
8'4I+m.#VWuV"ܭ[EIJuMHWcwsN 8CC ]֑vlcR;.jǭޯRJeX+Z]:'Kx5ԩE]|墮<KRI7ܛpN`?bT*Ѕo?.S
+Q WoJ=G˲ H"7MPypNp<Ulc toEE~\CxcymPXn+9'@ `kɾuTaT" lDT֤sN 8'P0a$>
Zaߋǵ~ݜpNa|W{kίtN 8'@pQW4C
qN 8'@ =; 8'pECE] 7P`<OwOcuyo 8'@}MgĒoQF-:;nKM٦' IDAT h h&5+m~o[.moyJiD]I] )^hn*
9g'@}pQW^"sxҖmVgu% jBpl^Yڰuk4en''*
b,WJ;LJ:W[mgOϙ[E|&7Y1Sg떲kY URYiXژc%{m٥%Sp'ࢮ$ ) =Fb ٯh ӣc\<,BX kpL`]O7۪Mt혜r-ˤe*Ԯ #MkRں={3 %җ鞗M|; ⑱E˙KR=j&h&`ަԦ<Ҋ
< 61,vŎ6pN)hSNS k -$άI|7D/XIxquq}6N?F^|\}ad eׄ:õӮE&o A[Hm.};6ޗa-o>"M~7ՆǽJ~gս}ju&{\uihiDSK%h.洷4'mX¶VgwS
ov)a<Lw{Sa̳k0'sZ!o˛5sl reB^O߅oK ѱJ-[/DUfl$< ; *!>S~|| ǽ8'umĪD5vP#m.M5 :CS0'uR2iDXKץ{Dy+SMMGw4I|ejaOs o'݃Mm s6-c"
)#m!M_qb og-M5,l&zoEV }= VJ5= x%Y|ZA"D^%Ҩ~cΌպy[R
]w?{?~C4쐵L_j+SHrYSs ;"Rv2 #3-Xq,o&5 .ҙK3ϧ`m&^
9ψ4K$,dduriTL^g
uHk6KRF:)%ymߑ,yt,ڻ~kf%]2tbXS%o&HԌFQ) 'k }lq
-{$7҈^qzu~b HקzvVbq=SoR7GnxvmҤw{dN 8b&ࢮGg/mC(}&5S-4nh>թ8q1Bl"I2kϊbU bO s;`(k]cM"[+
+_X ,q_'%R aFt&Vͥs'ZAsjLڲF:O[̛ {jf2K;Y\ܢ5{]s]KiiHwUy8c^g*K _)GE̜s19>A>vll 1pbn:7cL^82SڭO'ky3UcXy~~d^/KuƠL<nR^㎉x{D-"]t|l'Nt(e\,ТYƚ(yōK?url18L 5h>vN2$ >Z*W?,iCbcrxN=goԣ"DkƊ?Po#C"j <= m1;GpN 4<u
?&F܊cƚTy 3ҍr:wd(ïoZ^fnGˉYټon #]vbN6&/YH&쳎BT7u|oVn墬 &WV"D.=1g[f 95gV<T.m2qeefD̚T0:6w* ,5g O]VL \3Og"hiƒJ5CTbGV{[PC*±?'%OccE9䉼VoLϧ 7S=4%ĹaK"{tz o/xHU^"Ե}dƲ ɛu+ ͙|mA~#"5+'%V?"赅1<XJt椺N 8գS_x2J9ܠnY֮ RxG?לe5/Ib=?;1 <ߟ ?'&+ EAyD<é9]0<%&_t|dKsSrOkH;Fz냴FQ\#T 8'P\ hH7o#N TwLssX*on5&s!QY}mf"Z77B0a[a"ƝF!v#%Vf-#fi_kFJ#D<[
Wߛ d1q,99^)Y_OU~ #iފD?{"%kG^O]S@ ^'bl'Z U_y qXwyؚX$w:ݼQ*k/{ԌD'˩W]o^Hdd 3}Gu1%*?ԮǙ!> D V.Xqw3rZ)n,$yTk7x̕O0sf%
r;,OhT?nYԃY\>+K Y&<T
τ*sʳ3E WeYEhL\5Ѫj+'uXGw\EJbqb݂ Q&,&o31bBA|lp *YRO,lLH,0 N5wycL`\P䄜C^ILs .f\9-\{g!"cZ% 7".۞IY|aF#k- O,ށXO
Kxhhf1VaAD}p És(YdVND,{~~%"t4*iy=zS
[Q{T-bscbU?rf."8F$c}gqeusK1y9Ƅ{Q켪E'+)X`˷9S+'/U|5snl ON 8FBRIf2a>~XJ?UZ:&8Iέ#\XgU0I-`#X}_ &HD^z^_;oAFړT[&, 6,6rX.c_cHެHg
bsu]y=Fj-D
.Vp0nͬt6y9[,B VP kg ' AR, G8g_qqy=f*a-:gEuiDQi{C qAsnvx?"ք+X^ ÿ~=YmjXeZs2p+Axuli6{H?,gqt
,Bi(a1%$n Y$)8"~^N?+gXYB ZDsqEqN 42nkdGĺcR"sAؘ+x3U+#2-sVU4nH$bX!ĸD٫Co,J=\ ϼO Bp wk+~j1P=;:e@sBE[u=r^bQ/&V^3:639CV7.WSs!ܰtѾ`A@bB+Nռ ;\vnFm$+SN[quhkQVe''M}/11ynNꟳja,N{uVWHu狉hr7zDW [㟧&P Aal*Y>24&i2xmb\x7ҟ~ѐ*+ )ϝ ++cx^[;:ut4V'&8xGdг'i2^ =xa=}Z:'ucvk% qG|)1K7>-qBZSuj-:,TEڭmd1H7b,է,
WRJh NơQ?NB\42'dn[\Ŀk 4<
p
Yj\NzF\0<)Jԟ^J,Z6 7ghU߿bp31{T [0>+2+#@- Aul Y\RaGrbw"oc^X7#zpwmH]pᗍ
.gb$R[xA 3S(Kb1vDv 3XθSrb(ش?MIJX(8 [g[7ENkzYL#s,8b,!| *ayu[qٲ%D<#6 \5K`} ~ztlr/;#S5o gm9}p nlVrcwݎGN 8b$/f m8I7o֧ װw7<9UZثcv w(LLWAt qIMjL,ɿ|$gy4%o+?D@}NNY MU+ PvojZzB*~`e]()][6oOM(bܰGbуc=EZ%>h !Oק4qF"RY: J/o b~X % C'Q/}p Yܕ<>$&L ) xN³f˔$!Dxc^pn6
29'hVn 1G>ł_^Ybɉ 3 q.iTGbD,7E:j,pu蛿;'Pje쏌7;"/pS1!dDjfneW"0x++dwΒ
ߙ`bҤ /<皎S-^'+}D+ӄHN+)rI ƕcYlʔl'
6hO,,{$治gEQ`|g EP˾w.1iNXuAd+\;}@[eфoH9^ƛ Xa1qhUu1dz^gqt/Y8;'vkSY m Cl /vN ;u>BhM{8goǪ_ć'e 1sD$a~umR)˞ļs.Kp 0E,X@D|
3^ ܾƏ{j+'s,/#ʲkG.N, N
o/J-ZKv}]'fBO9)1簾We 3۽ cZV 8'T k#[~1Bs19ZT]4K((hmzW]?5Jvܢu]'xq Yb`[}pCM_}2-0h5 >m*szO{Ub 8'pN?~''pN 2.Z 8'pGE]>;LpN 8')R hQH[p
~w٣IՎOpN 8'и XiIN={l iֻk {^>5srIyE{MyN 8'@F>}۩g"noVăcMKZB-YT[+{k}N 8'jMݻg#ȓj (HuJwN 8'@E8($'pN (uJwN 8'@pQWMrN 8'~]e IENDB` | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCacheTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.when;
import static org.awaitility.Awaitility.*;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository;
import com.google.common.collect.Lists;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
/**
* @author nisiyong
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class AccessKeyServiceWithCacheTest {
private AccessKeyServiceWithCache accessKeyServiceWithCache;
@Mock
private AccessKeyRepository accessKeyRepository;
@Mock
private BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
@Before
public void setUp() {
accessKeyServiceWithCache = new AccessKeyServiceWithCache(accessKeyRepository, bizConfig);
scanInterval = 50;
scanIntervalTimeUnit = TimeUnit.MILLISECONDS;
when(bizConfig.accessKeyCacheScanInterval()).thenReturn(scanInterval);
when(bizConfig.accessKeyCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
when(bizConfig.accessKeyCacheRebuildInterval()).thenReturn(scanInterval);
when(bizConfig.accessKeyCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
Awaitility.reset();
Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit);
Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit);
}
@Test
public void testGetAvailableSecrets() throws Exception {
String appId = "someAppId";
AccessKey firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false,
false, 1577808000000L);
AccessKey secondAccessKey = assembleAccessKey(2L, appId, "secret-2", false,
false, 1577808001000L);
AccessKey thirdAccessKey = assembleAccessKey(3L, appId, "secret-3", true,
false, 1577808005000L);
// Initialize
accessKeyServiceWithCache.afterPropertiesSet();
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty();
// Add access key, disable by default
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(0L)))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
// Update access key, enable both of them
firstAccessKey = assembleAccessKey(1L, appId, "secret-1", true, false, 1577808002000L);
secondAccessKey = assembleAccessKey(2L, appId, "secret-2", true, false, 1577808003000L);
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808001000L)))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-1", "secret-2"));
// should also work with appid in different case
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toUpperCase()))
.containsExactly("secret-1", "secret-2");
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toLowerCase()))
.containsExactly("secret-1", "secret-2");
// Update access key, disable the first one
firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false, false, 1577808004000L);
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808003000L)))
.thenReturn(Lists.newArrayList(firstAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-2"));
// Delete access key, delete the second one
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey));
await().untilAsserted(
() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
// Add new access key in runtime, enable by default
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808004000L)))
.thenReturn(Lists.newArrayList(thirdAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, thirdAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-3"));
reachabilityFence(accessKeyServiceWithCache);
}
public AccessKey assembleAccessKey(Long id, String appId, String secret, boolean enabled,
boolean deleted, long dataChangeLastModifiedTime) {
AccessKey accessKey = new AccessKey();
accessKey.setId(id);
accessKey.setAppId(appId);
accessKey.setSecret(secret);
accessKey.setEnabled(enabled);
accessKey.setDeleted(deleted);
accessKey.setDataChangeLastModifiedTime(new Date(dataChangeLastModifiedTime));
return accessKey;
}
/**
* the referenced object is not reclaimable by garbage collection at least until after the
* invocation of this method. see the java 9 method {@link java.lang.ref.Reference#reachabilityFence}
* see the netty consistency method for JDK 6-8 {@link io.netty.util.ResourceLeakDetector.DefaultResourceLeak#reachabilityFence0}
*
* @param ref the reference
*/
private static void reachabilityFence(Object ref) {
if (ref != null) {
synchronized (ref) {
}
}
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.when;
import static org.awaitility.Awaitility.*;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository;
import com.google.common.collect.Lists;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
/**
* @author nisiyong
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class AccessKeyServiceWithCacheTest {
private AccessKeyServiceWithCache accessKeyServiceWithCache;
@Mock
private AccessKeyRepository accessKeyRepository;
@Mock
private BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
@Before
public void setUp() {
accessKeyServiceWithCache = new AccessKeyServiceWithCache(accessKeyRepository, bizConfig);
scanInterval = 50;
scanIntervalTimeUnit = TimeUnit.MILLISECONDS;
when(bizConfig.accessKeyCacheScanInterval()).thenReturn(scanInterval);
when(bizConfig.accessKeyCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
when(bizConfig.accessKeyCacheRebuildInterval()).thenReturn(scanInterval);
when(bizConfig.accessKeyCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
Awaitility.reset();
Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit);
Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit);
}
@Test
public void testGetAvailableSecrets() throws Exception {
String appId = "someAppId";
AccessKey firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false,
false, 1577808000000L);
AccessKey secondAccessKey = assembleAccessKey(2L, appId, "secret-2", false,
false, 1577808001000L);
AccessKey thirdAccessKey = assembleAccessKey(3L, appId, "secret-3", true,
false, 1577808005000L);
// Initialize
accessKeyServiceWithCache.afterPropertiesSet();
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty();
// Add access key, disable by default
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(0L)))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
// Update access key, enable both of them
firstAccessKey = assembleAccessKey(1L, appId, "secret-1", true, false, 1577808002000L);
secondAccessKey = assembleAccessKey(2L, appId, "secret-2", true, false, 1577808003000L);
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808001000L)))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-1", "secret-2"));
// should also work with appid in different case
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toUpperCase()))
.containsExactly("secret-1", "secret-2");
assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toLowerCase()))
.containsExactly("secret-1", "secret-2");
// Update access key, disable the first one
firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false, false, 1577808004000L);
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808003000L)))
.thenReturn(Lists.newArrayList(firstAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-2"));
// Delete access key, delete the second one
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey));
await().untilAsserted(
() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
// Add new access key in runtime, enable by default
when(accessKeyRepository.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(new Date(1577808004000L)))
.thenReturn(Lists.newArrayList(thirdAccessKey));
when(accessKeyRepository.findAllById(anyList()))
.thenReturn(Lists.newArrayList(firstAccessKey, thirdAccessKey));
await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
.containsExactly("secret-3"));
reachabilityFence(accessKeyServiceWithCache);
}
public AccessKey assembleAccessKey(Long id, String appId, String secret, boolean enabled,
boolean deleted, long dataChangeLastModifiedTime) {
AccessKey accessKey = new AccessKey();
accessKey.setId(id);
accessKey.setAppId(appId);
accessKey.setSecret(secret);
accessKey.setEnabled(enabled);
accessKey.setDeleted(deleted);
accessKey.setDataChangeLastModifiedTime(new Date(dataChangeLastModifiedTime));
return accessKey;
}
/**
* the referenced object is not reclaimable by garbage collection at least until after the
* invocation of this method. see the java 9 method {@link java.lang.ref.Reference#reachabilityFence}
* see the netty consistency method for JDK 6-8 {@link io.netty.util.ResourceLeakDetector.DefaultResourceLeak#reachabilityFence0}
*
* @param ref the reference
*/
private static void reachabilityFence(Object ref) {
if (ref != null) {
synchronized (ref) {
}
}
}
} | -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/model/NamespaceReleaseModel.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.model;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
public class NamespaceReleaseModel implements Verifiable {
private String appId;
private String env;
private String clusterName;
private String namespaceName;
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
@Override
public boolean isInvalid() {
return StringUtils.isContainEmpty(appId, env, clusterName, namespaceName, releaseTitle);
}
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;
}
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;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.model;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
public class NamespaceReleaseModel implements Verifiable {
private String appId;
private String env;
private String clusterName;
private String namespaceName;
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
@Override
public boolean isInvalid() {
return StringUtils.isContainEmpty(appId, env, clusterName, namespaceName, releaseTitle);
}
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;
}
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,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/io/IOUtils.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals.io;
public class IOUtils {
public static final int EOF = -1;
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals.io;
public class IOUtils {
public static final int EOF = -1;
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class BaseIntegrationTest {
private static final int PORT = findFreePort();
private static final String metaServiceUrl = "http://localhost:" + PORT;
private static final String someAppName = "someAppName";
private static final String someInstanceId = "someInstanceId";
private static final String configServiceURL = "http://localhost:" + PORT;
protected static String someAppId;
protected static String someClusterName;
protected static String someDataCenter;
protected static int refreshInterval;
protected static TimeUnit refreshTimeUnit;
protected static boolean propertiesOrderEnabled;
private Server server;
protected Gson gson = new Gson();
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty(ConfigConsts.APOLLO_META_KEY, metaServiceUrl);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(ConfigConsts.APOLLO_META_KEY);
}
@Before
public void setUp() throws Exception {
someAppId = "1003171";
someClusterName = "someClusterName";
someDataCenter = "someDC";
refreshInterval = 5;
refreshTimeUnit = TimeUnit.MINUTES;
propertiesOrderEnabled = false;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
}
@After
public void tearDown() throws Exception {
//as ConfigService is singleton, so we must manually clear its container
ConfigService.reset();
MockInjector.reset();
if (server != null && server.isStarted()) {
server.stop();
}
}
/**
* init and start a jetty server, remember to call server.stop when the task is finished
*
* @param handlers
* @throws Exception
*/
protected Server startServerWithHandlers(ContextHandler... handlers) throws Exception {
server = new Server(PORT);
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.setHandlers(handlers);
contexts.addHandler(mockMetaServerHandler());
server.setHandler(contexts);
server.start();
return server;
}
protected ContextHandler mockMetaServerHandler() {
return mockMetaServerHandler(false);
}
protected ContextHandler mockMetaServerHandler(final boolean failedAtFirstTime) {
final ServiceDTO someServiceDTO = new ServiceDTO();
someServiceDTO.setAppName(someAppName);
someServiceDTO.setInstanceId(someInstanceId);
someServiceDTO.setHomepageUrl(configServiceURL);
final AtomicInteger counter = new AtomicInteger(0);
ContextHandler context = new ContextHandler("/services/config");
context.setHandler(new AbstractHandler() {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
if (failedAtFirstTime && counter.incrementAndGet() == 1) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
baseRequest.setHandled(true);
return;
}
response.setContentType("application/json;charset=UTF-8");
response.setStatus(HttpServletResponse.SC_OK);
response.getWriter().println(gson.toJson(Lists.newArrayList(someServiceDTO)));
baseRequest.setHandled(true);
}
});
return context;
}
protected void setRefreshInterval(int refreshInterval) {
BaseIntegrationTest.refreshInterval = refreshInterval;
}
protected void setRefreshTimeUnit(TimeUnit refreshTimeUnit) {
BaseIntegrationTest.refreshTimeUnit = refreshTimeUnit;
}
protected void setPropertiesOrderEnabled(boolean propertiesOrderEnabled) {
BaseIntegrationTest.propertiesOrderEnabled = propertiesOrderEnabled;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someClusterName;
}
@Override
public int getRefreshInterval() {
return refreshInterval;
}
@Override
public TimeUnit getRefreshIntervalTimeUnit() {
return refreshTimeUnit;
}
@Override
public Env getApolloEnv() {
return Env.DEV;
}
@Override
public String getDataCenter() {
return someDataCenter;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public String getDefaultLocalCacheDir() {
return ClassLoaderUtil.getClassPath();
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
@Override
public boolean isPropertiesOrderEnabled() {
return propertiesOrderEnabled;
}
}
/**
* Returns a free port number on localhost.
* <p>
* Heavily inspired from org.eclipse.jdt.launching.SocketUtil (to avoid a dependency to JDT just
* because of this). Slightly improved with close() missing in JDT. And throws exception instead
* of returning -1.
*
* @return a free port number on localhost
* @throws IllegalStateException if unable to find a free port
*/
private static int findFreePort() {
ServerSocket socket = null;
try {
socket = new ServerSocket(0);
socket.setReuseAddress(true);
int port = socket.getLocalPort();
try {
socket.close();
} catch (IOException e) {
// Ignore IOException on close()
}
return port;
} catch (IOException e) {
} finally {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
}
}
}
throw new IllegalStateException(
"Could not find a free TCP/IP port to start embedded Jetty HTTP Server on");
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class BaseIntegrationTest {
private static final int PORT = findFreePort();
private static final String metaServiceUrl = "http://localhost:" + PORT;
private static final String someAppName = "someAppName";
private static final String someInstanceId = "someInstanceId";
private static final String configServiceURL = "http://localhost:" + PORT;
protected static String someAppId;
protected static String someClusterName;
protected static String someDataCenter;
protected static int refreshInterval;
protected static TimeUnit refreshTimeUnit;
protected static boolean propertiesOrderEnabled;
private Server server;
protected Gson gson = new Gson();
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty(ConfigConsts.APOLLO_META_KEY, metaServiceUrl);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(ConfigConsts.APOLLO_META_KEY);
}
@Before
public void setUp() throws Exception {
someAppId = "1003171";
someClusterName = "someClusterName";
someDataCenter = "someDC";
refreshInterval = 5;
refreshTimeUnit = TimeUnit.MINUTES;
propertiesOrderEnabled = false;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
}
@After
public void tearDown() throws Exception {
//as ConfigService is singleton, so we must manually clear its container
ConfigService.reset();
MockInjector.reset();
if (server != null && server.isStarted()) {
server.stop();
}
}
/**
* init and start a jetty server, remember to call server.stop when the task is finished
*
* @param handlers
* @throws Exception
*/
protected Server startServerWithHandlers(ContextHandler... handlers) throws Exception {
server = new Server(PORT);
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.setHandlers(handlers);
contexts.addHandler(mockMetaServerHandler());
server.setHandler(contexts);
server.start();
return server;
}
protected ContextHandler mockMetaServerHandler() {
return mockMetaServerHandler(false);
}
protected ContextHandler mockMetaServerHandler(final boolean failedAtFirstTime) {
final ServiceDTO someServiceDTO = new ServiceDTO();
someServiceDTO.setAppName(someAppName);
someServiceDTO.setInstanceId(someInstanceId);
someServiceDTO.setHomepageUrl(configServiceURL);
final AtomicInteger counter = new AtomicInteger(0);
ContextHandler context = new ContextHandler("/services/config");
context.setHandler(new AbstractHandler() {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
if (failedAtFirstTime && counter.incrementAndGet() == 1) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
baseRequest.setHandled(true);
return;
}
response.setContentType("application/json;charset=UTF-8");
response.setStatus(HttpServletResponse.SC_OK);
response.getWriter().println(gson.toJson(Lists.newArrayList(someServiceDTO)));
baseRequest.setHandled(true);
}
});
return context;
}
protected void setRefreshInterval(int refreshInterval) {
BaseIntegrationTest.refreshInterval = refreshInterval;
}
protected void setRefreshTimeUnit(TimeUnit refreshTimeUnit) {
BaseIntegrationTest.refreshTimeUnit = refreshTimeUnit;
}
protected void setPropertiesOrderEnabled(boolean propertiesOrderEnabled) {
BaseIntegrationTest.propertiesOrderEnabled = propertiesOrderEnabled;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someClusterName;
}
@Override
public int getRefreshInterval() {
return refreshInterval;
}
@Override
public TimeUnit getRefreshIntervalTimeUnit() {
return refreshTimeUnit;
}
@Override
public Env getApolloEnv() {
return Env.DEV;
}
@Override
public String getDataCenter() {
return someDataCenter;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public String getDefaultLocalCacheDir() {
return ClassLoaderUtil.getClassPath();
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
@Override
public boolean isPropertiesOrderEnabled() {
return propertiesOrderEnabled;
}
}
/**
* Returns a free port number on localhost.
* <p>
* Heavily inspired from org.eclipse.jdt.launching.SocketUtil (to avoid a dependency to JDT just
* because of this). Slightly improved with close() missing in JDT. And throws exception instead
* of returning -1.
*
* @return a free port number on localhost
* @throws IllegalStateException if unable to find a free port
*/
private static int findFreePort() {
ServerSocket socket = null;
try {
socket = new ServerSocket(0);
socket.setReuseAddress(true);
int port = socket.getLocalPort();
try {
socket.close();
} catch (IOException e) {
// Ignore IOException on close()
}
return port;
} catch (IOException e) {
} finally {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
}
}
}
throw new IllegalStateException(
"Could not find a free TCP/IP port to start embedded Jetty HTTP Server on");
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/DefaultApolloConfigRegistrarHelper.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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.EnableApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import com.google.common.collect.Lists;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
public class DefaultApolloConfigRegistrarHelper implements ApolloConfigRegistrarHelper {
private Environment environment;
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(importingClassMetadata.getAnnotationAttributes(EnableApolloConfig.class.getName()));
final String[] namespaces = attributes.getStringArray("value");
final int order = attributes.getNumber("order");
final String[] resolvedNamespaces = this.resolveNamespaces(namespaces);
PropertySourcesProcessor.addNamespaces(Lists.newArrayList(resolvedNamespaces), order);
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, PropertySourcesProcessor.class.getName(),
PropertySourcesProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueDefinitionProcessor.class.getName(),
SpringValueDefinitionProcessor.class);
}
private String[] resolveNamespaces(String[] namespaces) {
String[] resolvedNamespaces = new String[namespaces.length];
for (int i = 0; i < namespaces.length; i++) {
// throw IllegalArgumentException if given text is null or if any placeholders are unresolvable
resolvedNamespaces[i] = this.environment.resolveRequiredPlaceholders(namespaces[i]);
}
return resolvedNamespaces;
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
@Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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.EnableApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import com.google.common.collect.Lists;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
public class DefaultApolloConfigRegistrarHelper implements ApolloConfigRegistrarHelper {
private Environment environment;
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(importingClassMetadata.getAnnotationAttributes(EnableApolloConfig.class.getName()));
final String[] namespaces = attributes.getStringArray("value");
final int order = attributes.getNumber("order");
final String[] resolvedNamespaces = this.resolveNamespaces(namespaces);
PropertySourcesProcessor.addNamespaces(Lists.newArrayList(resolvedNamespaces), order);
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, PropertySourcesProcessor.class.getName(),
PropertySourcesProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueDefinitionProcessor.class.getName(),
SpringValueDefinitionProcessor.class);
}
private String[] resolveNamespaces(String[] namespaces) {
String[] resolvedNamespaces = new String[namespaces.length];
for (int i = 0; i < namespaces.length; i++) {
// throw IllegalArgumentException if given text is null or if any placeholders are unresolvable
resolvedNamespaces[i] = this.environment.resolveRequiredPlaceholders(namespaces[i]);
}
return resolvedNamespaces;
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
@Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
}
| -1 |
apolloconfig/apollo | 3,840 | use official docker images for manual kubernetes deployment | ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | nobodyiam | 2021-07-24T13:15:10Z | 2021-07-25T22:58:51Z | b2d666f68ebbe0b1d592b0494dde8ce2a598560a | fa4386faee2548aa16aab828127a38a28327fe30 | use official docker images for manual kubernetes deployment. ## What's the purpose of this PR
Use official docker images for manual kubernetes deployment
## Brief changelog
1. use official docker images
2. remove unnecessary docker build scripts
3. remove custom database scripts and let users use standard ones
4. use built-in default environment names instead of test-alpha and test-beta
5. adjust default replica to 2
6. remove init container check as there is no strict requirement of container startup sequence
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md). | ./apollo-portal/src/main/resources/static/vendor/select2/select2.min.js | /*! Select2 4.0.7 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"\","&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c.__cache={};var e=0;return c.GetUniqueElementId=function(a){var b=a.getAttribute("data-select2-id");return null==b&&(a.id?(b=a.id,a.setAttribute("data-select2-id",b)):(a.setAttribute("data-select2-id",++e),b=e.toString())),b},c.StoreData=function(a,b,d){var e=c.GetUniqueElementId(a);c.__cache[e]||(c.__cache[e]={}),c.__cache[e][b]=d},c.GetData=function(b,d){var e=c.GetUniqueElementId(b);return d?c.__cache[e]&&null!=c.__cache[e][d]?c.__cache[e][d]:a(b).data(d):c.__cache[e]},c.RemoveData=function(a){var b=c.GetUniqueElementId(a);null!=c.__cache[b]&&delete c.__cache[b]},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var c=this;this.data.current(function(d){var e=a.map(d,function(a){return a.id.toString()});c.$results.find(".select2-results__option[aria-selected]").each(function(){var c=a(this),d=b.GetData(this,"data"),f=""+d.id;null!=d.element&&d.element.selected||null==d.element&&a.inArray(f,e)>-1?c.attr("aria-selected","true"):c.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(c){var d=document.createElement("li");d.className="select2-results__option";var e={role:"treeitem","aria-selected":"false"};c.disabled&&(delete e["aria-selected"],e["aria-disabled"]="true"),null==c.id&&delete e["aria-selected"],null!=c._resultId&&(d.id=c._resultId),c.title&&(d.title=c.title),c.children&&(e.role="group",e["aria-label"]=c.text,delete e["aria-selected"]);for(var f in e){var g=e[f];d.setAttribute(f,g)}if(c.children){var h=a(d),i=document.createElement("strong");i.className="select2-results__group";a(i);this.template(c,i);for(var j=[],k=0;k<c.children.length;k++){var l=c.children[k],m=this.option(l);j.push(m)}var n=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});n.append(j),h.append(i),h.append(n)}else this.template(c,d);return b.StoreData(d,"data",c),d},c.prototype.bind=function(c,d){var e=this,f=c.id+"-results";this.$results.attr("id",f),c.on("results:all",function(a){e.clear(),e.append(a.data),c.isOpen()&&(e.setClasses(),e.highlightFirstItem())}),c.on("results:append",function(a){e.append(a.data),c.isOpen()&&e.setClasses()}),c.on("query",function(a){e.hideMessages(),e.showLoading(a)}),c.on("select",function(){c.isOpen()&&(e.setClasses(),e.options.get("scrollAfterSelect")&&e.highlightFirstItem())}),c.on("unselect",function(){c.isOpen()&&(e.setClasses(),e.options.get("scrollAfterSelect")&&e.highlightFirstItem())}),c.on("open",function(){e.$results.attr("aria-expanded","true"),e.$results.attr("aria-hidden","false"),e.setClasses(),e.ensureHighlightVisible()}),c.on("close",function(){e.$results.attr("aria-expanded","false"),e.$results.attr("aria-hidden","true"),e.$results.removeAttr("aria-activedescendant")}),c.on("results:toggle",function(){var a=e.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),c.on("results:select",function(){var a=e.getHighlightedResults();if(0!==a.length){var c=b.GetData(a[0],"data");"true"==a.attr("aria-selected")?e.trigger("close",{}):e.trigger("select",{data:c})}}),c.on("results:previous",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a);if(!(c<=0)){var d=c-1;0===a.length&&(d=0);var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top,h=f.offset().top,i=e.$results.scrollTop()+(h-g);0===d?e.$results.scrollTop(0):h-g<0&&e.$results.scrollTop(i)}}),c.on("results:next",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a),d=c+1;if(!(d>=b.length)){var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top+e.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=e.$results.scrollTop()+h-g;0===d?e.$results.scrollTop(0):h>g&&e.$results.scrollTop(i)}}),c.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),c.on("results:message",function(a){e.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=e.$results.scrollTop(),c=e.$results.get(0).scrollHeight-b+a.deltaY,d=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=e.$results.height();d?(e.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(e.$results.scrollTop(e.$results.get(0).scrollHeight-e.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(c){var d=a(this),f=b.GetData(this,"data");if("true"===d.attr("aria-selected"))return void(e.options.get("multiple")?e.trigger("unselect",{originalEvent:c,data:f}):e.trigger("close",{}));e.trigger("select",{originalEvent:c,data:f})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(c){var d=b.GetData(this,"data");e.getHighlightedResults().removeClass("select2-results__option--highlighted"),e.trigger("results:focus",{data:d,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var c=a('<span class="select2-selection" role="combobox" aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=b.GetData(this.$element[0],"old-tabindex")?this._tabindex=b.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),c.attr("title",this.$element.attr("title")),c.attr("tabindex",this._tabindex),this.$selection=c,c},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),window.setTimeout(function(){d.$selection.focus()},0),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(c){a(document.body).on("mousedown.select2."+c.id,function(c){var d=a(c.target),e=d.closest(".select2");a(".select2.select2-container--open").each(function(){a(this),this!=e[0]&&b.GetData(this,"element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()})},e.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.attr("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,e){var f=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){f.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!f.options.get("disabled")){var d=a(this),e=d.parent(),g=c.GetData(e[0],"data");f.trigger("unselect",{originalEvent:b,data:g})}})},d.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">×</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.attr("title",e.title||e.text),c.StoreData(f[0],"data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(a,b,c){function d(){}return d.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},d.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var d=this.$selection.find(".select2-selection__clear");if(0!==d.length){b.stopPropagation();var e=c.GetData(d[0],"data"),f=this.$element.val();this.$element.val(this.placeholder.id);var g={data:e};if(this.trigger("clear",g),g.prevented)return void this.$element.val(f);for(var h=0;h<e.length;h++)if(g={data:e[h]},this.trigger("unselect",g),g.prevented)return void this.$element.val(f);this.$element.trigger("change"),this.trigger("toggle",{})}}},d.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},d.prototype.update=function(b,d){if(b.call(this,d),!(this.$selection.find(".select2-selection__placeholder").length>0||0===d.length)){var e=this.options.get("translations").get("removeAllItems"),f=a('<span class="select2-selection__clear" title="'+e()+'">×</span>');c.StoreData(f[0],"data",d),this.$selection.find(".select2-selection__rendered").prepend(f)}},d}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,d,e){var f=this;a.call(this,d,e),d.on("open",function(){f.$search.trigger("focus")}),d.on("close",function(){f.$search.val(""),f.$search.removeAttr("aria-activedescendant"),f.$search.trigger("focus")}),d.on("enable",function(){f.$search.prop("disabled",!1),f._transferTabIndex()}),d.on("disable",function(){f.$search.prop("disabled",!0)}),d.on("focus",function(a){f.$search.trigger("focus")}),d.on("results:focus",function(a){f.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){f.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){f._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),f.trigger("keypress",a),f._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===f.$search.val()){var d=f.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var e=b.GetData(d[0],"data");f.searchRemoveChoice(e),a.preventDefault()}}});var g=document.documentMode,h=g&&g<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(h)return void f.$selection.off("input.search input.searchcheck");f.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(h&&"input"===a.type)return void f.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&f.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;if(this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c){this.$element.find("[data-select2-tag]").length?this.$element.focus():this.$search.focus()}},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],g=["opening","closing","selecting","unselecting","clearing"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){b.RemoveData(this)})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var d;a.children?(d=document.createElement("optgroup"),d.label=a.text):(d=document.createElement("option"),void 0!==d.textContent?d.textContent=a.text:d.innerText=a.text),void 0!==a.id&&(d.value=a.id),a.disabled&&(d.disabled=!0),a.selected&&(d.selected=!0),a.title&&(d.title=a.title);var e=c(d),f=this._normalizeItem(a);return f.element=d,b.StoreData(d,"data",f),e},d.prototype.item=function(a){var d={};if(null!=(d=b.GetData(a[0],"data")))return d;if(a.is("option"))d={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){d={text:a.prop("label"),children:[],title:a.prop("title")};for(var e=a.children("option"),f=[],g=0;g<e.length;g++){var h=c(e[g]),i=this.item(h);f.push(i)}d.children=f}return d=this._normalizeItem(d),d.element=a[0],b.StoreData(a[0],"data",d),d},d.prototype._normalizeItem=function(a){a!==Object(a)&&(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){"status"in d&&(0===d.status||"0"===d.status)||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val(""),e.$search.blur()}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){b.StoreData(this,"select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(c){var d=b.GetData(this,"select2-scroll-position");a(this).scrollTop(d.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",["../utils"],function(a){function b(){}return b.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},b.prototype._handleSelectOnClose=function(b,c){if(c&&null!=c.originalSelect2Event){var d=c.originalSelect2Event;if("select"===d._type||"unselect"===d._type)return}var e=this.getHighlightedResults();if(!(e.length<1)){var f=a.GetData(e[0],"data");null!=f.element&&f.element.selected||null==f.element&&f.selected||this.trigger("select",{data:f})}},b}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&(c.ctrlKey||c.metaKey)||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(!0,this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){function c(a,b){return b.toUpperCase()}var e=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),d.GetData(a[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),d.StoreData(a[0],"data",d.GetData(a[0],"select2Tags")),d.StoreData(a[0],"tags",!0)),d.GetData(a[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",d.GetData(a[0],"ajaxUrl")),d.StoreData(a[0],"ajax-Url",d.GetData(a[0],"ajaxUrl")));for(var f={},g=0;g<a[0].attributes.length;g++){var h=a[0].attributes[g].name,i="data-";if(h.substr(0,i.length)==i){var j=h.substring(i.length),k=d.GetData(a[0],j);f[j.replace(/-([a-z])/g,c)]=k}}b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset&&(f=b.extend(!0,{},a[0].dataset,f));var l=b.extend(!0,{},d.GetData(a[0]),f);l=d._convertData(l);for(var m in l)b.inArray(m,e)>-1||(b.isPlainObject(this.options[m])?b.extend(this.options[m],l[m]):this.options[m]=l[m]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,d){null!=c.GetData(a[0],"select2")&&c.GetData(a[0],"select2").destroy(),this.$element=a,this.id=this._generateId(a),d=d||{},this.options=new b(d,a),e.__super__.constructor.call(this);var f=a.attr("tabindex")||0;c.StoreData(a[0],"old-tabindex",f),a.attr("tabindex","-1");var g=this.options.get("dataAdapter");this.dataAdapter=new g(a,this.options);var h=this.render();this._placeContainer(h);var i=this.options.get("selectionAdapter");this.selection=new i(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,h);var j=this.options.get("dropdownAdapter");this.dropdown=new j(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,h);var k=this.options.get("resultsAdapter");this.results=new k(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){l.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),c.StoreData(a[0],"select2",this),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",c.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),c.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),c.StoreData(b[0],"element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(a,b,c,d,e){if(null==a.fn.select2){var f=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,g=Array.prototype.slice.call(arguments,1);return this.each(function(){var a=e.GetData(this,"select2");null==a&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=a[b].apply(a,g)}),a.inArray(b,f)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c}); | /*! Select2 4.0.7 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"\","&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c.__cache={};var e=0;return c.GetUniqueElementId=function(a){var b=a.getAttribute("data-select2-id");return null==b&&(a.id?(b=a.id,a.setAttribute("data-select2-id",b)):(a.setAttribute("data-select2-id",++e),b=e.toString())),b},c.StoreData=function(a,b,d){var e=c.GetUniqueElementId(a);c.__cache[e]||(c.__cache[e]={}),c.__cache[e][b]=d},c.GetData=function(b,d){var e=c.GetUniqueElementId(b);return d?c.__cache[e]&&null!=c.__cache[e][d]?c.__cache[e][d]:a(b).data(d):c.__cache[e]},c.RemoveData=function(a){var b=c.GetUniqueElementId(a);null!=c.__cache[b]&&delete c.__cache[b]},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var c=this;this.data.current(function(d){var e=a.map(d,function(a){return a.id.toString()});c.$results.find(".select2-results__option[aria-selected]").each(function(){var c=a(this),d=b.GetData(this,"data"),f=""+d.id;null!=d.element&&d.element.selected||null==d.element&&a.inArray(f,e)>-1?c.attr("aria-selected","true"):c.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(c){var d=document.createElement("li");d.className="select2-results__option";var e={role:"treeitem","aria-selected":"false"};c.disabled&&(delete e["aria-selected"],e["aria-disabled"]="true"),null==c.id&&delete e["aria-selected"],null!=c._resultId&&(d.id=c._resultId),c.title&&(d.title=c.title),c.children&&(e.role="group",e["aria-label"]=c.text,delete e["aria-selected"]);for(var f in e){var g=e[f];d.setAttribute(f,g)}if(c.children){var h=a(d),i=document.createElement("strong");i.className="select2-results__group";a(i);this.template(c,i);for(var j=[],k=0;k<c.children.length;k++){var l=c.children[k],m=this.option(l);j.push(m)}var n=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});n.append(j),h.append(i),h.append(n)}else this.template(c,d);return b.StoreData(d,"data",c),d},c.prototype.bind=function(c,d){var e=this,f=c.id+"-results";this.$results.attr("id",f),c.on("results:all",function(a){e.clear(),e.append(a.data),c.isOpen()&&(e.setClasses(),e.highlightFirstItem())}),c.on("results:append",function(a){e.append(a.data),c.isOpen()&&e.setClasses()}),c.on("query",function(a){e.hideMessages(),e.showLoading(a)}),c.on("select",function(){c.isOpen()&&(e.setClasses(),e.options.get("scrollAfterSelect")&&e.highlightFirstItem())}),c.on("unselect",function(){c.isOpen()&&(e.setClasses(),e.options.get("scrollAfterSelect")&&e.highlightFirstItem())}),c.on("open",function(){e.$results.attr("aria-expanded","true"),e.$results.attr("aria-hidden","false"),e.setClasses(),e.ensureHighlightVisible()}),c.on("close",function(){e.$results.attr("aria-expanded","false"),e.$results.attr("aria-hidden","true"),e.$results.removeAttr("aria-activedescendant")}),c.on("results:toggle",function(){var a=e.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),c.on("results:select",function(){var a=e.getHighlightedResults();if(0!==a.length){var c=b.GetData(a[0],"data");"true"==a.attr("aria-selected")?e.trigger("close",{}):e.trigger("select",{data:c})}}),c.on("results:previous",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a);if(!(c<=0)){var d=c-1;0===a.length&&(d=0);var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top,h=f.offset().top,i=e.$results.scrollTop()+(h-g);0===d?e.$results.scrollTop(0):h-g<0&&e.$results.scrollTop(i)}}),c.on("results:next",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a),d=c+1;if(!(d>=b.length)){var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top+e.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=e.$results.scrollTop()+h-g;0===d?e.$results.scrollTop(0):h>g&&e.$results.scrollTop(i)}}),c.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),c.on("results:message",function(a){e.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=e.$results.scrollTop(),c=e.$results.get(0).scrollHeight-b+a.deltaY,d=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=e.$results.height();d?(e.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(e.$results.scrollTop(e.$results.get(0).scrollHeight-e.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(c){var d=a(this),f=b.GetData(this,"data");if("true"===d.attr("aria-selected"))return void(e.options.get("multiple")?e.trigger("unselect",{originalEvent:c,data:f}):e.trigger("close",{}));e.trigger("select",{originalEvent:c,data:f})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(c){var d=b.GetData(this,"data");e.getHighlightedResults().removeClass("select2-results__option--highlighted"),e.trigger("results:focus",{data:d,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var c=a('<span class="select2-selection" role="combobox" aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=b.GetData(this.$element[0],"old-tabindex")?this._tabindex=b.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),c.attr("title",this.$element.attr("title")),c.attr("tabindex",this._tabindex),this.$selection=c,c},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),window.setTimeout(function(){d.$selection.focus()},0),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(c){a(document.body).on("mousedown.select2."+c.id,function(c){var d=a(c.target),e=d.closest(".select2");a(".select2.select2-container--open").each(function(){a(this),this!=e[0]&&b.GetData(this,"element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()})},e.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.attr("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,e){var f=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){f.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!f.options.get("disabled")){var d=a(this),e=d.parent(),g=c.GetData(e[0],"data");f.trigger("unselect",{originalEvent:b,data:g})}})},d.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">×</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.attr("title",e.title||e.text),c.StoreData(f[0],"data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(a,b,c){function d(){}return d.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},d.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var d=this.$selection.find(".select2-selection__clear");if(0!==d.length){b.stopPropagation();var e=c.GetData(d[0],"data"),f=this.$element.val();this.$element.val(this.placeholder.id);var g={data:e};if(this.trigger("clear",g),g.prevented)return void this.$element.val(f);for(var h=0;h<e.length;h++)if(g={data:e[h]},this.trigger("unselect",g),g.prevented)return void this.$element.val(f);this.$element.trigger("change"),this.trigger("toggle",{})}}},d.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},d.prototype.update=function(b,d){if(b.call(this,d),!(this.$selection.find(".select2-selection__placeholder").length>0||0===d.length)){var e=this.options.get("translations").get("removeAllItems"),f=a('<span class="select2-selection__clear" title="'+e()+'">×</span>');c.StoreData(f[0],"data",d),this.$selection.find(".select2-selection__rendered").prepend(f)}},d}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,d,e){var f=this;a.call(this,d,e),d.on("open",function(){f.$search.trigger("focus")}),d.on("close",function(){f.$search.val(""),f.$search.removeAttr("aria-activedescendant"),f.$search.trigger("focus")}),d.on("enable",function(){f.$search.prop("disabled",!1),f._transferTabIndex()}),d.on("disable",function(){f.$search.prop("disabled",!0)}),d.on("focus",function(a){f.$search.trigger("focus")}),d.on("results:focus",function(a){f.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){f.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){f._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),f.trigger("keypress",a),f._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===f.$search.val()){var d=f.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var e=b.GetData(d[0],"data");f.searchRemoveChoice(e),a.preventDefault()}}});var g=document.documentMode,h=g&&g<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(h)return void f.$selection.off("input.search input.searchcheck");f.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(h&&"input"===a.type)return void f.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&f.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;if(this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c){this.$element.find("[data-select2-tag]").length?this.$element.focus():this.$search.focus()}},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],g=["opening","closing","selecting","unselecting","clearing"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){b.RemoveData(this)})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var d;a.children?(d=document.createElement("optgroup"),d.label=a.text):(d=document.createElement("option"),void 0!==d.textContent?d.textContent=a.text:d.innerText=a.text),void 0!==a.id&&(d.value=a.id),a.disabled&&(d.disabled=!0),a.selected&&(d.selected=!0),a.title&&(d.title=a.title);var e=c(d),f=this._normalizeItem(a);return f.element=d,b.StoreData(d,"data",f),e},d.prototype.item=function(a){var d={};if(null!=(d=b.GetData(a[0],"data")))return d;if(a.is("option"))d={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){d={text:a.prop("label"),children:[],title:a.prop("title")};for(var e=a.children("option"),f=[],g=0;g<e.length;g++){var h=c(e[g]),i=this.item(h);f.push(i)}d.children=f}return d=this._normalizeItem(d),d.element=a[0],b.StoreData(a[0],"data",d),d},d.prototype._normalizeItem=function(a){a!==Object(a)&&(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){"status"in d&&(0===d.status||"0"===d.status)||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val(""),e.$search.blur()}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){b.StoreData(this,"select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(c){var d=b.GetData(this,"select2-scroll-position");a(this).scrollTop(d.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",["../utils"],function(a){function b(){}return b.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},b.prototype._handleSelectOnClose=function(b,c){if(c&&null!=c.originalSelect2Event){var d=c.originalSelect2Event;if("select"===d._type||"unselect"===d._type)return}var e=this.getHighlightedResults();if(!(e.length<1)){var f=a.GetData(e[0],"data");null!=f.element&&f.element.selected||null==f.element&&f.selected||this.trigger("select",{data:f})}},b}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&(c.ctrlKey||c.metaKey)||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(!0,this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){function c(a,b){return b.toUpperCase()}var e=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),d.GetData(a[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),d.StoreData(a[0],"data",d.GetData(a[0],"select2Tags")),d.StoreData(a[0],"tags",!0)),d.GetData(a[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",d.GetData(a[0],"ajaxUrl")),d.StoreData(a[0],"ajax-Url",d.GetData(a[0],"ajaxUrl")));for(var f={},g=0;g<a[0].attributes.length;g++){var h=a[0].attributes[g].name,i="data-";if(h.substr(0,i.length)==i){var j=h.substring(i.length),k=d.GetData(a[0],j);f[j.replace(/-([a-z])/g,c)]=k}}b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset&&(f=b.extend(!0,{},a[0].dataset,f));var l=b.extend(!0,{},d.GetData(a[0]),f);l=d._convertData(l);for(var m in l)b.inArray(m,e)>-1||(b.isPlainObject(this.options[m])?b.extend(this.options[m],l[m]):this.options[m]=l[m]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,d){null!=c.GetData(a[0],"select2")&&c.GetData(a[0],"select2").destroy(),this.$element=a,this.id=this._generateId(a),d=d||{},this.options=new b(d,a),e.__super__.constructor.call(this);var f=a.attr("tabindex")||0;c.StoreData(a[0],"old-tabindex",f),a.attr("tabindex","-1");var g=this.options.get("dataAdapter");this.dataAdapter=new g(a,this.options);var h=this.render();this._placeContainer(h);var i=this.options.get("selectionAdapter");this.selection=new i(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,h);var j=this.options.get("dropdownAdapter");this.dropdown=new j(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,h);var k=this.options.get("resultsAdapter");this.results=new k(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){l.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),c.StoreData(a[0],"select2",this),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",c.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),c.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),c.StoreData(b[0],"element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(a,b,c,d,e){if(null==a.fn.select2){var f=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,g=Array.prototype.slice.call(arguments,1);return this.each(function(){var a=e.GetData(this,"select2");null==a&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=a[b].apply(a,g)}),a.inArray(b,f)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c}); | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@Service
public class AppNamespaceService {
private static final int PRIVATE_APP_NAMESPACE_NOTIFICATION_COUNT = 5;
private static final Joiner APP_NAMESPACE_JOINER = Joiner.on(",").skipNulls();
private final UserInfoHolder userInfoHolder;
private final AppNamespaceRepository appNamespaceRepository;
private final RoleInitializationService roleInitializationService;
private final AppService appService;
private final RolePermissionService rolePermissionService;
public AppNamespaceService(
final UserInfoHolder userInfoHolder,
final AppNamespaceRepository appNamespaceRepository,
final RoleInitializationService roleInitializationService,
final @Lazy AppService appService,
final RolePermissionService rolePermissionService) {
this.userInfoHolder = userInfoHolder;
this.appNamespaceRepository = appNamespaceRepository;
this.roleInitializationService = roleInitializationService;
this.appService = appService;
this.rolePermissionService = rolePermissionService;
}
/**
* 公共的app ns,能被其它项目关联到的app ns
*/
public List<AppNamespace> findPublicAppNamespaces() {
return appNamespaceRepository.findByIsPublicTrue();
}
public AppNamespace findPublicAppNamespace(String namespaceName) {
List<AppNamespace> appNamespaces = appNamespaceRepository.findByNameAndIsPublic(namespaceName, true);
if (CollectionUtils.isEmpty(appNamespaces)) {
return null;
}
return appNamespaces.get(0);
}
private List<AppNamespace> findAllPrivateAppNamespaces(String namespaceName) {
return appNamespaceRepository.findByNameAndIsPublic(namespaceName, false);
}
public AppNamespace findByAppIdAndName(String appId, String namespaceName) {
return appNamespaceRepository.findByAppIdAndName(appId, namespaceName);
}
public List<AppNamespace> findByAppId(String appId) {
return appNamespaceRepository.findByAppId(appId);
}
@Transactional
public void createDefaultAppNamespace(String appId) {
if (!isAppNamespaceNameUnique(appId, ConfigConsts.NAMESPACE_APPLICATION)) {
throw new BadRequestException(String.format("App already has application namespace. AppId = %s", appId));
}
AppNamespace appNs = new AppNamespace();
appNs.setAppId(appId);
appNs.setName(ConfigConsts.NAMESPACE_APPLICATION);
appNs.setComment("default app namespace");
appNs.setFormat(ConfigFileFormat.Properties.getValue());
String userId = userInfoHolder.getUser().getUserId();
appNs.setDataChangeCreatedBy(userId);
appNs.setDataChangeLastModifiedBy(userId);
appNamespaceRepository.save(appNs);
}
public boolean isAppNamespaceNameUnique(String appId, String namespaceName) {
Objects.requireNonNull(appId, "AppId must not be null");
Objects.requireNonNull(namespaceName, "Namespace must not be null");
return Objects.isNull(appNamespaceRepository.findByAppIdAndName(appId, namespaceName));
}
public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace) {
return createAppNamespaceInLocal(appNamespace, true);
}
@Transactional
public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace, boolean appendNamespacePrefix) {
String appId = appNamespace.getAppId();
//add app org id as prefix
App app = appService.load(appId);
if (app == null) {
throw new BadRequestException("App not exist. AppId = " + appId);
}
// public namespaces only allow properties format
if (appNamespace.isPublic()) {
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
}
StringBuilder appNamespaceName = new StringBuilder();
//add prefix postfix
appNamespaceName
.append(appNamespace.isPublic() && appendNamespacePrefix ? app.getOrgId() + "." : "")
.append(appNamespace.getName())
.append(appNamespace.formatAsEnum() == ConfigFileFormat.Properties ? "" : "." + appNamespace.getFormat());
appNamespace.setName(appNamespaceName.toString());
if (appNamespace.getComment() == null) {
appNamespace.setComment("");
}
if (!ConfigFileFormat.isValidFormat(appNamespace.getFormat())) {
throw new BadRequestException("Invalid namespace format. format must be properties、json、yaml、yml、xml");
}
String operator = appNamespace.getDataChangeCreatedBy();
if (StringUtils.isEmpty(operator)) {
operator = userInfoHolder.getUser().getUserId();
appNamespace.setDataChangeCreatedBy(operator);
}
appNamespace.setDataChangeLastModifiedBy(operator);
// globally uniqueness check for public app namespace
if (appNamespace.isPublic()) {
checkAppNamespaceGlobalUniqueness(appNamespace);
} else {
// check private app namespace
if (appNamespaceRepository.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName()) != null) {
throw new BadRequestException("Private AppNamespace " + appNamespace.getName() + " already exists!");
}
// should not have the same with public app namespace
checkPublicAppNamespaceGlobalUniqueness(appNamespace);
}
AppNamespace createdAppNamespace = appNamespaceRepository.save(appNamespace);
roleInitializationService.initNamespaceRoles(appNamespace.getAppId(), appNamespace.getName(), operator);
roleInitializationService.initNamespaceEnvRoles(appNamespace.getAppId(), appNamespace.getName(), operator);
return createdAppNamespace;
}
private void checkAppNamespaceGlobalUniqueness(AppNamespace appNamespace) {
checkPublicAppNamespaceGlobalUniqueness(appNamespace);
List<AppNamespace> privateAppNamespaces = findAllPrivateAppNamespaces(appNamespace.getName());
if (!CollectionUtils.isEmpty(privateAppNamespaces)) {
Set<String> appIds = Sets.newHashSet();
for (AppNamespace ans : privateAppNamespaces) {
appIds.add(ans.getAppId());
if (appIds.size() == PRIVATE_APP_NAMESPACE_NOTIFICATION_COUNT) {
break;
}
}
throw new BadRequestException(
"Public AppNamespace " + appNamespace.getName() + " already exists as private AppNamespace in appId: "
+ APP_NAMESPACE_JOINER.join(appIds) + ", etc. Please select another name!");
}
}
private void checkPublicAppNamespaceGlobalUniqueness(AppNamespace appNamespace) {
AppNamespace publicAppNamespace = findPublicAppNamespace(appNamespace.getName());
if (publicAppNamespace != null) {
throw new BadRequestException("AppNamespace " + appNamespace.getName() + " already exists as public namespace in appId: " + publicAppNamespace.getAppId() + "!");
}
}
@Transactional
public AppNamespace deleteAppNamespace(String appId, String namespaceName) {
AppNamespace appNamespace = appNamespaceRepository.findByAppIdAndName(appId, namespaceName);
if (appNamespace == null) {
throw new BadRequestException(
String.format("AppNamespace not exists. AppId = %s, NamespaceName = %s", appId, namespaceName));
}
String operator = userInfoHolder.getUser().getUserId();
// this operator is passed to com.ctrip.framework.apollo.portal.listener.DeletionListener.onAppNamespaceDeletionEvent
appNamespace.setDataChangeLastModifiedBy(operator);
// delete app namespace in portal db
appNamespaceRepository.delete(appId, namespaceName, operator);
// delete Permission and Role related data
rolePermissionService.deleteRolePermissionsByAppIdAndNamespace(appId, namespaceName, operator);
return appNamespace;
}
public void batchDeleteByAppId(String appId, String operator) {
appNamespaceRepository.batchDeleteByAppId(appId, operator);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@Service
public class AppNamespaceService {
private static final int PRIVATE_APP_NAMESPACE_NOTIFICATION_COUNT = 5;
private static final Joiner APP_NAMESPACE_JOINER = Joiner.on(",").skipNulls();
private final UserInfoHolder userInfoHolder;
private final AppNamespaceRepository appNamespaceRepository;
private final RoleInitializationService roleInitializationService;
private final AppService appService;
private final RolePermissionService rolePermissionService;
public AppNamespaceService(
final UserInfoHolder userInfoHolder,
final AppNamespaceRepository appNamespaceRepository,
final RoleInitializationService roleInitializationService,
final @Lazy AppService appService,
final RolePermissionService rolePermissionService) {
this.userInfoHolder = userInfoHolder;
this.appNamespaceRepository = appNamespaceRepository;
this.roleInitializationService = roleInitializationService;
this.appService = appService;
this.rolePermissionService = rolePermissionService;
}
/**
* 公共的app ns,能被其它项目关联到的app ns
*/
public List<AppNamespace> findPublicAppNamespaces() {
return appNamespaceRepository.findByIsPublicTrue();
}
public AppNamespace findPublicAppNamespace(String namespaceName) {
List<AppNamespace> appNamespaces = appNamespaceRepository.findByNameAndIsPublic(namespaceName, true);
if (CollectionUtils.isEmpty(appNamespaces)) {
return null;
}
return appNamespaces.get(0);
}
private List<AppNamespace> findAllPrivateAppNamespaces(String namespaceName) {
return appNamespaceRepository.findByNameAndIsPublic(namespaceName, false);
}
public AppNamespace findByAppIdAndName(String appId, String namespaceName) {
return appNamespaceRepository.findByAppIdAndName(appId, namespaceName);
}
public List<AppNamespace> findByAppId(String appId) {
return appNamespaceRepository.findByAppId(appId);
}
@Transactional
public void createDefaultAppNamespace(String appId) {
if (!isAppNamespaceNameUnique(appId, ConfigConsts.NAMESPACE_APPLICATION)) {
throw new BadRequestException(String.format("App already has application namespace. AppId = %s", appId));
}
AppNamespace appNs = new AppNamespace();
appNs.setAppId(appId);
appNs.setName(ConfigConsts.NAMESPACE_APPLICATION);
appNs.setComment("default app namespace");
appNs.setFormat(ConfigFileFormat.Properties.getValue());
String userId = userInfoHolder.getUser().getUserId();
appNs.setDataChangeCreatedBy(userId);
appNs.setDataChangeLastModifiedBy(userId);
appNamespaceRepository.save(appNs);
}
public boolean isAppNamespaceNameUnique(String appId, String namespaceName) {
Objects.requireNonNull(appId, "AppId must not be null");
Objects.requireNonNull(namespaceName, "Namespace must not be null");
return Objects.isNull(appNamespaceRepository.findByAppIdAndName(appId, namespaceName));
}
public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace) {
return createAppNamespaceInLocal(appNamespace, true);
}
@Transactional
public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace, boolean appendNamespacePrefix) {
String appId = appNamespace.getAppId();
//add app org id as prefix
App app = appService.load(appId);
if (app == null) {
throw new BadRequestException("App not exist. AppId = " + appId);
}
// public namespaces only allow properties format
// if (appNamespace.isPublic()) {
// appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
// }
StringBuilder appNamespaceName = new StringBuilder();
//add prefix postfix
appNamespaceName
.append(appNamespace.isPublic() && appendNamespacePrefix ? app.getOrgId() + "." : "")
.append(appNamespace.getName())
.append(appNamespace.formatAsEnum() == ConfigFileFormat.Properties ? "" : "." + appNamespace.getFormat());
appNamespace.setName(appNamespaceName.toString());
if (appNamespace.getComment() == null) {
appNamespace.setComment("");
}
if (!ConfigFileFormat.isValidFormat(appNamespace.getFormat())) {
throw new BadRequestException("Invalid namespace format. format must be properties、json、yaml、yml、xml");
}
String operator = appNamespace.getDataChangeCreatedBy();
if (StringUtils.isEmpty(operator)) {
operator = userInfoHolder.getUser().getUserId();
appNamespace.setDataChangeCreatedBy(operator);
}
appNamespace.setDataChangeLastModifiedBy(operator);
// globally uniqueness check for public app namespace
if (appNamespace.isPublic()) {
checkAppNamespaceGlobalUniqueness(appNamespace);
} else {
// check private app namespace
if (appNamespaceRepository.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName()) != null) {
throw new BadRequestException("Private AppNamespace " + appNamespace.getName() + " already exists!");
}
// should not have the same with public app namespace
checkPublicAppNamespaceGlobalUniqueness(appNamespace);
}
AppNamespace createdAppNamespace = appNamespaceRepository.save(appNamespace);
roleInitializationService.initNamespaceRoles(appNamespace.getAppId(), appNamespace.getName(), operator);
roleInitializationService.initNamespaceEnvRoles(appNamespace.getAppId(), appNamespace.getName(), operator);
return createdAppNamespace;
}
private void checkAppNamespaceGlobalUniqueness(AppNamespace appNamespace) {
checkPublicAppNamespaceGlobalUniqueness(appNamespace);
List<AppNamespace> privateAppNamespaces = findAllPrivateAppNamespaces(appNamespace.getName());
if (!CollectionUtils.isEmpty(privateAppNamespaces)) {
Set<String> appIds = Sets.newHashSet();
for (AppNamespace ans : privateAppNamespaces) {
appIds.add(ans.getAppId());
if (appIds.size() == PRIVATE_APP_NAMESPACE_NOTIFICATION_COUNT) {
break;
}
}
throw new BadRequestException(
"Public AppNamespace " + appNamespace.getName() + " already exists as private AppNamespace in appId: "
+ APP_NAMESPACE_JOINER.join(appIds) + ", etc. Please select another name!");
}
}
private void checkPublicAppNamespaceGlobalUniqueness(AppNamespace appNamespace) {
AppNamespace publicAppNamespace = findPublicAppNamespace(appNamespace.getName());
if (publicAppNamespace != null) {
throw new BadRequestException("AppNamespace " + appNamespace.getName() + " already exists as public namespace in appId: " + publicAppNamespace.getAppId() + "!");
}
}
@Transactional
public AppNamespace deleteAppNamespace(String appId, String namespaceName) {
AppNamespace appNamespace = appNamespaceRepository.findByAppIdAndName(appId, namespaceName);
if (appNamespace == null) {
throw new BadRequestException(
String.format("AppNamespace not exists. AppId = %s, NamespaceName = %s", appId, namespaceName));
}
String operator = userInfoHolder.getUser().getUserId();
// this operator is passed to com.ctrip.framework.apollo.portal.listener.DeletionListener.onAppNamespaceDeletionEvent
appNamespace.setDataChangeLastModifiedBy(operator);
// delete app namespace in portal db
appNamespaceRepository.delete(appId, namespaceName, operator);
// delete Permission and Role related data
rolePermissionService.deleteRolePermissionsByAppIdAndNamespace(appId, namespaceName, operator);
return appNamespace;
}
public void batchDeleteByAppId(String appId, String operator) {
appNamespaceRepository.batchDeleteByAppId(appId, operator);
}
}
| 1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/namespace.html | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!doctype html>
<html ng-app="namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Namespace.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">{{'Namespace.Title' | translate }}
<small><a target="_blank"
href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace">
{{'Namespace.UnderstandMore' | translate }}
</a> </small>
</div>
<div class="col-md-6 text-right">
<button type="button" class="btn btn-info"
ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius">
<strong>Tips:</strong>
<ul ng-show="type == 'link'">
<li>{{'Namespace.Link.Tips1' | translate }}</li>
<li>{{'Namespace.Link.Tips2' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && appNamespace.isPublic">
<li>{{'Namespace.CreatePublic.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips4' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && !appNamespace.isPublic">
<li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li>
</ul>
</div>
<div class="row text-right" style="padding-right: 20px;">
<div class="btn-group btn-group-sm" role="group" aria-label="...">
<button type="button" class="btn btn-default" ng-class="{active:type=='link'}"
ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }}
</button>
<button type="button" class="btn btn-default" ng-class="{active:type=='create'}"
ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }}
</button>
</div>
</div>
<form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace"
style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label>
<div class="col-sm-6" valdr-form-group>
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-horizontal" ng-show="type == 'link'">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.ChooseCluster' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true"
apollo-select="collectSelectedClusters"></apolloclusterselector>
</div>
</div>
</div>
<div class="form-group" ng-show="type == 'create'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceName' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}">
<span class="input-group-addon"
ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="appBaseInfo.namespacePrefix"></span>
<input type="text" name="namespaceName" class="form-control"
ng-model="appNamespace.name">
</div>
</div>
<!--public namespace can only be properties -->
<div class="col-sm-2" ng-show="!appNamespace.isPublic">
<select class="form-control" name="format" ng-model="appNamespace.format">
<option value="properties">properties</option>
<option value="xml">xml</option>
<option value="json">json</option>
<option value="yml">yml</option>
<option value="yaml">yaml</option>
<option value="txt">txt</option>
</select>
</div>
<span ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="concatNamespace()" style="line-height: 34px;"></span>
</div>
<div class="form-group" ng-show="type == 'create' && appNamespace.isPublic">
<label class="col-sm-3 control-label">
{{'Namespace.AutoAddDepartmentPrefix' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<div>
<label class="checkbox-inline">
<input type="checkbox" ng-model="appendNamespacePrefix" />
{{appBaseInfo.namespacePrefix}}
</label>
</div>
<small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small>
</div>
</div>
<div class="form-group"
ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceType' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="true" ng-value="true"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="false" ng-value="false"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="type == 'create'" valdr-form-group>
<label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label>
<div class="col-sm-7" valdr-form-group>
<textarea class="form-control" rows="3" name="comment"
ng-model="appNamespace.comment"></textarea>
</div>
</div>
<div class="form-group" ng-show="type == 'link'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.Namespace' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<select id="namespaces">
<option></option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/NamespaceController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!doctype html>
<html ng-app="namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Namespace.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">{{'Namespace.Title' | translate }}
<small><a target="_blank"
href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace">
{{'Namespace.UnderstandMore' | translate }}
</a> </small>
</div>
<div class="col-md-6 text-right">
<button type="button" class="btn btn-info"
ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius">
<strong>Tips:</strong>
<ul ng-show="type == 'link'">
<li>{{'Namespace.Link.Tips1' | translate }}</li>
<li>{{'Namespace.Link.Tips2' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && appNamespace.isPublic">
<li>{{'Namespace.CreatePublic.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips4' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && !appNamespace.isPublic">
<li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li>
</ul>
</div>
<div class="row text-right" style="padding-right: 20px;">
<div class="btn-group btn-group-sm" role="group" aria-label="...">
<button type="button" class="btn btn-default" ng-class="{active:type=='link'}"
ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }}
</button>
<button type="button" class="btn btn-default" ng-class="{active:type=='create'}"
ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }}
</button>
</div>
</div>
<form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace"
style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label>
<div class="col-sm-6" valdr-form-group>
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-horizontal" ng-show="type == 'link'">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.ChooseCluster' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true"
apollo-select="collectSelectedClusters"></apolloclusterselector>
</div>
</div>
</div>
<div class="form-group" ng-show="type == 'create'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceName' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}">
<span class="input-group-addon"
ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="appBaseInfo.namespacePrefix"></span>
<input type="text" name="namespaceName" class="form-control"
ng-model="appNamespace.name">
</div>
</div>
<!--public namespace can only be properties -->
<div class="col-sm-2">
<select class="form-control" name="format" ng-model="appNamespace.format">
<option value="properties">properties</option>
<option value="xml">xml</option>
<option value="json">json</option>
<option value="yml">yml</option>
<option value="yaml">yaml</option>
<option value="txt">txt</option>
</select>
</div>
<span ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="concatNamespace()" style="line-height: 34px;"></span>
</div>
<div class="form-group" ng-show="type == 'create' && appNamespace.isPublic">
<label class="col-sm-3 control-label">
{{'Namespace.AutoAddDepartmentPrefix' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<div>
<label class="checkbox-inline">
<input type="checkbox" ng-model="appendNamespacePrefix" />
{{appBaseInfo.namespacePrefix}}
</label>
</div>
<small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small>
</div>
</div>
<div class="form-group"
ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceType' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="true" ng-value="true"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="false" ng-value="false"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="type == 'create'" valdr-form-group>
<label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label>
<div class="col-sm-7" valdr-form-group>
<textarea class="form-control" rows="3" name="comment"
ng-model="appNamespace.comment"></textarea>
</div>
</div>
<div class="form-group" ng-show="type == 'link'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.Namespace' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<select id="namespaces">
<option></option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/NamespaceController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | 1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
namespace_module.controller("LinkNamespaceController",
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'NamespaceService',
'PermissionService', 'CommonService',
function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, NamespaceService,
PermissionService, CommonService) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.type = 'link';
$scope.step = 1;
$scope.submitBtnDisabled = false;
$scope.appendNamespacePrefix = true;
PermissionService.has_root_permission().then(function (result) {
$scope.hasRootPermission = result.hasPermission;
});
CommonService.getPageSetting().then(function (setting) {
$scope.pageSetting = setting;
});
NamespaceService.find_public_namespaces().then(function (result) {
var publicNamespaces = [];
result.forEach(function (item) {
var namespace = {};
namespace.id = item.name;
namespace.text = item.name;
publicNamespaces.push(namespace);
});
$('#namespaces').select2({
placeholder: $translate.instant('Namespace.PleaseChooseNamespace'),
width: '100%',
data: publicNamespaces
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingPublicNamespaceError'));
});
AppService.load($scope.appId).then(function (result) {
$scope.appBaseInfo = result;
$scope.appBaseInfo.namespacePrefix = result.orgId + '.';
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingAppInfoError'));
});
$scope.appNamespace = {
appId: $scope.appId,
name: '',
comment: '',
isPublic: true,
format: 'properties'
};
$scope.switchNSType = function (type) {
$scope.appNamespace.isPublic = type;
};
$scope.concatNamespace = function () {
if (!$scope.appBaseInfo) {
return '';
}
var appNamespaceName = $scope.appNamespace.name ? $scope.appNamespace.name : '';
if (shouldAppendNamespacePrefix()) {
return $scope.appBaseInfo.namespacePrefix + appNamespaceName;
}
return appNamespaceName;
};
function shouldAppendNamespacePrefix() {
return $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
}
var selectedClusters = [];
$scope.collectSelectedClusters = function (data) {
selectedClusters = data;
};
$scope.createNamespace = function () {
if ($scope.type == 'link') {
if (selectedClusters.length == 0) {
toastr.warning($translate.instant('Namespace.PleaseChooseCluster'));
return;
}
if ($scope.namespaceType == 1) {
var selectedNamespaceName = $('#namespaces').select2('data')[0].id;
if (!selectedNamespaceName) {
toastr.warning($translate.instant('Namespace.PleaseChooseNamespace'));
return;
}
$scope.namespaceName = selectedNamespaceName;
}
var namespaceCreationModels = [];
selectedClusters.forEach(function (cluster) {
namespaceCreationModels.push({
env: cluster.env,
namespace: {
appId: $scope.appId,
clusterName: cluster.clusterName,
namespaceName: $scope.namespaceName
}
});
});
$scope.submitBtnDisabled = true;
NamespaceService.createNamespace($scope.appId, namespaceCreationModels)
.then(function (result) {
toastr.success($translate.instant('Common.Created'));
$scope.step = 2;
setInterval(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + '/namespace/role.html?#appid=' + $scope.appId
+ "&namespaceName=" + $scope.namespaceName;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result));
});
} else {
var namespaceNameLength = $scope.concatNamespace().length;
if (namespaceNameLength > 32) {
var errorTip = $translate.instant('Namespace.CheckNamespaceNameLengthTip', {
departmentLength: namespaceNameLength - $scope.appNamespace.name.length,
namespaceLength: $scope.appNamespace.name.length
});
toastr.error(errorTip);
return;
}
// public namespaces only allow properties format
if ($scope.appNamespace.isPublic) {
$scope.appNamespace.format = 'properties';
}
$scope.submitBtnDisabled = true;
//only append namespace prefix for public app namespace
var appendNamespacePrefix = shouldAppendNamespacePrefix();
NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace, appendNamespacePrefix).then(
function (result) {
$scope.step = 2;
setTimeout(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + "/namespace/role.html?#/appid=" + $scope.appId
+ "&namespaceName=" + result.name;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed'));
});
}
};
$scope.namespaceType = 1;
$scope.selectNamespaceType = function (type) {
$scope.namespaceType = type;
};
$scope.back = function () {
$window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.appId;
};
$scope.switchType = function (type) {
$scope.type = type;
};
}]);
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
namespace_module.controller("LinkNamespaceController",
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'NamespaceService',
'PermissionService', 'CommonService',
function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, NamespaceService,
PermissionService, CommonService) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.type = 'link';
$scope.step = 1;
$scope.submitBtnDisabled = false;
$scope.appendNamespacePrefix = true;
PermissionService.has_root_permission().then(function (result) {
$scope.hasRootPermission = result.hasPermission;
});
CommonService.getPageSetting().then(function (setting) {
$scope.pageSetting = setting;
});
NamespaceService.find_public_namespaces().then(function (result) {
var publicNamespaces = [];
result.forEach(function (item) {
var namespace = {};
namespace.id = item.name;
namespace.text = item.name;
publicNamespaces.push(namespace);
});
$('#namespaces').select2({
placeholder: $translate.instant('Namespace.PleaseChooseNamespace'),
width: '100%',
data: publicNamespaces
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingPublicNamespaceError'));
});
AppService.load($scope.appId).then(function (result) {
$scope.appBaseInfo = result;
$scope.appBaseInfo.namespacePrefix = result.orgId + '.';
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingAppInfoError'));
});
$scope.appNamespace = {
appId: $scope.appId,
name: '',
comment: '',
isPublic: true,
format: 'properties'
};
$scope.switchNSType = function (type) {
$scope.appNamespace.isPublic = type;
};
$scope.concatNamespace = function () {
if (!$scope.appBaseInfo) {
return '';
}
var appNamespaceName = $scope.appNamespace.name ? $scope.appNamespace.name : '';
if (shouldAppendNamespacePrefix()) {
return $scope.appBaseInfo.namespacePrefix + appNamespaceName;
}
return appNamespaceName;
};
function shouldAppendNamespacePrefix() {
//return $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
return $scope.appendNamespacePrefix;
}
var selectedClusters = [];
$scope.collectSelectedClusters = function (data) {
selectedClusters = data;
};
$scope.createNamespace = function () {
if ($scope.type == 'link') {
if (selectedClusters.length == 0) {
toastr.warning($translate.instant('Namespace.PleaseChooseCluster'));
return;
}
if ($scope.namespaceType == 1) {
var selectedNamespaceName = $('#namespaces').select2('data')[0].id;
if (!selectedNamespaceName) {
toastr.warning($translate.instant('Namespace.PleaseChooseNamespace'));
return;
}
$scope.namespaceName = selectedNamespaceName;
}
var namespaceCreationModels = [];
selectedClusters.forEach(function (cluster) {
namespaceCreationModels.push({
env: cluster.env,
namespace: {
appId: $scope.appId,
clusterName: cluster.clusterName,
namespaceName: $scope.namespaceName
}
});
});
$scope.submitBtnDisabled = true;
NamespaceService.createNamespace($scope.appId, namespaceCreationModels)
.then(function (result) {
toastr.success($translate.instant('Common.Created'));
$scope.step = 2;
setInterval(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + '/namespace/role.html?#appid=' + $scope.appId
+ "&namespaceName=" + $scope.namespaceName;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result));
});
} else {
var namespaceNameLength = $scope.concatNamespace().length;
if (namespaceNameLength > 32) {
var errorTip = $translate.instant('Namespace.CheckNamespaceNameLengthTip', {
departmentLength: namespaceNameLength - $scope.appNamespace.name.length,
namespaceLength: $scope.appNamespace.name.length
});
toastr.error(errorTip);
return;
}
// public namespaces only allow properties format
// if ($scope.appNamespace.isPublic) {
// $scope.appNamespace.format = 'properties';
// }
$scope.submitBtnDisabled = true;
//only append namespace prefix for public app namespace
var appendNamespacePrefix = shouldAppendNamespacePrefix();
NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace, appendNamespacePrefix).then(
function (result) {
$scope.step = 2;
setTimeout(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + "/namespace/role.html?#/appid=" + $scope.appId
+ "&namespaceName=" + result.name;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed'));
});
}
};
$scope.namespaceType = 1;
$scope.selectNamespaceType = function (type) {
$scope.namespaceType = type;
};
$scope.back = function () {
$window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.appId;
};
$scope.switchType = function (type) {
$scope.type = type;
};
}]);
| 1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
directive_module.directive('apollonspanel', directive);
function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService,
UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html',
transclude: true,
replace: true,
scope: {
namespace: '=',
appId: '=',
env: '=',
cluster: '=',
user: '=',
lockCheck: '=',
createItem: '=',
editItem: '=',
preDeleteItem: '=',
preRevokeItem: '=',
showText: '=',
showNoModifyPermissionDialog: '=',
preCreateBranch: '=',
preDeleteBranch: '=',
showMergeAndPublishGrayTips: '=',
showBody: "=?",
lazyLoad: "=?"
},
link: function (scope) {
//constants
var namespace_view_type = {
TEXT: 'text',
TABLE: 'table',
HISTORY: 'history',
INSTANCE: 'instance',
RULE: 'rule'
};
var namespace_instance_view_type = {
LATEST_RELEASE: 'latest_release',
NOT_LATEST_RELEASE: 'not_latest_release',
ALL: 'all'
};
var operate_branch_storage_key = 'OperateBranch';
scope.refreshNamespace = refreshNamespace;
scope.switchView = switchView;
scope.toggleItemSearchInput = toggleItemSearchInput;
scope.searchItems = searchItems;
scope.loadCommitHistory = loadCommitHistory;
scope.toggleTextEditStatus = toggleTextEditStatus;
scope.goToSyncPage = goToSyncPage;
scope.goToDiffPage = goToDiffPage;
scope.modifyByText = modifyByText;
scope.syntaxCheck = syntaxCheck;
scope.goToParentAppConfigPage = goToParentAppConfigPage;
scope.switchInstanceViewType = switchInstanceViewType;
scope.switchBranch = switchBranch;
scope.loadInstanceInfo = loadInstanceInfo;
scope.refreshInstancesInfo = refreshInstancesInfo;
scope.deleteRuleItem = deleteRuleItem;
scope.rollback = rollback;
scope.publish = publish;
scope.mergeAndPublish = mergeAndPublish;
scope.addRuleItem = addRuleItem;
scope.editRuleItem = editRuleItem;
scope.deleteNamespace = deleteNamespace;
var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
function (context) {
useRules(context.branch);
}, scope.namespace.baseInfo.namespaceName);
scope.$on('$destroy', function () {
EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
subscriberId, scope.namespace.baseInfo.namespaceName);
});
preInit(scope.namespace);
if (!scope.lazyLoad || scope.namespace.initialized) {
init();
}
function preInit(namespace) {
scope.showNamespaceBody = false;
namespace.isLinkedNamespace =
namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false;
//namespace view name hide suffix
namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace(
".properties", "").replace(".json", "").replace(".yml", "")
.replace(".yaml", "").replace(".txt", "");
}
function init() {
initNamespace(scope.namespace);
initOther();
scope.namespace.initialized = true;
}
function refreshNamespace() {
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{ namespace: scope.namespace });
}
function initNamespace(namespace, viewType) {
namespace.hasBranch = false;
namespace.isBranch = false;
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false,
show: scope.showBody
};
scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml';
namespace.isTextEditing = false;
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.allInstances = [];
namespace.allInstancesPage = 0;
namespace.commitChangeBtnDisabled = false;
generateNamespaceId(namespace);
initNamespaceBranch(namespace);
initNamespaceViewName(namespace);
initNamespaceLock(namespace);
initNamespaceInstancesCount(namespace);
initPermission(namespace);
initLinkedNamespace(namespace);
loadInstanceInfo(namespace);
function initNamespaceBranch(namespace) {
NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.baseInfo) {
return;
}
//namespace has branch
namespace.hasBranch = true;
namespace.branchName = result.baseInfo.clusterName;
//init branch
namespace.branch = result;
namespace.branch.isBranch = true;
namespace.branch.parentNamespace = namespace;
namespace.branch.viewType = namespace_view_type.TABLE;
namespace.branch.isPropertiesFormat = namespace.format == 'properties';
namespace.branch.allInstances = [];//master namespace all instances
namespace.branch.latestReleaseInstances = [];
namespace.branch.latestReleaseInstancesPage = 0;
namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.branch.hasLoadInstances = false;
namespace.branch.displayControl = {
show: true
};
generateNamespaceId(namespace.branch);
initBranchItems(namespace.branch);
initRules(namespace.branch);
loadInstanceInfo(namespace.branch);
initNamespaceLock(namespace.branch);
initPermission(namespace);
initUserOperateBranchScene(namespace);
});
function initBranchItems(branch) {
branch.masterItems = [];
branch.branchItems = [];
var masterItemsMap = {};
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
masterItemsMap[item.item.key] = item;
}
});
var branchItemsMap = {};
var itemModifiedCnt = 0;
branch.items.forEach(function (item) {
var key = item.item.key;
var masterItem = masterItemsMap[key];
//modify master item and set item's masterReleaseValue
if (masterItem) {
item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue;
} else {
item.masterReleaseValue = masterItem.item.value;
}
} else {//delete branch item
item.masterItemExists = false;
}
//delete master item. ignore
if (item.isDeleted && masterItem) {
if (item.masterReleaseValue != item.oldValue) {
itemModifiedCnt++;
branch.branchItems.push(item);
}
} else {//branch's item
branchItemsMap[key] = item;
if (item.isModified) {
itemModifiedCnt++;
}
branch.branchItems.push(item);
}
});
branch.itemModifiedCnt = itemModifiedCnt;
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
if (!branchItemsMap[item.item.key]) {
branch.masterItems.push(item);
} else {
item.hasBranchValue = true;
}
}
})
}
}
function generateNamespaceId(namespace) {
namespace.id = Math.random().toString(36).substr(2);
}
function initPermission(namespace) {
PermissionService.has_modify_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_modify_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
}
});
PermissionService.has_release_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_release_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
}
});
}
function initLinkedNamespace(namespace) {
if (!namespace.isPublic || !namespace.isLinkedNamespace || namespace.format != 'properties') {
return;
}
//load public namespace
ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
var publicNamespace = result;
namespace.publicNamespace = publicNamespace;
var linkNamespaceItemKeys = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
linkNamespaceItemKeys.push(key);
});
publicNamespace.viewItems = [];
publicNamespace.items.forEach(function (item) {
var key = item.item.key;
if (key) {
publicNamespace.viewItems.push(item);
}
item.covered = linkNamespaceItemKeys.indexOf(key) >= 0;
if (item.isModified || item.isDeleted) {
publicNamespace.isModified = true;
} else if (key) {
publicNamespace.hasPublishedItem = true;
}
});
});
}
function initNamespaceViewName(namespace) {
if (!viewType) {
if (namespace.isPropertiesFormat) {
switchView(namespace, namespace_view_type.TABLE);
} else {
switchView(namespace, namespace_view_type.TEXT);
}
} else if (viewType == namespace_view_type.TABLE) {
namespace.viewType = namespace_view_type.TABLE;
}
}
function initNamespaceLock(namespace) {
NamespaceLockService.get_namespace_lock(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.lockOwner = result.lockOwner;
namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed;
});
}
function initUserOperateBranchScene(namespace) {
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join(
"+");
if (!operateBranchStorage) {
operateBranchStorage = {};
}
if (!operateBranchStorage[namespaceId]) {
operateBranchStorage[namespaceId] = namespace.branchName;
}
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
switchBranch(operateBranchStorage[namespaceId], false);
}
}
function initNamespaceInstancesCount(namespace) {
InstanceService.getInstanceCountByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.instancesCount = result.num;
})
}
function initOther() {
UserService.load_user().then(function (result) {
scope.currentUser = result.userId;
});
PermissionService.has_assign_user_permission(scope.appId)
.then(function (result) {
scope.hasAssignUserPermission = result.hasPermission;
}, function (result) {
});
}
function switchBranch(branchName, forceShowBody) {
if (branchName != 'master') {
initRules(scope.namespace.branch);
}
if (forceShowBody) {
scope.showNamespaceBody = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
//save to local storage
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
if (!operateBranchStorage) {
return;
}
var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join(
"+");
operateBranchStorage[namespaceId] = branchName;
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
}
function switchView(namespace, viewType) {
namespace.viewType = viewType;
if (namespace_view_type.TEXT == viewType) {
namespace.text = parseModel2Text(namespace);
} else if (namespace_view_type.TABLE == viewType) {
} else if (namespace_view_type.HISTORY == viewType) {
loadCommitHistory(namespace);
} else if (namespace_view_type.INSTANCE == viewType) {
refreshInstancesInfo(namespace);
}
}
function switchInstanceViewType(namespace, type) {
namespace.instanceViewType = type;
loadInstanceInfo(namespace);
}
function loadCommitHistory(namespace) {
if (!namespace.commits) {
namespace.commits = [];
namespace.commitPage = 0;
}
var size = 10;
CommitService.find_commits(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName,
namespace.commitPage,
size)
.then(function (result) {
if (result.length < size) {
namespace.hasLoadAllCommit = true;
}
for (var i = 0; i < result.length; i++) {
//to json
result[i].changeSets = JSON.parse(result[i].changeSets);
namespace.commits.push(result[i]);
}
namespace.commitPage += 1;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError'));
});
}
function loadInstanceInfo(namespace) {
var size = 20;
if (namespace.isBranch) {
size = 2000;
}
var type = namespace.instanceViewType;
if (namespace_instance_view_type.LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
ReleaseService.findLatestActiveRelease(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.isLatestReleaseLoaded = true;
if (!result) {
namespace.latestReleaseInstances = {};
namespace.latestReleaseInstances.total = 0;
return;
}
namespace.latestRelease = result;
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
namespace.latestReleaseInstances = result;
namespace.latestReleaseInstancesPage++;
})
});
} else {
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
if (result && result.content.length) {
namespace.latestReleaseInstancesPage++;
result.content.forEach(function (instance) {
namespace.latestReleaseInstances.content.push(
instance);
})
}
})
}
} else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
return;
}
InstanceService.findByReleasesNotIn(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
namespace.latestRelease.id)
.then(function (result) {
if (!result || result.length == 0) {
return
}
var groupedInstances = {},
notLatestReleases = [];
result.forEach(function (instance) {
var configs = instance.configs;
if (configs && configs.length > 0) {
configs.forEach(function (instanceConfig) {
var release = instanceConfig.release;
//filter dirty data
if (!release) {
return;
}
if (!groupedInstances[release.id]) {
groupedInstances[release.id] = [];
notLatestReleases.push(release);
}
groupedInstances[release.id].push(instance);
})
}
});
namespace.notLatestReleases = notLatestReleases;
namespace.notLatestReleaseInstances = groupedInstances;
})
} else {
InstanceService.findInstancesByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
'',
namespace.allInstancesPage)
.then(function (result) {
if (result && result.content.length) {
namespace.allInstancesPage++;
result.content.forEach(function (instance) {
namespace.allInstances.push(instance);
})
}
});
}
}
function refreshInstancesInfo(namespace) {
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.latestReleaseInstances = [];
namespace.latestRelease = undefined;
if (!namespace.isBranch) {
namespace.notLatestReleaseNames = [];
namespace.notLatestReleaseInstances = {};
namespace.allInstancesPage = 0;
namespace.allInstances = [];
}
initNamespaceInstancesCount(namespace);
loadInstanceInfo(namespace);
}
function initRules(branch) {
NamespaceBranchService.findBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName)
.then(function (result) {
if (result.appId) {
branch.rules = result;
}
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError'));
});
}
function addRuleItem(branch) {
var newRuleItem = {
clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '',
clientIpList: [],
draftIpList: [],
isNew: true
};
branch.editingRuleItem = newRuleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function editRuleItem(branch, ruleItem) {
ruleItem.isNew = false;
ruleItem.draftIpList = _.clone(ruleItem.clientIpList);
branch.editingRuleItem = ruleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function deleteRuleItem(branch, ruleItem) {
branch.rules.ruleItems.forEach(function (item, index) {
if (item.clientAppId == ruleItem.clientAppId) {
branch.rules.ruleItems.splice(index, 1);
toastr.success($translate.instant('ApolloNsPanel.Deleted'));
}
});
useRules(branch);
}
function useRules(branch) {
NamespaceBranchService.updateBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName,
branch.rules
)
.then(function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified'));
//show tips if branch has not release configs
if (branch.itemModifiedCnt) {
AppUtil.showModal("#updateRuleTips");
}
setTimeout(function () {
refreshInstancesInfo(branch);
}, 1500);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed'));
})
}
function toggleTextEditStatus(namespace) {
if (!scope.lockCheck(namespace)) {
return;
}
namespace.isTextEditing = !namespace.isTextEditing;
if (namespace.isTextEditing) {//切换为编辑状态
namespace.commited = false;
namespace.backupText = namespace.text;
namespace.editText = parseModel2Text(namespace);
} else {
if (!namespace.commited) {//取消编辑,则复原
namespace.text = namespace.backupText;
}
}
}
function goToSyncPage(namespace) {
if (!scope.lockCheck(namespace)) {
return false;
}
$window.location.href =
AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function goToDiffPage(namespace) {
$window.location.href =
AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function modifyByText(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
//prevent repeat submit
if (namespace.commitChangeBtnDisabled) {
return;
}
namespace.commitChangeBtnDisabled = true;
ConfigService.modify_items(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.ModifiedTips'));
//refresh all namespace items
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: namespace
});
return true;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed'));
namespace.commitChangeBtnDisabled = false;
return false;
}
);
namespace.commited = true;
}
function syntaxCheck(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
ConfigService.syntax_check_text(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight'));
}, function (result) {
EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, {
syntaxCheckMessage: AppUtil.pureErrorMsg(result)
});
}
);
}
function goToParentAppConfigPage(namespace) {
$window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId;
$window.location.reload();
}
function parseModel2Text(namespace) {
if (namespace.items.length == 0) {
namespace.itemCnt = 0;
return "";
}
//文件模式
if (!namespace.isPropertiesFormat) {
return parseNotPropertiesText(namespace);
} else {
return parsePropertiesText(namespace);
}
}
function parseNotPropertiesText(namespace) {
var text = namespace.items[0].item.value;
var lineNum = text.split("\n").length;
namespace.itemCnt = lineNum;
return text;
}
function parsePropertiesText(namespace) {
var result = "";
var itemCnt = 0;
namespace.items.forEach(function (item) {
//deleted key
if (!item.item.dataChangeLastModifiedBy) {
return;
}
if (item.item.key) {
//use string \n to display as new line
var itemValue = item.item.value.replace(/\n/g, "\\n");
result +=
item.item.key + " = " + itemValue + "\n";
} else {
result += item.item.comment + "\n";
}
itemCnt++;
});
namespace.itemCnt = itemCnt;
return result;
}
function toggleItemSearchInput(namespace) {
namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput;
}
function searchItems(namespace) {
var searchKey = namespace.searchKey.toLowerCase();
var items = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
if (key && key.toLowerCase().indexOf(searchKey) >= 0) {
items.push(item);
}
});
namespace.viewItems = items;
}
//normal release and gray release
function publish(namespace) {
if (!namespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
return;
} else if (namespace.lockOwner && scope.user == namespace.lockOwner) {
//can not publish if config modified by himself
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: namespace,
mergeAndPublish: false
});
return;
}
if (namespace.isBranch) {
namespace.mergeAndPublish = false;
}
EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE,
{
namespace: namespace
});
}
function mergeAndPublish(branch) {
var parentNamespace = branch.parentNamespace;
if (!parentNamespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
} else if (parentNamespace.itemModifiedCnt > 0) {
AppUtil.showModal('#mergeAndReleaseDenyDialog');
} else if (branch.lockOwner && scope.user == branch.lockOwner) {
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: branch,
mergeAndPublish: true
});
} else {
EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch });
}
}
function rollback(namespace) {
EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace });
}
function deleteNamespace(namespace) {
EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace });
}
//theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min
scope.aceConfig = {
$blockScrolling: Infinity,
showPrintMargin: false,
theme: 'eclipse',
mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format),
onLoad: function (_editor) {
_editor.$blockScrolling = Infinity;
_editor.setOptions({
fontSize: 13,
minLines: 10,
maxLines: 20
})
}
};
setTimeout(function () {
scope.namespace.show = true;
}, 70);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
directive_module.directive('apollonspanel', directive);
function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService,
UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html',
transclude: true,
replace: true,
scope: {
namespace: '=',
appId: '=',
env: '=',
cluster: '=',
user: '=',
lockCheck: '=',
createItem: '=',
editItem: '=',
preDeleteItem: '=',
preRevokeItem: '=',
showText: '=',
showNoModifyPermissionDialog: '=',
preCreateBranch: '=',
preDeleteBranch: '=',
showMergeAndPublishGrayTips: '=',
showBody: "=?",
lazyLoad: "=?"
},
link: function (scope) {
//constants
var namespace_view_type = {
TEXT: 'text',
TABLE: 'table',
HISTORY: 'history',
INSTANCE: 'instance',
RULE: 'rule'
};
var namespace_instance_view_type = {
LATEST_RELEASE: 'latest_release',
NOT_LATEST_RELEASE: 'not_latest_release',
ALL: 'all'
};
var operate_branch_storage_key = 'OperateBranch';
scope.refreshNamespace = refreshNamespace;
scope.switchView = switchView;
scope.toggleItemSearchInput = toggleItemSearchInput;
scope.searchItems = searchItems;
scope.loadCommitHistory = loadCommitHistory;
scope.toggleTextEditStatus = toggleTextEditStatus;
scope.goToSyncPage = goToSyncPage;
scope.goToDiffPage = goToDiffPage;
scope.modifyByText = modifyByText;
scope.syntaxCheck = syntaxCheck;
scope.goToParentAppConfigPage = goToParentAppConfigPage;
scope.switchInstanceViewType = switchInstanceViewType;
scope.switchBranch = switchBranch;
scope.loadInstanceInfo = loadInstanceInfo;
scope.refreshInstancesInfo = refreshInstancesInfo;
scope.deleteRuleItem = deleteRuleItem;
scope.rollback = rollback;
scope.publish = publish;
scope.mergeAndPublish = mergeAndPublish;
scope.addRuleItem = addRuleItem;
scope.editRuleItem = editRuleItem;
scope.deleteNamespace = deleteNamespace;
var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
function (context) {
useRules(context.branch);
}, scope.namespace.baseInfo.namespaceName);
scope.$on('$destroy', function () {
EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
subscriberId, scope.namespace.baseInfo.namespaceName);
});
preInit(scope.namespace);
if (!scope.lazyLoad || scope.namespace.initialized) {
init();
}
function preInit(namespace) {
scope.showNamespaceBody = false;
namespace.isLinkedNamespace =
namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false;
//namespace view name hide suffix
namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace(
".properties", "").replace(".json", "").replace(".yml", "")
.replace(".yaml", "").replace(".txt", "");
}
function init() {
initNamespace(scope.namespace);
initOther();
scope.namespace.initialized = true;
}
function refreshNamespace() {
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{ namespace: scope.namespace });
}
function initNamespace(namespace, viewType) {
namespace.hasBranch = false;
namespace.isBranch = false;
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false,
show: scope.showBody
};
scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml';
namespace.isTextEditing = false;
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.allInstances = [];
namespace.allInstancesPage = 0;
namespace.commitChangeBtnDisabled = false;
generateNamespaceId(namespace);
initNamespaceBranch(namespace);
initNamespaceViewName(namespace);
initNamespaceLock(namespace);
initNamespaceInstancesCount(namespace);
initPermission(namespace);
initLinkedNamespace(namespace);
loadInstanceInfo(namespace);
function initNamespaceBranch(namespace) {
NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.baseInfo) {
return;
}
//namespace has branch
namespace.hasBranch = true;
namespace.branchName = result.baseInfo.clusterName;
//init branch
namespace.branch = result;
namespace.branch.isBranch = true;
namespace.branch.parentNamespace = namespace;
namespace.branch.viewType = namespace_view_type.TABLE;
namespace.branch.isPropertiesFormat = namespace.format == 'properties';
namespace.branch.allInstances = [];//master namespace all instances
namespace.branch.latestReleaseInstances = [];
namespace.branch.latestReleaseInstancesPage = 0;
namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.branch.hasLoadInstances = false;
namespace.branch.displayControl = {
show: true
};
generateNamespaceId(namespace.branch);
initBranchItems(namespace.branch);
initRules(namespace.branch);
loadInstanceInfo(namespace.branch);
initNamespaceLock(namespace.branch);
initPermission(namespace);
initUserOperateBranchScene(namespace);
});
function initBranchItems(branch) {
branch.masterItems = [];
branch.branchItems = [];
var masterItemsMap = {};
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
masterItemsMap[item.item.key] = item;
}
});
var branchItemsMap = {};
var itemModifiedCnt = 0;
branch.items.forEach(function (item) {
var key = item.item.key;
var masterItem = masterItemsMap[key];
//modify master item and set item's masterReleaseValue
if (masterItem) {
item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue;
} else {
item.masterReleaseValue = masterItem.item.value;
}
} else {//delete branch item
item.masterItemExists = false;
}
//delete master item. ignore
if (item.isDeleted && masterItem) {
if (item.masterReleaseValue != item.oldValue) {
itemModifiedCnt++;
branch.branchItems.push(item);
}
} else {//branch's item
branchItemsMap[key] = item;
if (item.isModified) {
itemModifiedCnt++;
}
branch.branchItems.push(item);
}
});
branch.itemModifiedCnt = itemModifiedCnt;
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
if (!branchItemsMap[item.item.key]) {
branch.masterItems.push(item);
} else {
item.hasBranchValue = true;
}
}
})
}
}
function generateNamespaceId(namespace) {
namespace.id = Math.random().toString(36).substr(2);
}
function initPermission(namespace) {
PermissionService.has_modify_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_modify_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
}
});
PermissionService.has_release_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_release_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
}
});
}
function initLinkedNamespace(namespace) {
if (!namespace.isPublic || !namespace.isLinkedNamespace) {
return;
}
//load public namespace
ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
var publicNamespace = result;
namespace.publicNamespace = publicNamespace;
var linkNamespaceItemKeys = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
linkNamespaceItemKeys.push(key);
});
publicNamespace.viewItems = [];
publicNamespace.items.forEach(function (item) {
var key = item.item.key;
if (key) {
publicNamespace.viewItems.push(item);
}
item.covered = linkNamespaceItemKeys.indexOf(key) >= 0;
if (item.isModified || item.isDeleted) {
publicNamespace.isModified = true;
} else if (key) {
publicNamespace.hasPublishedItem = true;
}
});
loadParentNamespaceText(namespace);
});
}
function loadParentNamespaceText(namespace){
namespace.publicNamespaceText = "";
if(namespace.isLinkedNamespace) {
namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace)
}
}
function initNamespaceViewName(namespace) {
if (!viewType) {
if (namespace.isPropertiesFormat) {
switchView(namespace, namespace_view_type.TABLE);
} else {
switchView(namespace, namespace_view_type.TEXT);
}
} else if (viewType == namespace_view_type.TABLE) {
namespace.viewType = namespace_view_type.TABLE;
}
}
function initNamespaceLock(namespace) {
NamespaceLockService.get_namespace_lock(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.lockOwner = result.lockOwner;
namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed;
});
}
function initUserOperateBranchScene(namespace) {
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join(
"+");
if (!operateBranchStorage) {
operateBranchStorage = {};
}
if (!operateBranchStorage[namespaceId]) {
operateBranchStorage[namespaceId] = namespace.branchName;
}
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
switchBranch(operateBranchStorage[namespaceId], false);
}
}
function initNamespaceInstancesCount(namespace) {
InstanceService.getInstanceCountByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.instancesCount = result.num;
})
}
function initOther() {
UserService.load_user().then(function (result) {
scope.currentUser = result.userId;
});
PermissionService.has_assign_user_permission(scope.appId)
.then(function (result) {
scope.hasAssignUserPermission = result.hasPermission;
}, function (result) {
});
}
function switchBranch(branchName, forceShowBody) {
if (branchName != 'master') {
initRules(scope.namespace.branch);
}
if (forceShowBody) {
scope.showNamespaceBody = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
//save to local storage
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
if (!operateBranchStorage) {
return;
}
var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join(
"+");
operateBranchStorage[namespaceId] = branchName;
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
}
function switchView(namespace, viewType) {
namespace.viewType = viewType;
if (namespace_view_type.TEXT == viewType) {
namespace.text = parseModel2Text(namespace);
} else if (namespace_view_type.TABLE == viewType) {
} else if (namespace_view_type.HISTORY == viewType) {
loadCommitHistory(namespace);
} else if (namespace_view_type.INSTANCE == viewType) {
refreshInstancesInfo(namespace);
}
}
function switchInstanceViewType(namespace, type) {
namespace.instanceViewType = type;
loadInstanceInfo(namespace);
}
function loadCommitHistory(namespace) {
if (!namespace.commits) {
namespace.commits = [];
namespace.commitPage = 0;
}
var size = 10;
CommitService.find_commits(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName,
namespace.commitPage,
size)
.then(function (result) {
if (result.length < size) {
namespace.hasLoadAllCommit = true;
}
for (var i = 0; i < result.length; i++) {
//to json
result[i].changeSets = JSON.parse(result[i].changeSets);
namespace.commits.push(result[i]);
}
namespace.commitPage += 1;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError'));
});
}
function loadInstanceInfo(namespace) {
var size = 20;
if (namespace.isBranch) {
size = 2000;
}
var type = namespace.instanceViewType;
if (namespace_instance_view_type.LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
ReleaseService.findLatestActiveRelease(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.isLatestReleaseLoaded = true;
if (!result) {
namespace.latestReleaseInstances = {};
namespace.latestReleaseInstances.total = 0;
return;
}
namespace.latestRelease = result;
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
namespace.latestReleaseInstances = result;
namespace.latestReleaseInstancesPage++;
})
});
} else {
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
if (result && result.content.length) {
namespace.latestReleaseInstancesPage++;
result.content.forEach(function (instance) {
namespace.latestReleaseInstances.content.push(
instance);
})
}
})
}
} else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
return;
}
InstanceService.findByReleasesNotIn(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
namespace.latestRelease.id)
.then(function (result) {
if (!result || result.length == 0) {
return
}
var groupedInstances = {},
notLatestReleases = [];
result.forEach(function (instance) {
var configs = instance.configs;
if (configs && configs.length > 0) {
configs.forEach(function (instanceConfig) {
var release = instanceConfig.release;
//filter dirty data
if (!release) {
return;
}
if (!groupedInstances[release.id]) {
groupedInstances[release.id] = [];
notLatestReleases.push(release);
}
groupedInstances[release.id].push(instance);
})
}
});
namespace.notLatestReleases = notLatestReleases;
namespace.notLatestReleaseInstances = groupedInstances;
})
} else {
InstanceService.findInstancesByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
'',
namespace.allInstancesPage)
.then(function (result) {
if (result && result.content.length) {
namespace.allInstancesPage++;
result.content.forEach(function (instance) {
namespace.allInstances.push(instance);
})
}
});
}
}
function refreshInstancesInfo(namespace) {
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.latestReleaseInstances = [];
namespace.latestRelease = undefined;
if (!namespace.isBranch) {
namespace.notLatestReleaseNames = [];
namespace.notLatestReleaseInstances = {};
namespace.allInstancesPage = 0;
namespace.allInstances = [];
}
initNamespaceInstancesCount(namespace);
loadInstanceInfo(namespace);
}
function initRules(branch) {
NamespaceBranchService.findBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName)
.then(function (result) {
if (result.appId) {
branch.rules = result;
}
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError'));
});
}
function addRuleItem(branch) {
var newRuleItem = {
clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '',
clientIpList: [],
draftIpList: [],
isNew: true
};
branch.editingRuleItem = newRuleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function editRuleItem(branch, ruleItem) {
ruleItem.isNew = false;
ruleItem.draftIpList = _.clone(ruleItem.clientIpList);
branch.editingRuleItem = ruleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function deleteRuleItem(branch, ruleItem) {
branch.rules.ruleItems.forEach(function (item, index) {
if (item.clientAppId == ruleItem.clientAppId) {
branch.rules.ruleItems.splice(index, 1);
toastr.success($translate.instant('ApolloNsPanel.Deleted'));
}
});
useRules(branch);
}
function useRules(branch) {
NamespaceBranchService.updateBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName,
branch.rules
)
.then(function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified'));
//show tips if branch has not release configs
if (branch.itemModifiedCnt) {
AppUtil.showModal("#updateRuleTips");
}
setTimeout(function () {
refreshInstancesInfo(branch);
}, 1500);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed'));
})
}
function toggleTextEditStatus(namespace) {
if (!scope.lockCheck(namespace)) {
return;
}
namespace.isTextEditing = !namespace.isTextEditing;
if (namespace.isTextEditing) {//切换为编辑状态
namespace.commited = false;
namespace.backupText = namespace.text;
namespace.editText = parseModel2Text(namespace);
} else {
if (!namespace.commited) {//取消编辑,则复原
namespace.text = namespace.backupText;
}
}
}
function goToSyncPage(namespace) {
if (!scope.lockCheck(namespace)) {
return false;
}
$window.location.href =
AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function goToDiffPage(namespace) {
$window.location.href =
AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function modifyByText(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
//prevent repeat submit
if (namespace.commitChangeBtnDisabled) {
return;
}
namespace.commitChangeBtnDisabled = true;
ConfigService.modify_items(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.ModifiedTips'));
//refresh all namespace items
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: namespace
});
return true;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed'));
namespace.commitChangeBtnDisabled = false;
return false;
}
);
namespace.commited = true;
}
function syntaxCheck(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
ConfigService.syntax_check_text(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight'));
}, function (result) {
EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, {
syntaxCheckMessage: AppUtil.pureErrorMsg(result)
});
}
);
}
function goToParentAppConfigPage(namespace) {
$window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId;
$window.location.reload();
}
function parseModel2Text(namespace) {
if (namespace.items.length == 0) {
namespace.itemCnt = 0;
return "";
}
//文件模式
if (!namespace.isPropertiesFormat) {
return parseNotPropertiesText(namespace);
} else {
return parsePropertiesText(namespace);
}
}
function parseNotPropertiesText(namespace) {
var text = namespace.items[0].item.value;
var lineNum = text.split("\n").length;
namespace.itemCnt = lineNum;
return text;
}
function parsePropertiesText(namespace) {
var result = "";
var itemCnt = 0;
namespace.items.forEach(function (item) {
//deleted key
if (!item.item.dataChangeLastModifiedBy) {
return;
}
if (item.item.key) {
//use string \n to display as new line
var itemValue = item.item.value.replace(/\n/g, "\\n");
result +=
item.item.key + " = " + itemValue + "\n";
} else {
result += item.item.comment + "\n";
}
itemCnt++;
});
namespace.itemCnt = itemCnt;
return result;
}
function toggleItemSearchInput(namespace) {
namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput;
}
function searchItems(namespace) {
var searchKey = namespace.searchKey.toLowerCase();
var items = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
if (key && key.toLowerCase().indexOf(searchKey) >= 0) {
items.push(item);
}
});
namespace.viewItems = items;
}
//normal release and gray release
function publish(namespace) {
if (!namespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
return;
} else if (namespace.lockOwner && scope.user == namespace.lockOwner) {
//can not publish if config modified by himself
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: namespace,
mergeAndPublish: false
});
return;
}
if (namespace.isBranch) {
namespace.mergeAndPublish = false;
}
EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE,
{
namespace: namespace
});
}
function mergeAndPublish(branch) {
var parentNamespace = branch.parentNamespace;
if (!parentNamespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
} else if (parentNamespace.itemModifiedCnt > 0) {
AppUtil.showModal('#mergeAndReleaseDenyDialog');
} else if (branch.lockOwner && scope.user == branch.lockOwner) {
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: branch,
mergeAndPublish: true
});
} else {
EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch });
}
}
function rollback(namespace) {
EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace });
}
function deleteNamespace(namespace) {
EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace });
}
//theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min
scope.aceConfig = {
$blockScrolling: Infinity,
showPrintMargin: false,
theme: 'eclipse',
mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format),
onLoad: function (_editor) {
_editor.$blockScrolling = Infinity;
_editor.setOptions({
fontSize: 13,
minLines: 10,
maxLines: 20
})
}
};
setTimeout(function () {
scope.namespace.show = true;
}, 70);
}
}
}
| 1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!--master panel body when not initialized-->
<section class="master-panel-body" ng-if="!namespace.initialized">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}"
ng-click="refreshNamespace()">
<img src="img/more.png">
{{'Component.Namespace.Master.LoadNamespace' | translate }}
</button>
</div>
</div>
</header>
</section>
<!--master panel body-->
<section class="master-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)">
<img src="img/release.png">
{{'Component.Namespace.Master.Items.Publish' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}"
ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.Rollback' | translate }}
</button>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}">
<img src="img/release-history.png">
{{'Component.Namespace.Master.Items.PublishHistory' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}"
href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}"
ng-show="hasAssignUserPermission">
<img src="img/assign.png">
{{'Component.Namespace.Master.Items.Grant' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}"
ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission"
ng-click="preCreateBranch(namespace)">
<img src="img/test.png">
{{'Component.Namespace.Master.Items.Grayscale' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}"
ng-click="showNoModifyPermissionDialog()"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
{{'Component.Namespace.Master.Items.RequestPermission' | translate }}
</a>
<div class="btn-group"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<img src="img/operate.png"> <span class="caret"></span>
</button>
<ul class="dropdown-menu" style="right: 0; left: -160px;">
<li ng-click="deleteNamespace(namespace)">
<a style="color: red">
<img src="img/delete.png">
{{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a>
</li>
</ul>
</div>
</div>
</div>
</header>
<div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-6 col-sm-6 pull-left">
<!--master branch nav tabs-->
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Master.Items.ItemList' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'text')">
<a ng-class="{node_active:namespace.viewType == 'text'}">
<img src="img/text.png">
{{'Component.Namespace.Master.Items.ItemListByText' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'history')">
<a ng-class="{node_active:namespace.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Master.Items.ItemHistory' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'instance')">
<a ng-class="{node_active:namespace.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Master.Items.ItemInstance' | translate }}
<span class="badge badge-grey" ng-bind="namespace.instancesCount"></span>
</a>
</li>
</ul>
</div>
<div class="col-md-6 col-sm-6 text-right">
<img src="img/copy.png" class="ns_btn clipboard cursor-pointer"
data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CopyText' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission">
<img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable"
ng-click="syntaxCheck(namespace)">
<img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Change' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal"
data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="modifyByText(namespace)">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)">
<span class="glyphicon glyphicon-filter"></span>
{{'Component.Namespace.Master.Items.FilterItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}"
ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/sync.png">
{{'Component.Namespace.Master.Items.SyncItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}"
ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.RevokeItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}"
ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.isPropertiesFormat">
<img src="img/diff.png">
{{'Component.Namespace.Master.Items.DiffItem' | translate }}
</button>
<button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace
&& namespace.viewType == 'table'
&& namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission" ng-click="createItem(namespace)">
<img src="img/plus.png">
{{'Component.Namespace.Master.Items.AddItem' | translate }}
</button>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease">
<span style="color: red">
{{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span>
</div>
<!--not link namespace-->
<div ng-if="!namespace.isLinkedNamespace">
<div class="search-input" ng-show="namespace.displayControl.showSearchInput">
<input type="text" class="form-control"
placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}"
ng-model="namespace.searchKey" ng-change="searchItems(namespace)">
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"
ng-class="{'warning': !config.item.value}">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
</div>
<!--link namespace-->
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
</div>
<div class="col-md-8 col-sm-8">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus,
'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey"
ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'"
ng-blur="namespace.searchStatus='OFF'">
</div>
</div>
</div>
<table class="table table-bordered table-striped table-hover"
ng-if="namespace.viewItems && namespace.viewItems.length">
<thead>
<tr>
<th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.viewItems || !namespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5>
</div>
</div>
<!--link namespace's public namespace-->
<div ng-if="namespace.isLinkedNamespace">
<div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
target="_blank">
<small>
({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
{{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
</small>
</a>
</div>
<div class="col-md-4 col-sm-4 text-center">
<div class="btn-group btn-group-sm" role="group"
ng-show="namespace.publicNamespace.isModified">
<button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE'
|| !namespace.publicNamespaceViewType}"
ng-click="namespace.publicNamespaceViewType = 'RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.Published' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}"
ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }}
</button>
</div>
</div>
<div class="col-md-4 col-sm-4">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF'
|| !namespace.publicNamespace.searchStatus,
'search-focus': namespace.publicNamespace.searchStatus == 'ON'}"
ng-model="namespace.publicNamespace.searchKey"
ng-change="searchItems(namespace.publicNamespace)"
ng-blur="namespace.publicNamespace.searchStatus='OFF'"
ng-focus="namespace.publicNamespace.searchStatus='ON'" />
</div>
</div>
</div>
<!--published items-->
<div
ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'">
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespace.hasPublishedItem">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && !config.isModified && !config.isDeleted">
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="10%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems
&& namespace.publicNamespace.viewItems.length
&& !namespace.publicNamespace.hasPublishedItem">
<h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5>
</div>
</div>
<!--not published items-->
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && (config.isModified || config.isDeleted)">
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.oldValue)">
<span ng-bind="config.oldValue | limitTo: 250"></span>
<span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5>
</div>
</div>
<div class="panel panel-default" ng-if="!namespace.publicNamespace">
<div class="panel-heading">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
</div>
<div class="panel-body text-center">
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}"
target="_blank">{{namespace.parentAppId}}</a>
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }}
</div>
</div>
</div>
</div>
<!--text view-->
<!--只读模式下的文本内容,不替换换行符-->
<div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text">
</div>
<!--编辑状态下的文本内容,会过滤掉换行符-->
<div ui-ace="aceConfig" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing"
ng-model="namespace.editText">
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.viewType == 'history'">
<div class="media" ng-show="namespace.commits && namespace.commits.length"
ng-repeat="commits in namespace.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6">
<h3 class="media-heading"
ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length">
{{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }}
</div>
</div>
<!--instance view-->
<div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'">
<div class="panel-heading">
<div class="row">
<div class="col-md-5 col-sm-5">
<small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small>
</div>
<div class="col-md-7 col-sm-7 text-right">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}"
ng-click="switchInstanceViewType(namespace, 'latest_release')">
{{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }}
<span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}"
ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }}
<span class="badge"
ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'all'}"
ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }}
<span class="badge" ng-bind="namespace.instancesCount"></span>
</button>
</div>
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
</div>
</div>
<!--latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'">
<div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}">
{{namespace.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--not latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'">
<div class="panel-default"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat="release in namespace.notLatestReleases">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}">
{{release.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--all instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'all'">
<div class="panel-default" ng-if="namespace.instancesCount > 0">
<table class="table table-bordered table-striped" ng-if="namespace.allInstances">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.allInstances">
<td width="25%" ng-bind="instance.appId"></td>
<td width="25%" ng-bind="instance.clusterName"></td>
<td width="25%" ng-bind="instance.dataCenter"></td>
<td width="25%" ng-bind="instance.ip"></td>
</tr>
</tbody>
</table>
<div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.instancesCount == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
</div>
</section>
</div>
</section> | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!--master panel body when not initialized-->
<section class="master-panel-body" ng-if="!namespace.initialized">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}"
ng-click="refreshNamespace()">
<img src="img/more.png">
{{'Component.Namespace.Master.LoadNamespace' | translate }}
</button>
</div>
</div>
</header>
</section>
<!--master panel body-->
<section class="master-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)">
<img src="img/release.png">
{{'Component.Namespace.Master.Items.Publish' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}"
ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.Rollback' | translate }}
</button>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}">
<img src="img/release-history.png">
{{'Component.Namespace.Master.Items.PublishHistory' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}"
href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}"
ng-show="hasAssignUserPermission">
<img src="img/assign.png">
{{'Component.Namespace.Master.Items.Grant' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}"
ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission"
ng-click="preCreateBranch(namespace)">
<img src="img/test.png">
{{'Component.Namespace.Master.Items.Grayscale' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}"
ng-click="showNoModifyPermissionDialog()"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
{{'Component.Namespace.Master.Items.RequestPermission' | translate }}
</a>
<div class="btn-group"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<img src="img/operate.png"> <span class="caret"></span>
</button>
<ul class="dropdown-menu" style="right: 0; left: -160px;">
<li ng-click="deleteNamespace(namespace)">
<a style="color: red">
<img src="img/delete.png">
{{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a>
</li>
</ul>
</div>
</div>
</div>
</header>
<div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-6 col-sm-6 pull-left">
<!--master branch nav tabs-->
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Master.Items.ItemList' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'text')">
<a ng-class="{node_active:namespace.viewType == 'text'}">
<img src="img/text.png">
{{'Component.Namespace.Master.Items.ItemListByText' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'history')">
<a ng-class="{node_active:namespace.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Master.Items.ItemHistory' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'instance')">
<a ng-class="{node_active:namespace.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Master.Items.ItemInstance' | translate }}
<span class="badge badge-grey" ng-bind="namespace.instancesCount"></span>
</a>
</li>
</ul>
</div>
<div class="col-md-6 col-sm-6 text-right">
<img src="img/copy.png" class="ns_btn clipboard cursor-pointer"
data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CopyText' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission">
<img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable"
ng-click="syntaxCheck(namespace)">
<img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Change' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal"
data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="modifyByText(namespace)">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)">
<span class="glyphicon glyphicon-filter"></span>
{{'Component.Namespace.Master.Items.FilterItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}"
ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/sync.png">
{{'Component.Namespace.Master.Items.SyncItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}"
ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.RevokeItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}"
ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.isPropertiesFormat">
<img src="img/diff.png">
{{'Component.Namespace.Master.Items.DiffItem' | translate }}
</button>
<button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace
&& namespace.viewType == 'table'
&& namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission" ng-click="createItem(namespace)">
<img src="img/plus.png">
{{'Component.Namespace.Master.Items.AddItem' | translate }}
</button>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease">
<span style="color: red">
{{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span>
</div>
<!--not link namespace-->
<div ng-if="!namespace.isLinkedNamespace">
<div class="search-input" ng-show="namespace.displayControl.showSearchInput">
<input type="text" class="form-control"
placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}"
ng-model="namespace.searchKey" ng-change="searchItems(namespace)">
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"
ng-class="{'warning': !config.item.value}">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
</div>
<!--link namespace-->
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
</div>
<div class="col-md-8 col-sm-8">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus,
'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey"
ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'"
ng-blur="namespace.searchStatus='OFF'">
</div>
</div>
</div>
<table class="table table-bordered table-striped table-hover"
ng-if="namespace.viewItems && namespace.viewItems.length">
<thead>
<tr>
<th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.viewItems || !namespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5>
</div>
</div>
<!--link namespace's public namespace-->
<div ng-if="namespace.isLinkedNamespace">
<div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
target="_blank">
<small>
({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
{{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
</small>
</a>
</div>
<div class="col-md-4 col-sm-4 text-center">
<div class="btn-group btn-group-sm" role="group"
ng-show="namespace.publicNamespace.isModified">
<button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE'
|| !namespace.publicNamespaceViewType}"
ng-click="namespace.publicNamespaceViewType = 'RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.Published' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}"
ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }}
</button>
</div>
</div>
<div class="col-md-4 col-sm-4">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF'
|| !namespace.publicNamespace.searchStatus,
'search-focus': namespace.publicNamespace.searchStatus == 'ON'}"
ng-model="namespace.publicNamespace.searchKey"
ng-change="searchItems(namespace.publicNamespace)"
ng-blur="namespace.publicNamespace.searchStatus='OFF'"
ng-focus="namespace.publicNamespace.searchStatus='ON'" />
</div>
</div>
</div>
<!--published items-->
<div
ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'">
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespace.hasPublishedItem">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && !config.isModified && !config.isDeleted">
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="10%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems
&& namespace.publicNamespace.viewItems.length
&& !namespace.publicNamespace.hasPublishedItem">
<h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5>
</div>
</div>
<!--not published items-->
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && (config.isModified || config.isDeleted)">
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.oldValue)">
<span ng-bind="config.oldValue | limitTo: 250"></span>
<span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5>
</div>
</div>
<div class="panel panel-default" ng-if="!namespace.publicNamespace">
<div class="panel-heading">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
</div>
<div class="panel-body text-center">
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}"
target="_blank">{{namespace.parentAppId}}</a>
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }}
</div>
</div>
</div>
</div>
<!--text view-->
<div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
</div>
</div>
</div>
<!--只读模式下的文本内容,不替换换行符-->
<div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text">
</div>
<!--编辑状态下的文本内容,会过滤掉换行符-->
<div ui-ace="aceConfig" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing"
ng-model="namespace.editText">
</div>
<div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
target="_blank">
<small>
({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
{{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
</small>
</a>
</div>
</div>
</div>
<!--关联的 Parent Namespace 内容,只读模式,不替换换行符-->
<div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"
ng-model="namespace.publicNamespaceText">
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.viewType == 'history'">
<div class="media" ng-show="namespace.commits && namespace.commits.length"
ng-repeat="commits in namespace.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6">
<h3 class="media-heading"
ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length">
{{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }}
</div>
</div>
<!--instance view-->
<div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'">
<div class="panel-heading">
<div class="row">
<div class="col-md-5 col-sm-5">
<small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small>
</div>
<div class="col-md-7 col-sm-7 text-right">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}"
ng-click="switchInstanceViewType(namespace, 'latest_release')">
{{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }}
<span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}"
ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }}
<span class="badge"
ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'all'}"
ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }}
<span class="badge" ng-bind="namespace.instancesCount"></span>
</button>
</div>
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
</div>
</div>
<!--latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'">
<div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}">
{{namespace.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--not latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'">
<div class="panel-default"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat="release in namespace.notLatestReleases">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}">
{{release.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--all instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'all'">
<div class="panel-default" ng-if="namespace.instancesCount > 0">
<table class="table table-bordered table-striped" ng-if="namespace.allInstances">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.allInstances">
<td width="25%" ng-bind="instance.appId"></td>
<td width="25%" ng-bind="instance.clusterName"></td>
<td width="25%" ng-bind="instance.dataCenter"></td>
<td width="25%" ng-bind="instance.ip"></td>
</tr>
</tbody>
</table>
<div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.instancesCount == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
</div>
</section>
</div>
</section> | 1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/PermissionRepository.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Collection;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface PermissionRepository extends PagingAndSortingRepository<Permission, Long> {
/**
* find permission by permission type and targetId
*/
Permission findTopByPermissionTypeAndTargetId(String permissionType, String targetId);
/**
* find permissions by permission types and targetId
*/
List<Permission> findByPermissionTypeInAndTargetId(Collection<String> permissionTypes,
String targetId);
@Query("SELECT p.id from Permission p where p.targetId = ?1 or p.targetId like CONCAT(?1, '+%')")
List<Long> findPermissionIdsByAppId(String appId);
@Query("SELECT p.id from Permission p where p.targetId = CONCAT(?1, '+', ?2)")
List<Long> findPermissionIdsByAppIdAndNamespace(String appId, String namespaceName);
@Modifying
@Query("UPDATE Permission SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE Id in ?1")
Integer batchDelete(List<Long> permissionIds, String operator);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Collection;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface PermissionRepository extends PagingAndSortingRepository<Permission, Long> {
/**
* find permission by permission type and targetId
*/
Permission findTopByPermissionTypeAndTargetId(String permissionType, String targetId);
/**
* find permissions by permission types and targetId
*/
List<Permission> findByPermissionTypeInAndTargetId(Collection<String> permissionTypes,
String targetId);
@Query("SELECT p.id from Permission p where p.targetId = ?1 or p.targetId like CONCAT(?1, '+%')")
List<Long> findPermissionIdsByAppId(String appId);
@Query("SELECT p.id from Permission p where p.targetId = CONCAT(?1, '+', ?2)")
List<Long> findPermissionIdsByAppIdAndNamespace(String appId, String namespaceName);
@Modifying
@Query("UPDATE Permission SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE Id in ?1")
Integer batchDelete(List<Long> permissionIds, String operator);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/filters/UserAccessFilter.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip.filters;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Strings;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
public class UserAccessFilter implements Filter {
private static final String STATIC_RESOURCE_REGEX = ".*\\.(js|html|htm|png|css|woff2)$";
private UserInfoHolder userInfoHolder;
public UserAccessFilter(UserInfoHolder userInfoHolder) {
this.userInfoHolder = userInfoHolder;
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
String requestUri = ((HttpServletRequest) request).getRequestURI();
try {
if (!isOpenAPIRequest(requestUri) && !isStaticResource(requestUri)) {
UserInfo userInfo = userInfoHolder.getUser();
if (userInfo != null) {
Tracer.logEvent(TracerEventType.USER_ACCESS, userInfo.getUserId());
}
}
} catch (Throwable e) {
Tracer.logError("Record user access info error.", e);
}
chain.doFilter(request, response);
}
@Override
public void destroy() {
}
private boolean isOpenAPIRequest(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.startsWith("/openapi");
}
private boolean isStaticResource(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.matches(STATIC_RESOURCE_REGEX);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip.filters;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Strings;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
public class UserAccessFilter implements Filter {
private static final String STATIC_RESOURCE_REGEX = ".*\\.(js|html|htm|png|css|woff2)$";
private UserInfoHolder userInfoHolder;
public UserAccessFilter(UserInfoHolder userInfoHolder) {
this.userInfoHolder = userInfoHolder;
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
String requestUri = ((HttpServletRequest) request).getRequestURI();
try {
if (!isOpenAPIRequest(requestUri) && !isStaticResource(requestUri)) {
UserInfo userInfo = userInfoHolder.getUser();
if (userInfo != null) {
Tracer.logEvent(TracerEventType.USER_ACCESS, userInfo.getUserId());
}
}
} catch (Throwable e) {
Tracer.logError("Record user access info error.", e);
}
chain.doFilter(request, response);
}
@Override
public void destroy() {
}
private boolean isOpenAPIRequest(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.startsWith("/openapi");
}
private boolean isStaticResource(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.matches(STATIC_RESOURCE_REGEX);
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/MessageSender.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/extension/initialize/ApolloClientExtensionInitializer.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.extension.initialize;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public interface ApolloClientExtensionInitializer {
/**
* initialize extension
*
* @param apolloClientProperties apollo client extension properties
* @param binder properties binder
* @param bindHandler properties bind handler
*/
void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.extension.initialize;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public interface ApolloClientExtensionInitializer {
/**
* initialize extension
*
* @param apolloClientProperties apollo client extension properties
* @param binder properties binder
* @param bindHandler properties bind handler
*/
void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.enums;
import com.google.common.base.Preconditions;
/**
* Here is the brief description for all the predefined environments:
* <ul>
* <li>LOCAL: Local Development environment, assume you are working at the beach with no network access</li>
* <li>DEV: Development environment</li>
* <li>FWS: Feature Web Service Test environment</li>
* <li>FAT: Feature Acceptance Test environment</li>
* <li>UAT: User Acceptance Test environment</li>
* <li>LPT: Load and Performance Test environment</li>
* <li>PRO: Production environment</li>
* <li>TOOLS: Tooling environment, a special area in production environment which allows
* access to test environment, e.g. Apollo Portal should be deployed in tools environment</li>
* </ul>
*
* @author Jason Song(song_s@ctrip.com)
*/
public enum Env{
LOCAL, DEV, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
public static Env fromString(String env) {
Env environment = EnvUtils.transformEnv(env);
Preconditions.checkArgument(environment != UNKNOWN, String.format("Env %s is invalid", env));
return environment;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.enums;
import com.google.common.base.Preconditions;
/**
* Here is the brief description for all the predefined environments:
* <ul>
* <li>LOCAL: Local Development environment, assume you are working at the beach with no network access</li>
* <li>DEV: Development environment</li>
* <li>FWS: Feature Web Service Test environment</li>
* <li>FAT: Feature Acceptance Test environment</li>
* <li>UAT: User Acceptance Test environment</li>
* <li>LPT: Load and Performance Test environment</li>
* <li>PRO: Production environment</li>
* <li>TOOLS: Tooling environment, a special area in production environment which allows
* access to test environment, e.g. Apollo Portal should be deployed in tools environment</li>
* </ul>
*
* @author Jason Song(song_s@ctrip.com)
*/
public enum Env{
LOCAL, DEV, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
public static Env fromString(String env) {
Env environment = EnvUtils.transformEnv(env);
Preconditions.checkArgument(environment != UNKNOWN, String.format("Env %s is invalid", env));
return environment;
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URL;
import java.net.URLDecoder;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ClassLoaderUtil {
private static final Logger logger = LoggerFactory.getLogger(ClassLoaderUtil.class);
private static ClassLoader loader = Thread.currentThread().getContextClassLoader();
private static String classPath = "";
static {
if (loader == null) {
logger.warn("Using system class loader");
loader = ClassLoader.getSystemClassLoader();
}
try {
URL url = loader.getResource("");
// get class path
if (url != null) {
classPath = url.getPath();
classPath = URLDecoder.decode(classPath, "utf-8");
}
// 如果是jar包内的，则返回当前路径
if (Strings.isNullOrEmpty(classPath) || classPath.contains(".jar!")) {
classPath = System.getProperty("user.dir");
}
} catch (Throwable ex) {
classPath = System.getProperty("user.dir");
logger.warn("Failed to locate class path, fallback to user.dir: {}", classPath, ex);
}
}
public static ClassLoader getLoader() {
return loader;
}
public static String getClassPath() {
return classPath;
}
public static boolean isClassPresent(String className) {
try {
Class.forName(className);
return true;
} catch (ClassNotFoundException ex) {
return false;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URL;
import java.net.URLDecoder;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ClassLoaderUtil {
private static final Logger logger = LoggerFactory.getLogger(ClassLoaderUtil.class);
private static ClassLoader loader = Thread.currentThread().getContextClassLoader();
private static String classPath = "";
static {
if (loader == null) {
logger.warn("Using system class loader");
loader = ClassLoader.getSystemClassLoader();
}
try {
URL url = loader.getResource("");
// get class path
if (url != null) {
classPath = url.getPath();
classPath = URLDecoder.decode(classPath, "utf-8");
}
// 如果是jar包内的，则返回当前路径
if (Strings.isNullOrEmpty(classPath) || classPath.contains(".jar!")) {
classPath = System.getProperty("user.dir");
}
} catch (Throwable ex) {
classPath = System.getProperty("user.dir");
logger.warn("Failed to locate class path, fallback to user.dir: {}", classPath, ex);
}
}
public static ClassLoader getLoader() {
return loader;
}
public static String getClassPath() {
return classPath;
}
public static boolean isClassPresent(String className) {
try {
Class.forName(className);
return true;
} catch (ClassNotFoundException ex) {
return false;
}
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* Default discovery service for Eureka
*/
@Service
@ConditionalOnMissingProfile({"kubernetes", "nacos-discovery", "consul-discovery"})
public class DefaultDiscoveryService implements DiscoveryService {
private final EurekaClient eurekaClient;
public DefaultDiscoveryService(final EurekaClient eurekaClient) {
this.eurekaClient = eurekaClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
Application application = eurekaClient.getApplication(serviceId);
if (application == null || CollectionUtils.isEmpty(application.getInstances())) {
Tracer.logEvent("Apollo.Discovery.NotFound", serviceId);
return Collections.emptyList();
}
return application.getInstances().stream().map(instanceInfoToServiceDTOFunc)
.collect(Collectors.toList());
}
private static final Function<InstanceInfo, ServiceDTO> instanceInfoToServiceDTOFunc = instance -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
};
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* Default discovery service for Eureka
*/
@Service
@ConditionalOnMissingProfile({"kubernetes", "nacos-discovery", "consul-discovery"})
public class DefaultDiscoveryService implements DiscoveryService {
private final EurekaClient eurekaClient;
public DefaultDiscoveryService(final EurekaClient eurekaClient) {
this.eurekaClient = eurekaClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
Application application = eurekaClient.getApplication(serviceId);
if (application == null || CollectionUtils.isEmpty(application.getInstances())) {
Tracer.logEvent("Apollo.Discovery.NotFound", serviceId);
return Collections.emptyList();
}
return application.getInstances().stream().map(instanceInfoToServiceDTOFunc)
.collect(Collectors.toList());
}
private static final Function<InstanceInfo, ServiceDTO> instanceInfoToServiceDTOFunc = instance -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
};
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/views/component/rollback-modal.html | <form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form>
| <form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form>
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/ExceptionUtils.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.MoreObjects;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.client.HttpStatusCodeException;
import java.lang.reflect.Type;
import java.util.Map;
public final class ExceptionUtils {
private static Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {}.getType();
public static String toString(HttpStatusCodeException e) {
Map<String, Object> errorAttributes = gson.fromJson(e.getResponseBodyAsString(), mapType);
if (errorAttributes != null) {
return MoreObjects.toStringHelper(HttpStatusCodeException.class).omitNullValues()
.add("status", errorAttributes.get("status"))
.add("message", errorAttributes.get("message"))
.add("timestamp", errorAttributes.get("timestamp"))
.add("exception", errorAttributes.get("exception"))
.add("errorCode", errorAttributes.get("errorCode"))
.add("stackTrace", errorAttributes.get("stackTrace")).toString();
}
return "";
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.MoreObjects;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.client.HttpStatusCodeException;
import java.lang.reflect.Type;
import java.util.Map;
public final class ExceptionUtils {
private static Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {}.getType();
public static String toString(HttpStatusCodeException e) {
Map<String, Object> errorAttributes = gson.fromJson(e.getResponseBodyAsString(), mapType);
if (errorAttributes != null) {
return MoreObjects.toStringHelper(HttpStatusCodeException.class).omitNullValues()
.add("status", errorAttributes.get("status"))
.add("message", errorAttributes.get("message"))
.add("timestamp", errorAttributes.get("timestamp"))
.add("exception", errorAttributes.get("exception"))
.add("errorCode", errorAttributes.get("errorCode"))
.add("stackTrace", errorAttributes.get("stackTrace")).toString();
}
return "";
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/LoggingCustomizer.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.customize;
import com.google.common.base.Strings;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.foundation.Foundation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.Appender;
/**
* clogging config.only used in ctrip
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class LoggingCustomizer implements InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(LoggingCustomizer.class);
private static final String cLoggingAppenderClass =
"com.ctrip.framework.clogging.agent.appender.CLoggingAppender";
private static boolean cLoggingAppenderPresent =
ClassUtils.isPresent(cLoggingAppenderClass, LoggingCustomizer.class.getClassLoader());
@Override
public void afterPropertiesSet() {
if (!cLoggingAppenderPresent) {
return;
}
try {
tryConfigCLogging();
} catch (Throwable ex) {
logger.error("Config CLogging failed", ex);
Tracer.logError(ex);
}
}
private void tryConfigCLogging() throws Exception {
String appId = Foundation.app().getAppId();
if (Strings.isNullOrEmpty(appId)) {
logger.warn("App id is null or empty!");
return;
}
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
Class clazz = Class.forName(cLoggingAppenderClass);
Appender cLoggingAppender = (Appender) clazz.newInstance();
ReflectionUtils.findMethod(clazz, "setAppId", String.class).invoke(cLoggingAppender, appId);
ReflectionUtils.findMethod(clazz, "setServerIp", String.class)
.invoke(cLoggingAppender, cloggingUrl());
ReflectionUtils.findMethod(clazz, "setServerPort", int.class)
.invoke(cLoggingAppender, Integer.parseInt(cloggingPort()));
cLoggingAppender.setName("CentralLogging");
cLoggingAppender.setContext(loggerContext);
cLoggingAppender.start();
ch.qos.logback.classic.Logger logger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger("root");
logger.addAppender(cLoggingAppender);
}
/**
* clogging server url
* @return
*/
protected abstract String cloggingUrl();
/**
* clogging server port
* @return
*/
protected abstract String cloggingPort();
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.customize;
import com.google.common.base.Strings;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.foundation.Foundation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.Appender;
/**
* clogging config.only used in ctrip
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class LoggingCustomizer implements InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(LoggingCustomizer.class);
private static final String cLoggingAppenderClass =
"com.ctrip.framework.clogging.agent.appender.CLoggingAppender";
private static boolean cLoggingAppenderPresent =
ClassUtils.isPresent(cLoggingAppenderClass, LoggingCustomizer.class.getClassLoader());
@Override
public void afterPropertiesSet() {
if (!cLoggingAppenderPresent) {
return;
}
try {
tryConfigCLogging();
} catch (Throwable ex) {
logger.error("Config CLogging failed", ex);
Tracer.logError(ex);
}
}
private void tryConfigCLogging() throws Exception {
String appId = Foundation.app().getAppId();
if (Strings.isNullOrEmpty(appId)) {
logger.warn("App id is null or empty!");
return;
}
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
Class clazz = Class.forName(cLoggingAppenderClass);
Appender cLoggingAppender = (Appender) clazz.newInstance();
ReflectionUtils.findMethod(clazz, "setAppId", String.class).invoke(cLoggingAppender, appId);
ReflectionUtils.findMethod(clazz, "setServerIp", String.class)
.invoke(cLoggingAppender, cloggingUrl());
ReflectionUtils.findMethod(clazz, "setServerPort", int.class)
.invoke(cLoggingAppender, Integer.parseInt(cloggingPort()));
cLoggingAppender.setName("CentralLogging");
cLoggingAppender.setContext(loggerContext);
cLoggingAppender.start();
ch.qos.logback.classic.Logger logger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger("root");
logger.addAppender(cLoggingAppender);
}
/**
* clogging server url
* @return
*/
protected abstract String cloggingUrl();
/**
* clogging server port
* @return
*/
protected abstract String cloggingPort();
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/repository/ConsumerRepository.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRepository extends PagingAndSortingRepository<Consumer, Long> {
Consumer findByAppId(String appId);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRepository extends PagingAndSortingRepository<Consumer, Long> {
Consumer findByAppId(String appId);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/ApplicationProvider.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.spi.provider;
import java.io.InputStream;
/**
* Provider for application related properties
*/
public interface ApplicationProvider extends Provider {
/**
* @return the application's app id
*/
String getAppId();
/**
* @return the application's access key secret
*/
String getAccessKeySecret();
/**
* @return whether the application's app id is set or not
*/
boolean isAppIdSet();
/**
* Initialize the application provider with the specified input stream
*/
void initialize(InputStream in);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.spi.provider;
import java.io.InputStream;
/**
* Provider for application related properties
*/
public interface ApplicationProvider extends Provider {
/**
* @return the application's app id
*/
String getAppId();
/**
* @return the application's access key secret
*/
String getAccessKeySecret();
/**
* @return whether the application's app id is set or not
*/
boolean isAppIdSet();
/**
* Initialize the application provider with the specified input stream
*/
void initialize(InputStream in);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/InstanceDTO.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.dto;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InstanceDTO {
private long id;
private String appId;
private String clusterName;
private String dataCenter;
private String ip;
private List<InstanceConfigDTO> configs;
private Date dataChangeCreatedTime;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getDataCenter() {
return dataCenter;
}
public void setDataCenter(String dataCenter) {
this.dataCenter = dataCenter;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public List<InstanceConfigDTO> getConfigs() {
return configs;
}
public void setConfigs(List<InstanceConfigDTO> configs) {
this.configs = configs;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.dto;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InstanceDTO {
private long id;
private String appId;
private String clusterName;
private String dataCenter;
private String ip;
private List<InstanceConfigDTO> configs;
private Date dataChangeCreatedTime;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getDataCenter() {
return dataCenter;
}
public void setDataCenter(String dataCenter) {
this.dataCenter = dataCenter;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public List<InstanceConfigDTO> getConfigs() {
return configs;
}
public void setConfigs(List<InstanceConfigDTO> configs) {
this.configs = configs;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/test/java/com/ctrip/framework/apollo/config/data/system/ApolloClientPropertyCompatibleTestConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.system;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@Configuration
@EnableAutoConfiguration
public class ApolloClientPropertyCompatibleTestConfiguration {
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.system;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@Configuration
@EnableAutoConfiguration
public class ApolloClientPropertyCompatibleTestConfiguration {
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/ByteUtilTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import org.junit.Assert;
import org.junit.Test;
public class ByteUtilTest {
@Test
public void testInt3() {
Assert.assertEquals((byte)0, ByteUtil.int3(0));
Assert.assertEquals((byte)0, ByteUtil.int3(1));
}
@Test
public void testInt2() {
Assert.assertEquals((byte)0, ByteUtil.int2(0));
Assert.assertEquals((byte)0, ByteUtil.int2(1));
}
@Test
public void testInt1() {
Assert.assertEquals((byte)0, ByteUtil.int1(0));
Assert.assertEquals((byte)0, ByteUtil.int1(1));
}
@Test
public void testInt0() {
Assert.assertEquals((byte)0, ByteUtil.int0(0));
Assert.assertEquals((byte)1, ByteUtil.int0(1));
}
@Test
public void testToHexString() {
Assert.assertEquals("", ByteUtil.toHexString(new byte[] {}));
Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104}));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import org.junit.Assert;
import org.junit.Test;
public class ByteUtilTest {
@Test
public void testInt3() {
Assert.assertEquals((byte)0, ByteUtil.int3(0));
Assert.assertEquals((byte)0, ByteUtil.int3(1));
}
@Test
public void testInt2() {
Assert.assertEquals((byte)0, ByteUtil.int2(0));
Assert.assertEquals((byte)0, ByteUtil.int2(1));
}
@Test
public void testInt1() {
Assert.assertEquals((byte)0, ByteUtil.int1(0));
Assert.assertEquals((byte)0, ByteUtil.int1(1));
}
@Test
public void testInt0() {
Assert.assertEquals((byte)0, ByteUtil.int0(0));
Assert.assertEquals((byte)1, ByteUtil.int0(1));
}
@Test
public void testToHexString() {
Assert.assertEquals("", ByteUtil.toHexString(new byte[] {}));
Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104}));
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/Utils.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals;
import com.google.common.base.Strings;
public class Utils {
public static boolean isBlank(String str) {
return Strings.nullToEmpty(str).trim().isEmpty();
}
public static boolean isOSWindows() {
String osName = System.getProperty("os.name");
if (Utils.isBlank(osName)) {
return false;
}
return osName.startsWith("Windows");
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals;
import com.google.common.base.Strings;
public class Utils {
public static boolean isBlank(String str) {
return Strings.nullToEmpty(str).trim().isEmpty();
}
public static boolean isOSWindows() {
String osName = System.getProperty("os.name");
if (Utils.isBlank(osName)) {
return false;
}
return osName.startsWith("Windows");
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigEmptyPropertySource.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import java.util.Collections;
import org.springframework.core.env.MapPropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigEmptyPropertySource extends MapPropertySource {
/**
* Create a new {@code EmptyPropertySource} with the given name.
*
* @param name the associated name
*/
public ApolloConfigEmptyPropertySource(String name) {
super(name, Collections.emptyMap());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import java.util.Collections;
import org.springframework.core.env.MapPropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigEmptyPropertySource extends MapPropertySource {
/**
* Create a new {@code EmptyPropertySource} with the given name.
*
* @param name the associated name
*/
public ApolloConfigEmptyPropertySource(String name) {
super(name, Collections.emptyMap());
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/Change.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
public class Change {
private ChangeType type;
private EntityPair<KVEntity> entity;
public Change(ChangeType type, EntityPair<KVEntity> entity) {
this.type = type;
this.entity = entity;
}
public ChangeType getType() {
return type;
}
public void setType(ChangeType type) {
this.type = type;
}
public EntityPair<KVEntity> getEntity() {
return entity;
}
public void setEntity(EntityPair<KVEntity> entity) {
this.entity = entity;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
public class Change {
private ChangeType type;
private EntityPair<KVEntity> entity;
public Change(ChangeType type, EntityPair<KVEntity> entity) {
this.type = type;
this.entity = entity;
}
public ChangeType getType() {
return type;
}
public void setType(ChangeType type) {
this.type = type;
}
public EntityPair<KVEntity> getEntity() {
return entity;
}
public void setEntity(EntityPair<KVEntity> entity) {
this.entity = entity;
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/config/sync.html | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!doctype html>
<html ng-app="sync_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Sync.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="SyncItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Sync.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Sync.FistStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Sync.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Sync.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Sync.NextStep' | translate }}
</button>
<button type="button" class="btn btn-success" ng-show="syncItemStep == 2 && hasDiff"
ng-click="syncItems()" ng-disabled="syncBtnDisabled">{{'Config.Sync.Sync' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Sync.Tips' | translate }}:</strong>
<ul>
<li>{{'Config.Sync.Tips1' | translate }}</li>
<li>{{'Config.Sync.Tips2' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncNamespace' | translate }}</label>
<div class="col-sm-6">
<h4 ng-bind="pageContext.namespaceName"></h4>
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncToCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="true" apollo-select="collectSelectedClusters"
apollo-not-checked-env="pageContext.env"
apollo-not-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<div class="row" ng-show="syncItemStep == 1" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label class="control-label">{{'Config.Sync.NeedToSyncItem' | translate }}</label>
</div>
<div class="col-sm-10">
<div class="row text-right" style="margin-bottom: 5px; margin-right: 0px;">
{{'Config.Sync.SortByLastModifyTime' | translate }}
{{'Config.Sync.BeginTime' | translate }}:<input type="date" ng-model="filterBeginTime">
{{'Config.Sync.EndTime' | translate }}: <input type="date" ng-model="filterEndTime">
<button class="btn btn-sm btn-primary"
ng-click="filter()">{{'Config.Sync.Filter' | translate }}</button>
<button class="btn btn-sm btn-default"
ng-click="resetFilter()">{{'Config.Sync.Rest' | translate }}</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td><input type="checkbox" ng-click="toggleItemsCheckedStatus()"></td>
<td class="hover" ng-click="col='key';desc=!desc;">
{{'Config.Sync.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td>{{'Config.Sync.ItemValue' | translate }}</td>
<td class="hover" ng-click="col='dataChangeCreatedTime';desc=!desc;">
{{'Config.Sync.ItemCreateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td class="hover" ng-click="col='dataChangeLastModifiedTime';desc=!desc;">
{{'Config.Sync.ItemUpdateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in viewItems|orderBy:col:desc">
<td width="10%"><input type="checkbox" ng-checked="item.checked"
ng-click="switchSelect(item)"></td>
<td width="20%">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' : ''"></span>
</td>
<td class="cursor-pointer" width="40%" ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...' : ''"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2" ng-repeat="clusterDiff in clusterDiffs">
<h4 class="text-center">
{{'Common.Environment' | translate }}:<span ng-bind="clusterDiff.namespace.env"></span>
{{'Common.Cluster' | translate }}:<span ng-bind="clusterDiff.namespace.clusterName"></span>
<span
ng-show="!clusterDiff.extInfo">{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}</span>
</h4>
<div class="text-center"
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo">
<span
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo">{{'Config.Sync.NoNeedSyncItem' | translate }}</span>
<span ng-show="clusterDiff.extInfo" ng-bind="clusterDiff.extInfo"></span>, {{'Config.Sync.IgnoreSync' | translate }}
</div>
<div class="row" style="margin-top: 10px;"
ng-show="clusterDiff.diffs.updateItems.length + clusterDiff.diffs.createItems.length > 0">
<div class="form-horizontal">
<div class="col-sm-12">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>{{'Config.Sync.Step2Type' | translate }}</td>
<td>{{'Config.Sync.Step2Key' | translate }}</td>
<td>{{'Config.Sync.Step2SyncBefore' | translate }}</td>
<td>{{'Config.Sync.Step2SyncAfter' | translate }}</td>
<td>{{'Config.Sync.Step2Comment' | translate }}</td>
<td>{{'Config.Sync.Step2Operator' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="createItem in clusterDiff.diffs.createItems">
<td width="5%">{{'Config.Sync.NewAdd' | translate }}</td>
<td width="15%" ng-bind="createItem.key"></td>
<td width="30%"></td>
<td width="30%" ng-bind="createItem.value"></td>
<td width="15%" ng-bind="createItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'create', createItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
<tr ng-repeat="updateItem in clusterDiff.diffs.updateItems">
<td width="5%">{{'Config.Sync.Update' | translate }}</td>
<td width="15%" ng-bind="updateItem.key"></td>
<td width="30%" ng-bind="updateItem.oldValue"></td>
<td width="30%" ng-bind="updateItem.value"></td>
<td width="15%" ng-bind="updateItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'update', updateItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--step 3-->
<div class="row text-center" ng-show="syncItemStep == 3 && syncSuccess">
<img src="../img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncSuccessfully' | translate }}</h3>
</div>
<div class="row text-center" ng-show="syncItemStep == 3 && !syncSuccess">
<img src="../img/sync-error.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncFailed' | translate }}</h3>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/SyncConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<!doctype html>
<html ng-app="sync_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Sync.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="SyncItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Sync.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Sync.FistStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Sync.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Sync.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Sync.NextStep' | translate }}
</button>
<button type="button" class="btn btn-success" ng-show="syncItemStep == 2 && hasDiff"
ng-click="syncItems()" ng-disabled="syncBtnDisabled">{{'Config.Sync.Sync' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Sync.Tips' | translate }}:</strong>
<ul>
<li>{{'Config.Sync.Tips1' | translate }}</li>
<li>{{'Config.Sync.Tips2' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncNamespace' | translate }}</label>
<div class="col-sm-6">
<h4 ng-bind="pageContext.namespaceName"></h4>
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncToCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="true" apollo-select="collectSelectedClusters"
apollo-not-checked-env="pageContext.env"
apollo-not-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<div class="row" ng-show="syncItemStep == 1" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label class="control-label">{{'Config.Sync.NeedToSyncItem' | translate }}</label>
</div>
<div class="col-sm-10">
<div class="row text-right" style="margin-bottom: 5px; margin-right: 0px;">
{{'Config.Sync.SortByLastModifyTime' | translate }}
{{'Config.Sync.BeginTime' | translate }}:<input type="date" ng-model="filterBeginTime">
{{'Config.Sync.EndTime' | translate }}: <input type="date" ng-model="filterEndTime">
<button class="btn btn-sm btn-primary"
ng-click="filter()">{{'Config.Sync.Filter' | translate }}</button>
<button class="btn btn-sm btn-default"
ng-click="resetFilter()">{{'Config.Sync.Rest' | translate }}</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td><input type="checkbox" ng-click="toggleItemsCheckedStatus()"></td>
<td class="hover" ng-click="col='key';desc=!desc;">
{{'Config.Sync.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td>{{'Config.Sync.ItemValue' | translate }}</td>
<td class="hover" ng-click="col='dataChangeCreatedTime';desc=!desc;">
{{'Config.Sync.ItemCreateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td class="hover" ng-click="col='dataChangeLastModifiedTime';desc=!desc;">
{{'Config.Sync.ItemUpdateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in viewItems|orderBy:col:desc">
<td width="10%"><input type="checkbox" ng-checked="item.checked"
ng-click="switchSelect(item)"></td>
<td width="20%">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' : ''"></span>
</td>
<td class="cursor-pointer" width="40%" ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...' : ''"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2" ng-repeat="clusterDiff in clusterDiffs">
<h4 class="text-center">
{{'Common.Environment' | translate }}:<span ng-bind="clusterDiff.namespace.env"></span>
{{'Common.Cluster' | translate }}:<span ng-bind="clusterDiff.namespace.clusterName"></span>
<span
ng-show="!clusterDiff.extInfo">{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}</span>
</h4>
<div class="text-center"
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo">
<span
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo">{{'Config.Sync.NoNeedSyncItem' | translate }}</span>
<span ng-show="clusterDiff.extInfo" ng-bind="clusterDiff.extInfo"></span>, {{'Config.Sync.IgnoreSync' | translate }}
</div>
<div class="row" style="margin-top: 10px;"
ng-show="clusterDiff.diffs.updateItems.length + clusterDiff.diffs.createItems.length > 0">
<div class="form-horizontal">
<div class="col-sm-12">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>{{'Config.Sync.Step2Type' | translate }}</td>
<td>{{'Config.Sync.Step2Key' | translate }}</td>
<td>{{'Config.Sync.Step2SyncBefore' | translate }}</td>
<td>{{'Config.Sync.Step2SyncAfter' | translate }}</td>
<td>{{'Config.Sync.Step2Comment' | translate }}</td>
<td>{{'Config.Sync.Step2Operator' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="createItem in clusterDiff.diffs.createItems">
<td width="5%">{{'Config.Sync.NewAdd' | translate }}</td>
<td width="15%" ng-bind="createItem.key"></td>
<td width="30%"></td>
<td width="30%" ng-bind="createItem.value"></td>
<td width="15%" ng-bind="createItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'create', createItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
<tr ng-repeat="updateItem in clusterDiff.diffs.updateItems">
<td width="5%">{{'Config.Sync.Update' | translate }}</td>
<td width="15%" ng-bind="updateItem.key"></td>
<td width="30%" ng-bind="updateItem.oldValue"></td>
<td width="30%" ng-bind="updateItem.value"></td>
<td width="15%" ng-bind="updateItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'update', updateItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--step 3-->
<div class="row text-center" ng-show="syncItemStep == 3 && syncSuccess">
<img src="../img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncSuccessfully' | translate }}</h3>
</div>
<div class="row text-center" ng-show="syncItemStep == 3 && !syncSuccess">
<img src="../img/sync-error.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncFailed' | translate }}</h3>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/SyncConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/ServerProvider.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.spi.provider;
import java.io.IOException;
import java.io.InputStream;
/**
* Provider for server related properties
*/
public interface ServerProvider extends Provider {
/**
* @return current environment or {@code null} if not set
*/
String getEnvType();
/**
* @return whether current environment is set or not
*/
boolean isEnvTypeSet();
/**
* @return current data center or {@code null} if not set
*/
String getDataCenter();
/**
* @return whether data center is set or not
*/
boolean isDataCenterSet();
/**
* Initialize server provider with the specified input stream
*
* @throws IOException
*/
void initialize(InputStream in) throws IOException;
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.spi.provider;
import java.io.IOException;
import java.io.InputStream;
/**
* Provider for server related properties
*/
public interface ServerProvider extends Provider {
/**
* @return current environment or {@code null} if not set
*/
String getEnvType();
/**
* @return whether current environment is set or not
*/
boolean isEnvTypeSet();
/**
* @return current data center or {@code null} if not set
*/
String getDataCenter();
/**
* @return whether data center is set or not
*/
boolean isDataCenterSet();
/**
* Initialize server provider with the specified input stream
*
* @throws IOException
*/
void initialize(InputStream in) throws IOException;
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigManager {
/**
* Get the config instance for the namespace specified.
* @param namespace the namespace
* @return the config instance for the namespace
*/
Config getConfig(String namespace);
/**
* Get the config file instance for the namespace specified.
* @param namespace the namespace
* @param configFileFormat the config file format
* @return the config file instance for the namespace
*/
ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigManager {
/**
* Get the config instance for the namespace specified.
* @param namespace the namespace
* @return the config instance for the namespace
*/
Config getConfig(String namespace);
/**
* Get the config file instance for the namespace specified.
* @param namespace the namespace
* @param configFileFormat the config file format
* @return the config file instance for the namespace
*/
ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/service/ConsumerRolePermissionServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConsumerRolePermissionServiceTest extends AbstractIntegrationTest {
@Autowired
private ConsumerRolePermissionService consumerRolePermissionService;
@Before
public void setUp() throws Exception {
}
@Test
@Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-consumerroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConsumerHasPermission() throws Exception {
String someTargetId = "someTargetId";
String anotherTargetId = "anotherTargetId";
String somePermissionType = "somePermissionType";
String anotherPermissionType = "anotherPermissionType";
long someConsumerId = 1;
long anotherConsumerId = 2;
long someConsumerWithNoPermission = 3;
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, anotherPermissionType, anotherTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, anotherPermissionType, anotherTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, somePermissionType, someTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, anotherPermissionType, anotherTargetId));
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConsumerRolePermissionServiceTest extends AbstractIntegrationTest {
@Autowired
private ConsumerRolePermissionService consumerRolePermissionService;
@Before
public void setUp() throws Exception {
}
@Test
@Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-consumerroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConsumerHasPermission() throws Exception {
String someTargetId = "someTargetId";
String anotherTargetId = "anotherTargetId";
String somePermissionType = "somePermissionType";
String anotherPermissionType = "anotherPermissionType";
long someConsumerId = 1;
long anotherConsumerId = 2;
long someConsumerWithNoPermission = 3;
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(someConsumerId, anotherPermissionType, anotherTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, somePermissionType, someTargetId));
assertTrue(consumerRolePermissionService.consumerHasPermission(anotherConsumerId, anotherPermissionType, anotherTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, somePermissionType, someTargetId));
assertFalse(consumerRolePermissionService.consumerHasPermission(someConsumerWithNoPermission, anotherPermissionType, anotherTargetId));
}
} | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/RequestPrecondition.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
public class RequestPrecondition {
private static String CONTAIN_EMPTY_ARGUMENT = "request payload should not be contain empty.";
private static String ILLEGAL_MODEL = "request model is invalid";
public static void checkArgumentsNotEmpty(String... args) {
checkArguments(!StringUtils.isContainEmpty(args), CONTAIN_EMPTY_ARGUMENT);
}
public static void checkModel(boolean valid){
checkArguments(valid, ILLEGAL_MODEL);
}
public static void checkArguments(boolean expression, Object errorMessage) {
if (!expression) {
throw new BadRequestException(String.valueOf(errorMessage));
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
public class RequestPrecondition {
private static String CONTAIN_EMPTY_ARGUMENT = "request payload should not be contain empty.";
private static String ILLEGAL_MODEL = "request model is invalid";
public static void checkArgumentsNotEmpty(String... args) {
checkArguments(!StringUtils.isContainEmpty(args), CONTAIN_EMPTY_ARGUMENT);
}
public static void checkModel(boolean valid){
checkArguments(valid, ILLEGAL_MODEL);
}
public static void checkArguments(boolean expression, Object errorMessage) {
if (!expression) {
throw new BadRequestException(String.valueOf(errorMessage));
}
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/AbstractUnitTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.Silent.class)
public abstract class AbstractUnitTest {
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.Silent.class)
public abstract class AbstractUnitTest {
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/DefaultConfigService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice.service.config;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import org.springframework.beans.factory.annotation.Autowired;
/**
* config service with no cache
*
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigService extends AbstractConfigService {
@Autowired
private ReleaseService releaseService;
@Override
protected Release findActiveOne(long id, ApolloNotificationMessages clientMessages) {
return releaseService.findActiveOne(id);
}
@Override
protected Release findLatestActiveRelease(String configAppId, String configClusterName, String configNamespace,
ApolloNotificationMessages clientMessages) {
return releaseService.findLatestActiveRelease(configAppId, configClusterName,
configNamespace);
}
@Override
public void handleMessage(ReleaseMessage message, String channel) {
// since there is no cache, so do nothing
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.configservice.service.config;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import org.springframework.beans.factory.annotation.Autowired;
/**
* config service with no cache
*
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigService extends AbstractConfigService {
@Autowired
private ReleaseService releaseService;
@Override
protected Release findActiveOne(long id, ApolloNotificationMessages clientMessages) {
return releaseService.findActiveOne(id);
}
@Override
protected Release findLatestActiveRelease(String configAppId, String configClusterName, String configNamespace,
ApolloNotificationMessages clientMessages) {
return releaseService.findLatestActiveRelease(configAppId, configClusterName,
configNamespace);
}
@Override
public void handleMessage(ReleaseMessage message, String channel) {
// since there is no cache, so do nothing
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ClusterService.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ClusterService {
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ClusterAPI clusterAPI;
public ClusterService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ClusterAPI clusterAPI) {
this.userInfoHolder = userInfoHolder;
this.clusterAPI = clusterAPI;
}
public List<ClusterDTO> findClusters(Env env, String appId) {
return clusterAPI.findClustersByApp(appId, env);
}
public ClusterDTO createCluster(Env env, ClusterDTO cluster) {
if (!clusterAPI.isClusterUnique(cluster.getAppId(), env, cluster.getName())) {
throw new BadRequestException(String.format("cluster %s already exists.", cluster.getName()));
}
ClusterDTO clusterDTO = clusterAPI.create(env, cluster);
Tracer.logEvent(TracerEventType.CREATE_CLUSTER, cluster.getAppId(), "0", cluster.getName());
return clusterDTO;
}
public void deleteCluster(Env env, String appId, String clusterName){
clusterAPI.delete(env, appId, clusterName, userInfoHolder.getUser().getUserId());
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName){
return clusterAPI.loadCluster(appId, env, clusterName);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ClusterService {
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ClusterAPI clusterAPI;
public ClusterService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ClusterAPI clusterAPI) {
this.userInfoHolder = userInfoHolder;
this.clusterAPI = clusterAPI;
}
public List<ClusterDTO> findClusters(Env env, String appId) {
return clusterAPI.findClustersByApp(appId, env);
}
public ClusterDTO createCluster(Env env, ClusterDTO cluster) {
if (!clusterAPI.isClusterUnique(cluster.getAppId(), env, cluster.getName())) {
throw new BadRequestException(String.format("cluster %s already exists.", cluster.getName()));
}
ClusterDTO clusterDTO = clusterAPI.create(env, cluster);
Tracer.logEvent(TracerEventType.CREATE_CLUSTER, cluster.getAppId(), "0", cluster.getName());
return clusterDTO;
}
public void deleteCluster(Env env, String appId, String clusterName){
clusterAPI.delete(env, appId, clusterName, userInfoHolder.getUser().getUserId());
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName){
return clusterAPI.loadCluster(appId, env, clusterName);
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/controller/ItemControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.service.ItemService;
import com.ctrip.framework.apollo.portal.service.NamespaceService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.yaml.snakeyaml.constructor.ConstructorException;
import org.yaml.snakeyaml.constructor.DuplicateKeyException;
@RunWith(MockitoJUnitRunner.class)
public class ItemControllerTest {
@Mock
private ItemService configService;
@Mock
private NamespaceService namespaceService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PermissionValidator permissionValidator;
@InjectMocks
private ItemController itemController;
@Before
public void setUp() throws Exception {
itemController = new ItemController(configService, userInfoHolder, permissionValidator,
namespaceService);
}
@Test
public void yamlSyntaxCheckOK() throws Exception {
String yaml = loadYaml("case1.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
@Test(expected = DuplicateKeyException.class)
public void yamlSyntaxCheckWithDuplicatedValue() throws Exception {
String yaml = loadYaml("case2.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
@Test(expected = ConstructorException.class)
public void yamlSyntaxCheckWithUnsupportedType() throws Exception {
String yaml = loadYaml("case3.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
private NamespaceTextModel assemble(String format, String content) {
NamespaceTextModel model = new NamespaceTextModel();
model.setFormat(format);
model.setConfigText(content);
return model;
}
private String loadYaml(String caseName) throws IOException {
File file = new File("src/test/resources/yaml/" + caseName);
return Files.toString(file, Charsets.UTF_8);
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.service.ItemService;
import com.ctrip.framework.apollo.portal.service.NamespaceService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.yaml.snakeyaml.constructor.ConstructorException;
import org.yaml.snakeyaml.constructor.DuplicateKeyException;
@RunWith(MockitoJUnitRunner.class)
public class ItemControllerTest {
@Mock
private ItemService configService;
@Mock
private NamespaceService namespaceService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PermissionValidator permissionValidator;
@InjectMocks
private ItemController itemController;
@Before
public void setUp() throws Exception {
itemController = new ItemController(configService, userInfoHolder, permissionValidator,
namespaceService);
}
@Test
public void yamlSyntaxCheckOK() throws Exception {
String yaml = loadYaml("case1.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
@Test(expected = DuplicateKeyException.class)
public void yamlSyntaxCheckWithDuplicatedValue() throws Exception {
String yaml = loadYaml("case2.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
@Test(expected = ConstructorException.class)
public void yamlSyntaxCheckWithUnsupportedType() throws Exception {
String yaml = loadYaml("case3.yaml");
itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml));
}
private NamespaceTextModel assemble(String format, String content) {
NamespaceTextModel model = new NamespaceTextModel();
model.setFormat(format);
model.setConfigText(content);
return model;
}
private String loadYaml(String caseName) throws IOException {
File file = new File("src/test/resources/yaml/" + caseName);
return Files.toString(file, Charsets.UTF_8);
}
} | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AuditRepository.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Audit;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner")
List<Audit> findByOwner(@Param("owner") String owner);
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner AND a.entityName =:entity AND a.opName = :op")
List<Audit> findAudits(@Param("owner") String owner, @Param("entity") String entity,
@Param("op") String op);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Audit;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner")
List<Audit> findByOwner(@Param("owner") String owner);
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner AND a.entityName =:entity AND a.opName = :op")
List<Audit> findAudits(@Param("owner") String owner, @Param("entity") String entity,
@Param("op") String op);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/SignInController.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author lepdou 2017-08-30
*/
@Controller
public class SignInController {
@GetMapping("/signin")
public String login(@RequestParam(value = "error", required = false) String error,
@RequestParam(value = "logout", required = false) String logout) {
return "login.html";
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author lepdou 2017-08-30
*/
@Controller
public class SignInController {
@GetMapping("/signin")
public String login(@RequestParam(value = "error", required = false) String error,
@RequestParam(value = "logout", required = false) String logout) {
return "login.html";
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/views/component/publish-deny-modal.html | <div class="modal fade" id="publishDenyModal" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.PublishDeny.Title' | translate }}</h4>
</div>
<div class="modal-body">{{'Component.PublishDeny.Tips1' | translate:this }}
<span ng-if="toReleaseNamespace.isEmergencyPublishAllowed">
<br><br><small>{{'Component.PublishDeny.Tips2' | translate }}</small>
</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-if="toReleaseNamespace.isEmergencyPublishAllowed" ng-click="emergencyPublish()">
{{'Component.PublishDeny.EmergencyPublish' | translate }}
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
{{'Component.PublishDeny.Close' | translate }}
</button>
</div>
</div>
</div>
</div>
| <div class="modal fade" id="publishDenyModal" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ 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.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.PublishDeny.Title' | translate }}</h4>
</div>
<div class="modal-body">{{'Component.PublishDeny.Tips1' | translate:this }}
<span ng-if="toReleaseNamespace.isEmergencyPublishAllowed">
<br><br><small>{{'Component.PublishDeny.Tips2' | translate }}</small>
</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-if="toReleaseNamespace.isEmergencyPublishAllowed" ng-click="emergencyPublish()">
{{'Component.PublishDeny.EmergencyPublish' | translate }}
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
{{'Component.PublishDeny.Close' | translate }}
</button>
</div>
</div>
</div>
</div>
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/en/usage/apollo-user-practices.md | TODO
| TODO
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NullProviderManager.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals;
import com.ctrip.framework.foundation.internals.provider.NullProvider;
import com.ctrip.framework.foundation.spi.ProviderManager;
public class NullProviderManager implements ProviderManager {
public static final NullProvider provider = new NullProvider();
@Override
public String getProperty(String name, String defaultValue) {
return defaultValue;
}
@Override
public NullProvider provider(Class clazz) {
return provider;
}
@Override
public String toString() {
return provider.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.foundation.internals;
import com.ctrip.framework.foundation.internals.provider.NullProvider;
import com.ctrip.framework.foundation.spi.ProviderManager;
public class NullProviderManager implements ProviderManager {
public static final NullProvider provider = new NullProvider();
@Override
public String getProperty(String name, String defaultValue) {
return defaultValue;
}
@Override
public NullProvider provider(Class clazz) {
return provider;
}
@Override
public String toString() {
return provider.toString();
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-mockserver/src/test/resources/mockdata-application.properties | #
# Copyright 2021 Apollo Authors
#
# 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.
#
key1=value1
key2=value2
| #
# Copyright 2021 Apollo Authors
#
# 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.
#
key1=value1
key2=value2
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/services/PermissionService.js | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
appService.service('PermissionService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var permission_resource = $resource('', {}, {
init_app_namespace_permission: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/initPermission',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
has_app_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/permissions/:permissionType'
},
has_namespace_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/permissions/:permissionType'
},
has_namespace_env_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/permissions/:permissionType'
},
has_root_permission:{
method: 'GET',
url: AppUtil.prefixPath() + '/permissions/root'
},
get_namespace_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/role_users'
},
get_namespace_env_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/role_users'
},
assign_namespace_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
assign_namespace_env_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
remove_namespace_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/roles/:roleType?user=:user'
},
remove_namespace_env_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/roles/:roleType?user=:user'
},
get_app_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/role_users'
},
assign_app_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
remove_app_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/roles/:roleType?user=:user'
},
has_open_manage_app_master_role_limit: {
method: 'GET',
url: AppUtil.prefixPath() + '/system/role/manageAppMaster'
}
});
function initAppNamespacePermission(appId, namespace) {
var d = $q.defer();
permission_resource.init_app_namespace_permission({
appId: appId
}, namespace,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasAppPermission(appId, permissionType) {
var d = $q.defer();
permission_resource.has_app_permission({
appId: appId,
permissionType: permissionType
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasNamespacePermission(appId, namespaceName, permissionType) {
var d = $q.defer();
permission_resource.has_namespace_permission({
appId: appId,
namespaceName: namespaceName,
permissionType: permissionType
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasNamespaceEnvPermission(appId, env, namespaceName, permissionType) {
var d = $q.defer();
permission_resource.has_namespace_env_permission({
appId: appId,
namespaceName: namespaceName,
permissionType: permissionType,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function assignNamespaceRoleToUser(appId, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.assign_namespace_role_to_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function assignNamespaceEnvRoleToUser(appId, env, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.assign_namespace_env_role_to_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
env: env
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function removeNamespaceRoleFromUser(appId, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.remove_namespace_role_from_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
user: user
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function removeNamespaceEnvRoleFromUser(appId, env, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.remove_namespace_env_role_from_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
user: user,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
return {
init_app_namespace_permission: function (appId, namespace) {
return initAppNamespacePermission(appId, namespace);
},
has_manage_app_master_permission: function (appId) {
return hasAppPermission(appId, 'ManageAppMaster');
},
has_create_namespace_permission: function (appId) {
return hasAppPermission(appId, 'CreateNamespace');
},
has_create_cluster_permission: function (appId) {
return hasAppPermission(appId, 'CreateCluster');
},
has_assign_user_permission: function (appId) {
return hasAppPermission(appId, 'AssignRole');
},
has_modify_namespace_permission: function (appId, namespaceName) {
return hasNamespacePermission(appId, namespaceName, 'ModifyNamespace');
},
has_modify_namespace_env_permission: function (appId, env, namespaceName) {
return hasNamespaceEnvPermission(appId, env, namespaceName, 'ModifyNamespace');
},
has_release_namespace_permission: function (appId, namespaceName) {
return hasNamespacePermission(appId, namespaceName, 'ReleaseNamespace');
},
has_release_namespace_env_permission: function (appId, env, namespaceName) {
return hasNamespaceEnvPermission(appId, env, namespaceName, 'ReleaseNamespace');
},
has_root_permission: function () {
var d = $q.defer();
permission_resource.has_root_permission({ },
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
assign_modify_namespace_role: function (appId, namespaceName, user) {
return assignNamespaceRoleToUser(appId, namespaceName, 'ModifyNamespace', user);
},
assign_modify_namespace_env_role: function (appId, env, namespaceName, user) {
return assignNamespaceEnvRoleToUser(appId, env, namespaceName, 'ModifyNamespace', user);
},
assign_release_namespace_role: function (appId, namespaceName, user) {
return assignNamespaceRoleToUser(appId, namespaceName, 'ReleaseNamespace', user);
},
assign_release_namespace_env_role: function (appId, env, namespaceName, user) {
return assignNamespaceEnvRoleToUser(appId, env, namespaceName, 'ReleaseNamespace', user);
},
remove_modify_namespace_role: function (appId, namespaceName, user) {
return removeNamespaceRoleFromUser(appId, namespaceName, 'ModifyNamespace', user);
},
remove_modify_namespace_env_role: function (appId, env, namespaceName, user) {
return removeNamespaceEnvRoleFromUser(appId, env, namespaceName, 'ModifyNamespace', user);
},
remove_release_namespace_role: function (appId, namespaceName, user) {
return removeNamespaceRoleFromUser(appId, namespaceName, 'ReleaseNamespace', user);
},
remove_release_namespace_env_role: function (appId, env, namespaceName, user) {
return removeNamespaceEnvRoleFromUser(appId, env, namespaceName, 'ReleaseNamespace', user);
},
get_namespace_role_users: function (appId, namespaceName) {
var d = $q.defer();
permission_resource.get_namespace_role_users({
appId: appId,
namespaceName: namespaceName,
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
get_namespace_env_role_users: function (appId, env, namespaceName) {
var d = $q.defer();
permission_resource.get_namespace_env_role_users({
appId: appId,
namespaceName: namespaceName,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
get_app_role_users: function (appId) {
var d = $q.defer();
permission_resource.get_app_role_users({
appId: appId
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
assign_master_role: function (appId, user) {
var d = $q.defer();
permission_resource.assign_app_role_to_user({
appId: appId,
roleType: 'Master'
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
remove_master_role: function (appId, user) {
var d = $q.defer();
permission_resource.remove_app_role_from_user({
appId: appId,
roleType: 'Master',
user: user
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
has_open_manage_app_master_role_limit: function () {
var d = $q.defer();
permission_resource.has_open_manage_app_master_role_limit({},
function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
appService.service('PermissionService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var permission_resource = $resource('', {}, {
init_app_namespace_permission: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/initPermission',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
has_app_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/permissions/:permissionType'
},
has_namespace_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/permissions/:permissionType'
},
has_namespace_env_permission: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/permissions/:permissionType'
},
has_root_permission:{
method: 'GET',
url: AppUtil.prefixPath() + '/permissions/root'
},
get_namespace_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/role_users'
},
get_namespace_env_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/role_users'
},
assign_namespace_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
assign_namespace_env_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
remove_namespace_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/roles/:roleType?user=:user'
},
remove_namespace_env_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/namespaces/:namespaceName/roles/:roleType?user=:user'
},
get_app_role_users: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/role_users'
},
assign_app_role_to_user: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/roles/:roleType',
headers: {
'Content-Type': 'text/plain;charset=UTF-8'
}
},
remove_app_role_from_user: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/roles/:roleType?user=:user'
},
has_open_manage_app_master_role_limit: {
method: 'GET',
url: AppUtil.prefixPath() + '/system/role/manageAppMaster'
}
});
function initAppNamespacePermission(appId, namespace) {
var d = $q.defer();
permission_resource.init_app_namespace_permission({
appId: appId
}, namespace,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasAppPermission(appId, permissionType) {
var d = $q.defer();
permission_resource.has_app_permission({
appId: appId,
permissionType: permissionType
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasNamespacePermission(appId, namespaceName, permissionType) {
var d = $q.defer();
permission_resource.has_namespace_permission({
appId: appId,
namespaceName: namespaceName,
permissionType: permissionType
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function hasNamespaceEnvPermission(appId, env, namespaceName, permissionType) {
var d = $q.defer();
permission_resource.has_namespace_env_permission({
appId: appId,
namespaceName: namespaceName,
permissionType: permissionType,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function assignNamespaceRoleToUser(appId, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.assign_namespace_role_to_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function assignNamespaceEnvRoleToUser(appId, env, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.assign_namespace_env_role_to_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
env: env
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function removeNamespaceRoleFromUser(appId, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.remove_namespace_role_from_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
user: user
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
function removeNamespaceEnvRoleFromUser(appId, env, namespaceName, roleType, user) {
var d = $q.defer();
permission_resource.remove_namespace_env_role_from_user({
appId: appId,
namespaceName: namespaceName,
roleType: roleType,
user: user,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
return {
init_app_namespace_permission: function (appId, namespace) {
return initAppNamespacePermission(appId, namespace);
},
has_manage_app_master_permission: function (appId) {
return hasAppPermission(appId, 'ManageAppMaster');
},
has_create_namespace_permission: function (appId) {
return hasAppPermission(appId, 'CreateNamespace');
},
has_create_cluster_permission: function (appId) {
return hasAppPermission(appId, 'CreateCluster');
},
has_assign_user_permission: function (appId) {
return hasAppPermission(appId, 'AssignRole');
},
has_modify_namespace_permission: function (appId, namespaceName) {
return hasNamespacePermission(appId, namespaceName, 'ModifyNamespace');
},
has_modify_namespace_env_permission: function (appId, env, namespaceName) {
return hasNamespaceEnvPermission(appId, env, namespaceName, 'ModifyNamespace');
},
has_release_namespace_permission: function (appId, namespaceName) {
return hasNamespacePermission(appId, namespaceName, 'ReleaseNamespace');
},
has_release_namespace_env_permission: function (appId, env, namespaceName) {
return hasNamespaceEnvPermission(appId, env, namespaceName, 'ReleaseNamespace');
},
has_root_permission: function () {
var d = $q.defer();
permission_resource.has_root_permission({ },
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
assign_modify_namespace_role: function (appId, namespaceName, user) {
return assignNamespaceRoleToUser(appId, namespaceName, 'ModifyNamespace', user);
},
assign_modify_namespace_env_role: function (appId, env, namespaceName, user) {
return assignNamespaceEnvRoleToUser(appId, env, namespaceName, 'ModifyNamespace', user);
},
assign_release_namespace_role: function (appId, namespaceName, user) {
return assignNamespaceRoleToUser(appId, namespaceName, 'ReleaseNamespace', user);
},
assign_release_namespace_env_role: function (appId, env, namespaceName, user) {
return assignNamespaceEnvRoleToUser(appId, env, namespaceName, 'ReleaseNamespace', user);
},
remove_modify_namespace_role: function (appId, namespaceName, user) {
return removeNamespaceRoleFromUser(appId, namespaceName, 'ModifyNamespace', user);
},
remove_modify_namespace_env_role: function (appId, env, namespaceName, user) {
return removeNamespaceEnvRoleFromUser(appId, env, namespaceName, 'ModifyNamespace', user);
},
remove_release_namespace_role: function (appId, namespaceName, user) {
return removeNamespaceRoleFromUser(appId, namespaceName, 'ReleaseNamespace', user);
},
remove_release_namespace_env_role: function (appId, env, namespaceName, user) {
return removeNamespaceEnvRoleFromUser(appId, env, namespaceName, 'ReleaseNamespace', user);
},
get_namespace_role_users: function (appId, namespaceName) {
var d = $q.defer();
permission_resource.get_namespace_role_users({
appId: appId,
namespaceName: namespaceName,
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
get_namespace_env_role_users: function (appId, env, namespaceName) {
var d = $q.defer();
permission_resource.get_namespace_env_role_users({
appId: appId,
namespaceName: namespaceName,
env: env
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
get_app_role_users: function (appId) {
var d = $q.defer();
permission_resource.get_app_role_users({
appId: appId
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
assign_master_role: function (appId, user) {
var d = $q.defer();
permission_resource.assign_app_role_to_user({
appId: appId,
roleType: 'Master'
}, user,
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
remove_master_role: function (appId, user) {
var d = $q.defer();
permission_resource.remove_app_role_from_user({
appId: appId,
roleType: 'Master',
user: user
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
has_open_manage_app_master_role_limit: function () {
var d = $q.defer();
permission_resource.has_open_manage_app_master_role_limit({},
function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/vendor/angular/angular-route.min.js | /*
AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT
*/
(function (p, c, C) {
'use strict';
function v(r, h, g) {
return {
restrict: "ECA", terminal: !0, priority: 400, transclude: "element", link: function (a, f, b, d, y) {
function z() {
k && (g.cancel(k), k = null);
l && (l.$destroy(), l = null);
m && (k = g.leave(m), k.then(function () {
k = null
}), m = null)
}
function x() {
var b = r.current && r.current.locals;
if (c.isDefined(b && b.$template)) {
var b = a.$new(), d = r.current;
m = y(b, function (b) {
g.enter(b, null, m || f).then(function () {
!c.isDefined(t) || t && !a.$eval(t) || h()
});
z()
});
l = d.scope = b;
l.$emit("$viewContentLoaded");
l.$eval(w)
} else z()
}
var l, m, k, t = b.autoscroll, w = b.onload || "";
a.$on("$routeChangeSuccess", x);
x()
}
}
}
function A(c, h, g) {
return {
restrict: "ECA", priority: -400, link: function (a, f) {
var b = g.current, d = b.locals;
f.html(d.$template);
var y = c(f.contents());
b.controller && (d.$scope = a, d = h(b.controller, d), b.controllerAs && (a[b.controllerAs] = d), f.data("$ngControllerController", d), f.children().data("$ngControllerController", d));
y(a)
}
}
}
p = c.module("ngRoute", ["ng"]).provider("$route", function () {
function r(a, f) {
return c.extend(Object.create(a),
f)
}
function h(a, c) {
var b = c.caseInsensitiveMatch, d = {originalPath: a, regexp: a}, g = d.keys = [];
a = a.replace(/([().])/g, "\\$1").replace(/(\/)?:(\w+)([\?\*])?/g, function (a, c, b, d) {
a = "?" === d ? d : null;
d = "*" === d ? d : null;
g.push({name: b, optional: !!a});
c = c || "";
return "" + (a ? "" : c) + "(?:" + (a ? c : "") + (d && "(.+?)" || "([^/]+)") + (a || "") + ")" + (a || "")
}).replace(/([\/$\*])/g, "\\$1");
d.regexp = new RegExp("^" + a + "$", b ? "i" : "");
return d
}
var g = {};
this.when = function (a, f) {
var b = c.copy(f);
c.isUndefined(b.reloadOnSearch) && (b.reloadOnSearch = !0);
c.isUndefined(b.caseInsensitiveMatch) && (b.caseInsensitiveMatch = this.caseInsensitiveMatch);
g[a] = c.extend(b, a && h(a, b));
if (a) {
var d = "/" == a[a.length - 1] ? a.substr(0, a.length - 1) : a + "/";
g[d] = c.extend({redirectTo: a}, h(d, b))
}
return this
};
this.caseInsensitiveMatch = !1;
this.otherwise = function (a) {
"string" === typeof a && (a = {redirectTo: a});
this.when(null, a);
return this
};
this.$get = ["$rootScope", "$location", "$routeParams", "$q", "$injector", "$templateRequest", "$sce", function (a, f, b, d, h, p, x) {
function l(b) {
var e = s.current;
(v = (n = k()) && e && n.$$route === e.$$route && c.equals(n.pathParams, e.pathParams) && !n.reloadOnSearch && !w) || !e && !n || a.$broadcast("$routeChangeStart", n, e).defaultPrevented && b && b.preventDefault()
}
function m() {
var u = s.current, e = n;
if (v)u.params = e.params, c.copy(u.params, b), a.$broadcast("$routeUpdate", u); else if (e || u)w = !1, (s.current = e) && e.redirectTo && (c.isString(e.redirectTo) ? f.path(t(e.redirectTo, e.params)).search(e.params).replace() : f.url(e.redirectTo(e.pathParams, f.path(), f.search())).replace()), d.when(e).then(function () {
if (e) {
var a =
c.extend({}, e.resolve), b, f;
c.forEach(a, function (b, e) {
a[e] = c.isString(b) ? h.get(b) : h.invoke(b, null, null, e)
});
c.isDefined(b = e.template) ? c.isFunction(b) && (b = b(e.params)) : c.isDefined(f = e.templateUrl) && (c.isFunction(f) && (f = f(e.params)), c.isDefined(f) && (e.loadedTemplateUrl = x.valueOf(f), b = p(f)));
c.isDefined(b) && (a.$template = b);
return d.all(a)
}
}).then(function (f) {
e == s.current && (e && (e.locals = f, c.copy(e.params, b)), a.$broadcast("$routeChangeSuccess", e, u))
}, function (b) {
e == s.current && a.$broadcast("$routeChangeError",
e, u, b)
})
}
function k() {
var a, b;
c.forEach(g, function (d, g) {
var q;
if (q = !b) {
var h = f.path();
q = d.keys;
var l = {};
if (d.regexp)if (h = d.regexp.exec(h)) {
for (var k = 1, m = h.length; k < m; ++k) {
var n = q[k - 1], p = h[k];
n && p && (l[n.name] = p)
}
q = l
} else q = null; else q = null;
q = a = q
}
q && (b = r(d, {params: c.extend({}, f.search(), a), pathParams: a}), b.$$route = d)
});
return b || g[null] && r(g[null], {params: {}, pathParams: {}})
}
function t(a, b) {
var d = [];
c.forEach((a || "").split(":"), function (a, c) {
if (0 === c)d.push(a); else {
var f = a.match(/(\w+)(?:[?*])?(.*)/),
g = f[1];
d.push(b[g]);
d.push(f[2] || "");
delete b[g]
}
});
return d.join("")
}
var w = !1, n, v, s = {
routes: g, reload: function () {
w = !0;
a.$evalAsync(function () {
l();
m()
})
}, updateParams: function (a) {
if (this.current && this.current.$$route)a = c.extend({}, this.current.params, a), f.path(t(this.current.$$route.originalPath, a)), f.search(a); else throw B("norout");
}
};
a.$on("$locationChangeStart", l);
a.$on("$locationChangeSuccess", m);
return s
}]
});
var B = c.$$minErr("ngRoute");
p.provider("$routeParams", function () {
this.$get = function () {
return {}
}
});
p.directive("ngView", v);
p.directive("ngView", A);
v.$inject = ["$route", "$anchorScroll", "$animate"];
A.$inject = ["$compile", "$controller", "$route"]
})(window, window.angular);
//# sourceMappingURL=angular-route.min.js.map
| /*
AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT
*/
(function (p, c, C) {
'use strict';
function v(r, h, g) {
return {
restrict: "ECA", terminal: !0, priority: 400, transclude: "element", link: function (a, f, b, d, y) {
function z() {
k && (g.cancel(k), k = null);
l && (l.$destroy(), l = null);
m && (k = g.leave(m), k.then(function () {
k = null
}), m = null)
}
function x() {
var b = r.current && r.current.locals;
if (c.isDefined(b && b.$template)) {
var b = a.$new(), d = r.current;
m = y(b, function (b) {
g.enter(b, null, m || f).then(function () {
!c.isDefined(t) || t && !a.$eval(t) || h()
});
z()
});
l = d.scope = b;
l.$emit("$viewContentLoaded");
l.$eval(w)
} else z()
}
var l, m, k, t = b.autoscroll, w = b.onload || "";
a.$on("$routeChangeSuccess", x);
x()
}
}
}
function A(c, h, g) {
return {
restrict: "ECA", priority: -400, link: function (a, f) {
var b = g.current, d = b.locals;
f.html(d.$template);
var y = c(f.contents());
b.controller && (d.$scope = a, d = h(b.controller, d), b.controllerAs && (a[b.controllerAs] = d), f.data("$ngControllerController", d), f.children().data("$ngControllerController", d));
y(a)
}
}
}
p = c.module("ngRoute", ["ng"]).provider("$route", function () {
function r(a, f) {
return c.extend(Object.create(a),
f)
}
function h(a, c) {
var b = c.caseInsensitiveMatch, d = {originalPath: a, regexp: a}, g = d.keys = [];
a = a.replace(/([().])/g, "\\$1").replace(/(\/)?:(\w+)([\?\*])?/g, function (a, c, b, d) {
a = "?" === d ? d : null;
d = "*" === d ? d : null;
g.push({name: b, optional: !!a});
c = c || "";
return "" + (a ? "" : c) + "(?:" + (a ? c : "") + (d && "(.+?)" || "([^/]+)") + (a || "") + ")" + (a || "")
}).replace(/([\/$\*])/g, "\\$1");
d.regexp = new RegExp("^" + a + "$", b ? "i" : "");
return d
}
var g = {};
this.when = function (a, f) {
var b = c.copy(f);
c.isUndefined(b.reloadOnSearch) && (b.reloadOnSearch = !0);
c.isUndefined(b.caseInsensitiveMatch) && (b.caseInsensitiveMatch = this.caseInsensitiveMatch);
g[a] = c.extend(b, a && h(a, b));
if (a) {
var d = "/" == a[a.length - 1] ? a.substr(0, a.length - 1) : a + "/";
g[d] = c.extend({redirectTo: a}, h(d, b))
}
return this
};
this.caseInsensitiveMatch = !1;
this.otherwise = function (a) {
"string" === typeof a && (a = {redirectTo: a});
this.when(null, a);
return this
};
this.$get = ["$rootScope", "$location", "$routeParams", "$q", "$injector", "$templateRequest", "$sce", function (a, f, b, d, h, p, x) {
function l(b) {
var e = s.current;
(v = (n = k()) && e && n.$$route === e.$$route && c.equals(n.pathParams, e.pathParams) && !n.reloadOnSearch && !w) || !e && !n || a.$broadcast("$routeChangeStart", n, e).defaultPrevented && b && b.preventDefault()
}
function m() {
var u = s.current, e = n;
if (v)u.params = e.params, c.copy(u.params, b), a.$broadcast("$routeUpdate", u); else if (e || u)w = !1, (s.current = e) && e.redirectTo && (c.isString(e.redirectTo) ? f.path(t(e.redirectTo, e.params)).search(e.params).replace() : f.url(e.redirectTo(e.pathParams, f.path(), f.search())).replace()), d.when(e).then(function () {
if (e) {
var a =
c.extend({}, e.resolve), b, f;
c.forEach(a, function (b, e) {
a[e] = c.isString(b) ? h.get(b) : h.invoke(b, null, null, e)
});
c.isDefined(b = e.template) ? c.isFunction(b) && (b = b(e.params)) : c.isDefined(f = e.templateUrl) && (c.isFunction(f) && (f = f(e.params)), c.isDefined(f) && (e.loadedTemplateUrl = x.valueOf(f), b = p(f)));
c.isDefined(b) && (a.$template = b);
return d.all(a)
}
}).then(function (f) {
e == s.current && (e && (e.locals = f, c.copy(e.params, b)), a.$broadcast("$routeChangeSuccess", e, u))
}, function (b) {
e == s.current && a.$broadcast("$routeChangeError",
e, u, b)
})
}
function k() {
var a, b;
c.forEach(g, function (d, g) {
var q;
if (q = !b) {
var h = f.path();
q = d.keys;
var l = {};
if (d.regexp)if (h = d.regexp.exec(h)) {
for (var k = 1, m = h.length; k < m; ++k) {
var n = q[k - 1], p = h[k];
n && p && (l[n.name] = p)
}
q = l
} else q = null; else q = null;
q = a = q
}
q && (b = r(d, {params: c.extend({}, f.search(), a), pathParams: a}), b.$$route = d)
});
return b || g[null] && r(g[null], {params: {}, pathParams: {}})
}
function t(a, b) {
var d = [];
c.forEach((a || "").split(":"), function (a, c) {
if (0 === c)d.push(a); else {
var f = a.match(/(\w+)(?:[?*])?(.*)/),
g = f[1];
d.push(b[g]);
d.push(f[2] || "");
delete b[g]
}
});
return d.join("")
}
var w = !1, n, v, s = {
routes: g, reload: function () {
w = !0;
a.$evalAsync(function () {
l();
m()
})
}, updateParams: function (a) {
if (this.current && this.current.$$route)a = c.extend({}, this.current.params, a), f.path(t(this.current.$$route.originalPath, a)), f.search(a); else throw B("norout");
}
};
a.$on("$locationChangeStart", l);
a.$on("$locationChangeSuccess", m);
return s
}]
});
var B = c.$$minErr("ngRoute");
p.provider("$routeParams", function () {
this.$get = function () {
return {}
}
});
p.directive("ngView", v);
p.directive("ngView", A);
v.$inject = ["$route", "$anchorScroll", "$animate"];
A.$inject = ["$compile", "$controller", "$route"]
})(window, window.angular);
//# sourceMappingURL=angular-route.min.js.map
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/InstanceConfigRepository.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
import java.util.Set;
public interface InstanceConfigRepository extends PagingAndSortingRepository<InstanceConfig, Long> {
InstanceConfig findByInstanceIdAndConfigAppIdAndConfigNamespaceName(long instanceId, String
configAppId, String configNamespaceName);
Page<InstanceConfig> findByReleaseKeyAndDataChangeLastModifiedTimeAfter(String releaseKey, Date
validDate, Pageable pageable);
Page<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfter(
String appId, String clusterName, String namespaceName, Date validDate, Pageable pageable);
List<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfterAndReleaseKeyNotIn(
String appId, String clusterName, String namespaceName, Date validDate, Set<String> releaseKey);
@Modifying
@Query("delete from InstanceConfig where ConfigAppId=?1 and ConfigClusterName=?2 and ConfigNamespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName);
@Query(
value = "select b.Id from `InstanceConfig` a inner join `Instance` b on b.Id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
countQuery = "select count(1) from `InstanceConfig` a inner join `Instance` b on b.id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
nativeQuery = true)
Page<Object> findInstanceIdsByNamespaceAndInstanceAppId(
@Param("instanceAppId") String instanceAppId, @Param("configAppId") String configAppId,
@Param("clusterName") String clusterName, @Param("namespaceName") String namespaceName,
@Param("validDate") Date validDate, Pageable pageable);
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
import java.util.Set;
public interface InstanceConfigRepository extends PagingAndSortingRepository<InstanceConfig, Long> {
InstanceConfig findByInstanceIdAndConfigAppIdAndConfigNamespaceName(long instanceId, String
configAppId, String configNamespaceName);
Page<InstanceConfig> findByReleaseKeyAndDataChangeLastModifiedTimeAfter(String releaseKey, Date
validDate, Pageable pageable);
Page<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfter(
String appId, String clusterName, String namespaceName, Date validDate, Pageable pageable);
List<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfterAndReleaseKeyNotIn(
String appId, String clusterName, String namespaceName, Date validDate, Set<String> releaseKey);
@Modifying
@Query("delete from InstanceConfig where ConfigAppId=?1 and ConfigClusterName=?2 and ConfigNamespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName);
@Query(
value = "select b.Id from `InstanceConfig` a inner join `Instance` b on b.Id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
countQuery = "select count(1) from `InstanceConfig` a inner join `Instance` b on b.id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
nativeQuery = true)
Page<Object> findInstanceIdsByNamespaceAndInstanceAppId(
@Param("instanceAppId") String instanceAppId, @Param("configAppId") String configAppId,
@Param("clusterName") String clusterName, @Param("namespaceName") String namespaceName,
@Param("validDate") Date validDate, Pageable pageable);
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/resources/application.properties | #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
spring.cloud.consul.enabled=false | #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
spring.cloud.consul.enabled=false | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import java.io.IOException;
import java.net.ServerSocket;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.junit.After;
import org.junit.Before;
public abstract class BaseIntegrationTest {
protected static final int PORT = findFreePort();
private Server server;
/**
* init and start a jetty server, remember to call server.stop when the task is finished
*/
protected Server startServerWithHandlers(ContextHandler... handlers) throws Exception {
server = new Server(PORT);
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.setHandlers(handlers);
server.setHandler(contexts);
server.start();
return server;
}
@Before
public void setUp() throws Exception {
MessageProducer someProducer = mock(MessageProducer.class);
MockMessageProducerManager.setProducer(someProducer);
Transaction someTransaction = mock(Transaction.class);
when(someProducer.newTransaction(anyString(), anyString())).thenReturn(someTransaction);
}
@After
public void tearDown() throws Exception {
if (server != null && server.isStarted()) {
server.stop();
}
}
protected ContextHandler mockServerHandler(final int statusCode, final String response) {
ContextHandler context = new ContextHandler("/");
context.setHandler(new AbstractHandler() {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
response.setContentType("text/plain;charset=UTF-8");
response.setStatus(statusCode);
response.getWriter().println(response);
baseRequest.setHandled(true);
}
});
return context;
}
/**
* Returns a free port number on localhost.
*
* Heavily inspired from org.eclipse.jdt.launching.SocketUtil (to avoid a dependency to JDT just because of this).
* Slightly improved with close() missing in JDT. And throws exception instead of returning -1.
*
* @return a free port number on localhost
* @throws IllegalStateException if unable to find a free port
*/
protected static int findFreePort() {
ServerSocket socket = null;
try {
socket = new ServerSocket(0);
socket.setReuseAddress(true);
int port = socket.getLocalPort();
try {
socket.close();
} catch (IOException e) {
// Ignore IOException on close()
}
return port;
} catch (IOException e) {
} finally {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
}
}
}
throw new IllegalStateException("Could not find a free TCP/IP port to start embedded Jetty HTTP Server on");
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import java.io.IOException;
import java.net.ServerSocket;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.junit.After;
import org.junit.Before;
public abstract class BaseIntegrationTest {
protected static final int PORT = findFreePort();
private Server server;
/**
* init and start a jetty server, remember to call server.stop when the task is finished
*/
protected Server startServerWithHandlers(ContextHandler... handlers) throws Exception {
server = new Server(PORT);
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.setHandlers(handlers);
server.setHandler(contexts);
server.start();
return server;
}
@Before
public void setUp() throws Exception {
MessageProducer someProducer = mock(MessageProducer.class);
MockMessageProducerManager.setProducer(someProducer);
Transaction someTransaction = mock(Transaction.class);
when(someProducer.newTransaction(anyString(), anyString())).thenReturn(someTransaction);
}
@After
public void tearDown() throws Exception {
if (server != null && server.isStarted()) {
server.stop();
}
}
protected ContextHandler mockServerHandler(final int statusCode, final String response) {
ContextHandler context = new ContextHandler("/");
context.setHandler(new AbstractHandler() {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
response.setContentType("text/plain;charset=UTF-8");
response.setStatus(statusCode);
response.getWriter().println(response);
baseRequest.setHandled(true);
}
});
return context;
}
/**
* Returns a free port number on localhost.
*
* Heavily inspired from org.eclipse.jdt.launching.SocketUtil (to avoid a dependency to JDT just because of this).
* Slightly improved with close() missing in JDT. And throws exception instead of returning -1.
*
* @return a free port number on localhost
* @throws IllegalStateException if unable to find a free port
*/
protected static int findFreePort() {
ServerSocket socket = null;
try {
socket = new ServerSocket(0);
socket.setReuseAddress(true);
int port = socket.getLocalPort();
try {
socket.close();
} catch (IOException e) {
// Ignore IOException on close()
}
return port;
} catch (IOException e) {
} finally {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
}
}
}
throw new IllegalStateException("Could not find a free TCP/IP port to start embedded Jetty HTTP Server on");
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./doc/images/apollo-home-screenshot.jpg | JFIF H H dExif MM * ( i >
X 8Photoshop 3.0 8BIM 8BIM% ُ B~
ICC_PROFILE
appl mntrRGB XYZ
'acspAPPL APPL -appl desc P bdscm cprt #wtpt rXYZ gXYZ bXYZ rTRC aarg $ vcgt D 0ndin t >chad ,mmod (bTRC gTRC aabg $ aagg $ desc Display mluc & hrHR koKR nbNO id huHU csCZ daDK nlNL fiFI itIT esES roRO frCA ar ukUA heIL zhTW viVN skSK zhCN ruRU enGB frFR ms hiIN thTH caES enAU esXL deDE enUS ptBR plPL elGR svSE trTR ptPT jaJP D E L L P 2 4 1 5 Q text Copyright Apple Inc., 2020 XYZ XYZ q 8 XYZ _ Y nXYZ %
curv
# ( - 2 6 ; @ E J O T Y ^ c h m r w |
%+28>ELRY`gnu| &/8AKT]gqz !-8COZfr~ -;HUcq~
+:IXgw'7HYj{+=Oat 2FZn % : O d y
'
=
T
j
" 9 Q i * C \ u
&
@
Z
t
.Id %A^z &Ca~1Om&Ed#Cc'Ij4Vx&Il Ae@e Ek*Qw;c * R { G p @ j > i A l ! !H!u!!!"'"U"""#
#8#f###$ $M$|$$% %8%h%%%&'&W&&&''I'z''(
(?(q(())8)k))**5*h**++6+i++,,9,n,,- -A-v--..L.../$/Z///050l0011J1112*2c223
3F3334+4e4455M555676r667$7`7788P8899B999:6:t::;-;k;;<'<e<<="=a==> >`>>?!?a??@#@d@@A)AjAAB0BrBBC:C}CDDGDDEEUEEF"FgFFG5G{GHHKHHI IcIIJ7J}JK KSKKL*LrLMMJMMN%NnNO OIOOP'PqPQQPQQR1R|RSS_SSTBTTU(UuUVV\VVWDWWX/X}XYYiYZZVZZ[E[[\5\\]']x]^^l^__a_``W``aOaabIbbcCccd@dde=eef=ffg=ggh?hhiCiijHjjkOkklWlmm`mnnkno oxop+ppq:qqrKrss]sttptu(uuv>vvwVwxxnxy*yyzFz{{c{|!||}A}~~b~#G
k͂0W Grׇ;iΉ3dʋ0cʍ1fΏ6n֑?zM _ɖ4
uL$h՛B dҞ@ iءG&vVǥ8nRĩ7 u\ЭD- u`ֲK³8%yhYѹJº;.!
zpg_XQKFAǿ=ȼ:ɹ8ʷ6˶5̵5͵6ζ7ϸ9к<Ѿ?DINU\dlvۀ܊ݖ ޢ)߯6DScs
2F[p(@Xr4Pm8Ww)Kmpara ff
Y
[vcgt ndin 6 U M &@ P@ T@ 33 33 33 sf32 W ) mmod 0U6Bs
X"
} !1AQa"q2#BR$3br
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz
w !1AQaq"2B #3Rbr
$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz C
) )1))))))11111111;;;;;;EEEEEMMMMMMMMMM C
""Q7-7QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ ? Z(
(
(
i!FI
/RԞqDi ݜ'jfB?_ 8 { \6\6T غ L: }frƵdWK 6T}/Sx A1dj.5.cE&iiQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE Z(
(
(1
82 z`&HS WC, OVvϡRެj X Pҷ@@xXo,wh/W%]l/|EdT=nH)'꤃T^ BBt'Zz)#RfsGO%-'jW?OM~US)lQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
y,c$gIs AU RݙOKa < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o( X<`NFYگxI ЅhEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPZ(
(
(Xe F}h7X7d,p+C*ʜ9U' ]M[+/Z
TGQ}EpZwyHtck[XK»
F=B$!=E jHq+{zDv = -x&] R+<;>#RH~RX)DP
BsRO摻oS?Zъxg]:P"Z(
(Ψ܀d^W'K3yVcvNvt5ä4q%?/ӊ|!{*@)# ? @ 떆t=ܯܚ&?(.;nPESӡE8?J ÿ tTV>%Ю GdRn Z) \;) ^a uTW'gMAǏ κA4ܟ cy 1n3? (SzGG W )2z
|eHb2XuGҀ:+w b'0?:ꕃ rB(QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE s Aι Oi S$fTfU@$_j A,l \?
G(dZN#r\=* SYM+#JCfS3@ e )ʐuA!hs! !G5K˅Tf9.$$!Tu'*SyWw,fQ-'}z7EU le[G $ܹ]r袿{,P۱8z J
=e9^FH=Ao(H)b0'@ (M.E^( Ьij)i gnmttw\ݞk (? * + y/5 a })ڽ[I*㯿P]K<O&H=pɭFmꭌ=hZ*WvӱXdW# s\@UU*2A `zUxn2!\ ]#G&7(FP +&U19r
mE QEVY &w +]ek.+9b?`ln К h^ 04rwy%8Bch_ Wi"5xݞ(
1 iʐ>vsWw_(V&7$ڀ:hdD5%smdm- 26?Njގ.-5ӳp;4Ec<Œ_2{zؠ((((((((((((((((((((+4Pr-3NPz5E 1Q
DŽ Vgj' B@Q@Q@Q@"CK!
2IqW+1q~tjn^;XА%b[.8k@mw'HpqӰZ m⫸ {eav06n}2)G>1r3U?ܿ59R < 8"i8D'
ik*"el`2s[R@<p+koPlb c\h^ӑEfq!`6 gަmoh`Hea^o1vgHOH]n1>g; t>JM6C6B]FK)/>dhђ9`[>cnqکA
RʓJn
lqso 0f2 (Qhh{vt QE QE QE Tr(d(X~%`@W BSzN_s_*&dǬu j`m}8^ke6 JA]=84EajMxl/-ͼw('p#L[strb }: ߢ-uպ%ad:n! r= ϷY%ݛs`J Eb1K62r6':uMe 8ʾՠ` 6<^͓[K7`A _j 謍CUr1瓐 vzKub2 ƀ6袊 ( ( ( ( λ,eHn_k?Oa}s^%I l0 O~HVGuKmA8`Yڶ-dmNe#%(f-gNma3O}kRxMUҾ`rezFkҠ.!IP> ji(] ~2gK`2zJ_ Hel*pp+8#.X4d PSoM2hQ[$ׁWeby%%Âsr21@Z6I3ۭBi 5#3vg81-Iw )' !ݳll9ҹ纵â l{7Vjj G
nր:+o3h%y9ZW3݄]UO ->q<f/mT S)ڀ5hsE0(k^t."23\\KD`T<zWKKo%qI,_!lC gtiL3̨ qsI j[۞5b{ G߳g!egngV.k1u✖dT@5/O Ѕ 7#%
Km\%#a%m 7;E ֤ɭfYjzPmEPEPEPEPEPEP
+!gib2I z\Ckvaq\F
ά0Djxd!8V' zmU B-: =>wmK&' o31V5
hX^%ҳey$ @V'4p>>W.Ul ܪ Sb3nКQy3x(9 \?-^ ޫ+ r u`ɩej ʊ5x SbfKԭm>QE QE QE QE QEZ(
IYHUQO`*JOZzL-0ouxiq7 JoXؑqݗf-#K/߫rOWk? ơ4˟
[۠5#!YMhjZmQzR_i͐|=-̛Y}
>w;
עf }
3u8_OpU6@ ? [Sa#v.3oV--$[HcaW~ -G%ʤԴ+ ?Mݵ~ }W@$Zg{7 ^XxdY#%YA"JWC~@4QY4.k7*4˭tnDl!O WZEci?r%
=k6jHe,2zu xy?@|{5Z?/vu Iu].~b\z2ƼR Z;Ȕ GlxS6i,2糏 POUxk:r=FK2(==k Z O;{ㄽϘgk.3oo?I*r#Yy+^^)/TtPhZѰXHAIxYfm33k [+ "so+ڨ͵[y
.$Qr=s]WU#+ԫrֿtܹ2r~ G _g o+ t; 1@ Fbe#E MpIn63k]"?ldWȠGj]%H; 75[9.#/wU#שWZ!~@ EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPY? i m?Ѭ
hRʰҿDz
H
} r\\Kh* BGKwR;!\kR
ګOt^ 3x|/ހ {yZ9n%%Y0~PõtA.ݶ@9~W,
{wmB &2A~i
y+ d !֊q{0m )H*u?Tm%7Q3 8DH kH hn( D3'9 {VdRGr0Qy')Mxoȳ77ґ38Z ۍI# XIy?Zl/-5X 5IbKj[/U*03zPkA !Y{Pp3W
r?PǪJ$ r(]^i/m"CW+?ZځzRH: KYI)+VC#th P-B ğ+6 t3cӟUwFgklfHX,涎I.F%y @
dDssgPKjd97 Ub[Qd9_³o
-%a;N1r3@խ!H-up8x ROlz@J GM$Ws
9ɨ.~5{E Viwj6| w " կ3ARbrIv\
#M TԵKWOg
l`UqEX,I~ Q}FPx*4QY{[\2wz5j;Vx>,QEUK1 rǥ fiF2 Zv ץeddH&l ~:nK7<Q$vk% Qkm=J2LVQA.$X_AƟ[I+&p:۴O?ت7:tѢFxY5;.!6,H\`w:+b3O8XW:DΛ\uu 5Ja-e
ϴ7ʣ$@<D5ͬ9U?] ݢhF5E ?Ul&3Qcaڀ .{IV>өZگ " ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (( Rw w'KEDŽ Vgj' B@Q@Q@Q@ l KKcwJC&
Y?|u WV4 ٌ ;_Gx!ip,s[x{<>&_Oq$#co] K&1BgKNd\ uK#T WeT,3؟:Fj ?fghfF˸ qdIa$
6 \:M8nB| hsU+lahc,س9$aRٵ 縼{P$7qިzؒiieb9 [@r)><t&/%|K ' ?Ҁ)jq`^2 ZeGw\ P@'nPEPEPEPX^$ <U Ѕn{X/!6 #=հP=eқkK6ZRHm٫_h tmѢ#$'#=yhX57yJ pz@$>go'|3_)ԉ6O ;P%g7jg(n`ʳ1`x8[glIx˙cUx=wVZQY6~G6 v Pk$wWz 4G F w= ƍKƇI!W{
$My#92v~ (k
* rGNM2_y@UnGP:t6"?ܞI?9xI0x>^3,WZDE sT&`d2`u >oV9,#84gDW ϯJ qI.>F66 R=
^;4w*+:PPIoCЏTvZUK[&X~4%n`êQ^y ;}4P
>
:A yV>QE QE QE QE p^)&-#䒫ݻu?WĺS"
9^UIH{VUƏosG SM qz4k6QH a9"%UQB ڻn3 ?.$ݳ85C3P q>˞jye%2k6=&#Tth fQ[KjGZ9mVT܌Nx*m<J"> zzb$fV} }(}!-Y jh-(O+&,u]kpm8PYGD7߷f,tqր/+[ݭ1 TQs.d$okrY@
yTHu y){T&s%23J0OvIGwU]:tDhcj$egyi++ܴW 0?w
Z?2 N 9M? Q 9k7cL:<Cxi60RRW=ja XQ. 0T 1{P5 L[ӷ NWJ^"zWkɶ]'ԚqD\imf=
KyP܀sFJ=:ƫ#n`N1늒<Ug}LHpƺEMO6\49? [PEPEPEPU.mbn\(}u :ٹ7 ۜcj7q~X_s 2'c W ZC ; e@ SE<bXX:7B^kI]2ޟJ2~cq֕ݝF @ ^o/L1G +b֯) yXi'sI$YWd
ژ[y:@묲^Xs/drhYcdVp\kRG$2LJ<dH ٥,/Iq 7uh++?9DDz"! j TOB
'M0iv lb?Hۙry<w{
C,:,#[* ^$+(g:gmiwP-D (# WѴ<#3Hf5jn`êQW.v j;
>
:A yV>Q@Q@Q@Q@ Z(
_ HIպF ^^'
ɠVx?/ l|6Mde>Wyy Igv:W
.@OMɮS&f܌sjLBt 7
49q֦}4]ΑJf hD F|O_aD,p5|<o3h݆ݎqǭ3S?' }V}kb7 x=T0 k [ }b #\@ i^o"` y4FI|Lm5džu
DA Q_=
R
R$Px1ٴR
y21oקxN*0eb A'iq#XriReg=IPM29.Co"0M[T > g G^/{I4/a$a2c??y-qM7 q@ ?.Wq ?\t[b u9qp|G
Q*zuΈ@9verǺ&cp%ʵU"5=yW}᷍QW<kojvJZH GR JѼs=R =k=Vzb<Wp5Er>t֟;= ZJ FV?^wFq% ζGGy_+>e}O39݁ad}Lvs@ O|=5bau*:+GMJ#0 ]cxG28?=ռ{5L_r>p>MlV]Ԛl;ظ~b?: QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE s Aͻ!/-dna iRR@bU(OPUA v("p fZ('HiXqRE &)
XQNT @8dGR<i"C)ȧ ʮXd Ъ Q@Ƣ푶Wk}O] *oK qvW ,j
}ۏW((6
=> ( cH6ȡb c"%NF{F7*ΡTPLx@E #4( ј;(,9 J} Sh n=N9P(,fc U((((((((((((((((((((((( [<$ Bk7U ٴ@ " ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@ Z(
|K.5T>tTP˓=c3]J1 ^'k~| *kzn]"ּޭg$sl ?Zh|Jsa_ ~ ^}j{v WGE#mxz~5i -]g$C^h u{Q 7WS4
}<:a>ՙMQ ıǧק_i^Mn q w
ŬeW_ 7gl۽ ~xST/uSb1W{ A ݏOP7ijApDJr51Ƒ"ƃ
}*+kX-"[D ( ( ( jp}7AǸ`i0IZE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE <f)FA <TPhO;tܡKmC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍B+"%Heu鑀>E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE 7ڏ7ڢKQTTQ`%}}*(yo oEE;/GQQE`%}}*) |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEgvv,n9^OH U(%+Fͺ+- { E u $ GEbE u H Q={tV'$Z? _( G =ͺ+- { IŭRO`}k |0?WؗR ~e =?CiO ; v_?GQ.aܿEPӲ
?G=; v_?GQ.aܿEPӲ
?Ivk*Qe =?Cr˰{Xw/T?¯iʌԶaER(( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (QE QE
(
(?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP ߿ e>?-qPW٩\ VEW:}ɌNjttHYBas;VS+`1 &\6+ٖ\9$ȍKc5u[ʹz_h1kxl2< }A4E$ +5U+T+ɚ w<lԂ**K5EN K+GEVjG+ګkګu9-O??S ?* XEBĀ U78j+hEo eZ4n 5Fpz
63\HSkޜ TXyb[)aj
Bc w0墔ҏk{ V]C12cҙefR<=GyĢWm# ܤ}j텵rE'yOY- 4v] d,`wڥ] )$o5x / W稭})XH Fp'ީ^El"}=G֩TM*2yJ뼬:]B(c
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
cI ; })Vx ܍n5QWܙCzRʸ# JsJ kU2
dw`9އd IKI+mI Vikou~*m3~c fڵ s,X ԞW8k9gilEi>P"
z{}*TNV;o ʂdv<MNE #<?shv@
O9)nϽ ް{_v^֫$M~4q
88# 4wH#R@9V6j6K!D%#w|?StW{ dN-|;UWVeΙa1.ƫ0|A|8 {m"3;1DUqx'Y6Ee2S9,ۂXں/A? m2QY (AEܳ6Ԛ uDȓz~1($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?L`QE1Q@Q@ /~ ?<[ ץCG麜vW""#SO9?VZ[]>P>Qf? t9We*h56S(f y9s]&7Y^Gu\ t WT覕UZ-Ťl6K&zu=QEiN<s3WWW6+ׄrZI!I__iu?BG#HtJ'jK k.]ϙ|v罊M>HĎݳץe+!C=j:Iu.Xdm=՚Zܹ}q ֫QC-䔈jWA,G
ծMMpLW I1Ӄ]G.ǖ9?SMUcx'c-Jvl簪ZU6125EWV Ml x,Mͼ Z_h 2c\$X.Ao{hff#JCpc Ac5E5M're^N<wyYtQ\ǠQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ^2Y Dy<vj֛cxK\]N-WQg}CPY|E܊۬V)F 1#/9xUZ N[LGidѰy? 8-[kBG Vw4,s?D&6<uţ$;u Z(
,i:ё%ԏԞ¤ӡ RJsk!RSfm2oY8@CNzbu|w`7_]. oS-/v03ƐƱF0
N>((AD $(~TQE
(
(
($@ E&i"!'E QE QHH ih hel ր EPEPEPEPEPEPEPEPEPEPEPEA5\HY{},xQ`EC
)E}T?J
(
K~ Χ.Է1ҖtQE QE¥CHҕbRZ.+V6-UFŧp^bRZW^bQ}(AEO}(ؾ l_J6/ ҍEz*bQp^}(ؾ\,Wؾl_J. lZMJcbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾN2Y<.QE1 (AD $(~TQE
ξL5
Z5~Hwo$c ,u- G~t3rOQ?M1l6N֩x[{c\4ر8
>gob39-ZD]>Y&&'ڨZZ-90>1 ש+Y渙I M" y7i$7 Q
&]j3Iou~m b?*҆ >ByV
,3Y[IP$</ )6Qu6 y!۟mֹa_iqmjVmŒFўs[:)3H6ƣ }>K3+"bN{օMi03avs3{-(YZ4˒X ބgx,¦6P1 0?ր.k ZɏSq
k^-EXdb5o BɌFNg g - *?|SpdjlH i" BvKahF.]@+Fh]X̾e.W;r[Ydnm'i韭uT QE QE QE QE QE QE QE QE QE W7-~=m'Sϵt#kbBrU7dؒTFQ.fo?@+_ Ok:^ mr# aIaTcPּFe2VP 8vwI; tElw j9Awy/ZX +F7̮4QEdh?OP\ oc- KT ( ( dZU#
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
~C4QE1 (AD $(~TQE
{Yٮۙ I?6q#(,8 ƀ9 5#ӭ"rcPX O UJ
k{q d'#$?T[h c=8 .lc,CR:ݽM!idrbR ʔƅąAa89Cu3nbAlcVsͷ :YvŅn w㩮
Ry6Z̐W_?ʦᲁ.Iwcbz@ OmVF$,TA +1A$s3(;[ٽ+]'UK3$ӻVgo1%_*0j Ĺu*p ïF!x_j)%, *pX-j̟SSv3=@+kd`kB]aGP/ݪ귒oGLF$t4Zs}j>Bk>UV9MZnxT?LJP.|* S-6ijFY݉' (?K.q0#$Qswf%cs3 coõn Z(
(
(
(
(
(
(
(
(
Q."~# 6dVr>?~Ț8
Coxtr̍++ǫ|?s//\Gxv̈NMury<*=GDj'VGTV$?ڳ#!3MވKVzQ\P\ o? F:RB
(
(?IU?
R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( W?pS@KES(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
H Rua"<S r9LF; $jkʼnnl` =TI ,bvO*<L qSH; WpƱDQF jM4QE!AsS?[tKH:R( ( Y'V $*H(((
0Z.4,jaQ S?TAIj`{e{ Ky5 d B {[KEbZI6VA =z۩ʳYڐ3G=\fky ^'d2 xnMDCiB@s|}?hv͟w< hҿQj$-ɴ+/9R ֫FI'<J pU ZkSTԀcMu*y
mb 0N UK/z5 H!ee9P t5lNfJ= ufbg Ar/۬ $\+")* h sT{ 2VsrvD6/ x裚 NBhvD ߽jum+lTs ;-,^kDžfᡕXn {f[ 2"6pĥA# hQE QE QE QE dU^\;i^=0
њ14O8/|<e\Y9 ő תJlZ+ZEд \@ϩ[` SauM<+]1P^'k"EcϧZ"Tz :-^2I _SIFx+$?' ZVyY3+ ^LńW3mCnr\(G* (qȠ ^-I qԷ6=_T%唦 K#|1YnϮq'VxveB+(VǙi4qͩ20
v#: X7m$)pv*T0Mf]1XFa$Jޏa%RI<LJ r8 \ᵎ}Bko\ v
s(66Vh`B|H=a}zYզa̻ `W5e` "Y
)%Y:qհVխ%BHZF#Ԛ {hdB ʲuh+,_pI㚷uaHZwQz\$]ܬB1ma >_n Cj G /w15ͤ+unvLf taȮcP00 E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE U~B )%)(AI !=)i wϵ&2o3ڏ3ڥhj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j ban=?Y y-o@ )iJZQ@Q@ $*UdZQE QE QE =@ﴤbذ8r һf#j%$CRbh_
[BEO!S ӽzey~]^YK,Q1;<רQ&(B\ƒ r?s柧%-s8E:t{LϻHI=oF?_ͿƤ4AY!ĖQٞMǏ'F?_ _NB[c?.M.*t(,ϴp=UqZEbح"lt{_q]\Գ a[p*K=>?ٓif< ry
Z: Dc8}cYiڼ'bF _Z۶,kT;r;ڮnXٳp`r݁`tǭji::EVɓHBz= bVfs#d Vhh ( ( ( +Ku@]n#k i- dziNK!,q$K! #{f6(Q$K - ˨or?z ^ z(b#cO*3SZ;]-I&l G=v7B[uoZ?*Tz>eMDĀA GJe [ <rǣ4CR&KiY$w\oAg 0ԑjH9 ea qYtP5q8f㌂L@3hӶn" X6X nUk+bܶG:g>\iI9
Gs} g3Fvioch8$ޕkkqm3,ں] [oU*T)ϱ5;֯clvm h/g,$pnU%T~ax#DEq pFzk|hh%1d3đI>bNxLLd0# djZ cL ldn# VnV "[),)|gi UY!d[z.K0wmb wW ۴
5,f
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
~C4QE1 (AD ~O Y'IER ( ( ( @Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R( ( Y'V ~OT( Lё\cSSmc\FI
O*PM]UdOcȣ"s]{} W^ o}?fQ^9 >T+Ϸ>U wo/=2+? O*Eu ٮQ^9 >T+Ϸ>U wo/="Eu ]{} k{y)ydW+Ϸ>U G]Ocȣ"s]{} W^ o}?= _{ E G" QpS(ȯ W^ o}?? O*fǑFk? O*ic{
з?`N :w.ⓦVEVGHQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE U~B )%)(AD $(~TQE
(
(9 -W_m %AIk˭<ؿ$<5h2k fO'9/{WQi6.ƨ2
gsɠ W^mEtP `q^]Gb6ɻ 綽{6tNC ÷jQX M``v8un> Qmy5 3O
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ]qҬo~^~jcvJMҟE 3kzцOQSmo~mo~([ߥ[ߥ> fFOQSmo~mo~([ߥ[ߥ> fFOQSmo~aiP6J]ҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6J\QSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ:4 [ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~J *P
h hb?(AD $(~TQE
(
(0|=gscd]&2 ;}*}n+Z74^OZP+k{x#"p9z˱o9 7^{@_cn[wdug5E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((~jOT( ( ( ( ( (ڕ1z}(:㞸@
NQĐ# kB
(
(
*[4Rʅm 3ǵVtІ䑿8J ѢwÒ b
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(9]cXsii*f#=yoW{ k? ͮ)\۞uJz_: W(:YT˹ ]/W{ l _(pil _gU fG<sKgU : W+69=_: W(:YQ.%:GΫ =
͢ywi.Ϋ WS- @F@lt9k ~kJS|fjI͝42mH *{㢉 Uw| < E Un:(n:*Wɹ ɹ TP_&{㢏&{㢭Q@| < E Un:(n:*Wɹ 3OoCV=tj+Oq'AIV=t y7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j otSJ] $ }
ʮQ@ 1 Q#&ԏ9M d ?/@s =Gs =V
M E M EZ*7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j *J!ݝ8V U =^6'ޟ otQe :@| < E Un:(n:*Wɹ ɹ TP_&{㢏&{㢭Q@] $ }
ʬE 1 RU[/O(
~C4QE1 (AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ $*UdZQEj6l>m<:\& VFi|n\ڔ3X;K WC0 4FRη'5 -w #r}*ZЭ"R9QAb=qPGi6"n0+~Pߨ# ?s^&ӭ 5m!@ aUs M hZ;M8 Ԛak[Ʉy'<VOkHU
=OEg
ڮ?* ܶ4+uk- B Y$cc+uu,?
?t\m늓P%`ܦT]ߒY Pcr7R<r>hU#06wǦ+kPm|Qԟjʿݭh[UF U4蠀jlU L4& [+ZIɨD:0$(f6v@* a85%WQ fAw kU*JfOOkkqu3(VێbXx*
~խTKUQ7@ -qK1 Ÿlm2("v2^P6 V</cm%J\3 xQavrr ϭ[uxxqckVZ6`uH%?S@mag$d g5;IGU4=2ʹXPK<:gষ)L( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (5 O Ef֖ !i ?.)@,pI J0Om('>Z{[-t0ۓמ+UMRm]\62?w늧]Vs
Dma8ǭ($b'fd fC(IqUX0:o|S%!XmF她2 N=Ex$X] 8i0F _pkP_ް _zK{V ;WV/+ OX3EEZ:|̍#άdy+0 ~k ~j|H҇Ǝ_U>` *]^ H A}N*q7<mڄg4&ξ~˭ G ~ X.lNi%E,8 zS{!g^f\ g ^ 1HdX+ BxMid3:ƥe Tl.I6Z dr~V#5gOq5Q#1 |sPWw[^ivL>Y'f MI\DXy{]rpF~=*mYO6o,%ڏ\6xl 3ҹKˋ}[}?nHv!fr;~uF&+,F68u=+8V+i3 r1\G Ǡ z *{?U g? Z_쟏UV=tj*ro<`Uss0Q9)
&B\u{mgm38fDWQ}P lD ?Es$b}LI fszR \un?!
X`kq!N Ґ& 5;̀ IqRaNwN3:MIRcos.Lcs88ɨMA/w#MO@ ±}DxF =+ RIvG3 4q$3Kgc snr訪 01qHI\LN70h" KQWSg=wvF"ȩԣU6 (YH%H\魥ˤ BS>N?̂Xm[,$RSm >wn}}iXܩʸ; Ꚛbetz|j14,A[n%R{Pum,u/4IukD1,66?yyK}-"բCr =ހ;}/Z~c nϜ.F ץm$s &є WhC-B(k&%_)X0Fh({'>` *,? D P(
(Z]`Iwqq,`Hȉm
u'ހ:+GDǷǿ9 f^jBȦﵳnNq∭&>Kmf}nbOӡ쮮8y jqӟJSkhĒ#8W0sP[q-6a,"RpedSԅN;u]HivrS̈>z $ey|!s aeɸAFri<qp,41 U^Ĝ`;MG_$] d~ JĺmvQ$ 6Pv%6~i,ks3x
x8cqxO+6g!@ ]Q@e ?_ʭUYTV=ujDz~?έPP<VдA>n~i-RZq^B+i<h< JV=F]ҵg6q ^4v]C`\qgֺ
kR1ܭ:) P3
NJO|8>AX xk~ MfYQY~egs$`qVQmg
*{'U d Z( W?pS@KES(AXt3=m eiEJI3*qh :; Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>% > cSx[Svz ǵp F/j'B
-\+&I )iJZH( ( Y'V $*H( ŐMpLe6 Mj[;:n#U8 "d ZbE cQ1@ O$A5D̪Gg?W9\\ Q^^weMO.cuWQ ǀB.I-[VMaᇂO}K?
8В=p1Y> Vm"e@I;x
4RKV|Npsn c{
@0^N kDY̲ F *"
A q~,A 6EL( G]R5&T""{䌯= }z1I8Q/UmCGU % ZhdN^5Gʓ]qG cSa{ 5nK}OTdvjτdA5D̪@$Q1 % y|KkopRF`=K\lg8+eV ( bu
G} /1}+ӵk-9()
L)F%Ua y/|Eoہ$tE 9Njc5血
UUQ@S'C MָC 'k((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((<-? AZZ "k<
쭀kQB]u Oʧ֩8 OҰ n8
Igw' 3ZV6kUY*I8 WF].$]28z9 'Yc8e9E]$C=!$:qesw =zW*sם +.܌rj6Mn9ݞs罹EIp^)iSOcKΒ}&YfiG'M, <G-FI .~U;U)$67$(،UT܉J]?1]? $ U/| UjOD) AiPR;`@rO 2=b* @ T' ƬBx-Qi%ċA!Fr; M gbr8j['N.o I5* cEh6v}8,ry95R4; 'LK ʲf$ S] >6 ?t
r-H:Ȍ^G+
ij\Zh)BCA'X72G6Q[KI7˺P$X//#yXڋèl yO/?w9:uך6\% +6쑌C
gY(RG`|c:5鵟wֿbZqO¯
(V=uj dz -U[/Oժe : Yt F-k
F,vr> ! N PcV k T'C,n< / pU? G TIszo[{/@|;- { Ցm6<+PJpWoPO ֵͥ& VȤG%ƿ4p̱ES%o˨ˬ5E1V pP$ ?ӌzƉ- $Ww* 93Uจ<k$g~F,[C85cE{PЀ '[:~cXG嫶2O=8*ր8?RҟT-
(;Ks paPҶS-()p.ͷȮxy )vv h:~ -mn0ih֟غ*%aZIX?3sү.`pscҫ_N8p N)xA?ڇrG\ֱiw:d J䁏R;>{ [3Șfp@1ҙcbyv0@ r~M c{QƝۿ8=k +2Fym q 79iE ~Zs@TQE U d /E{'>` * EP+m@[
1ֹ}#Uc-)1 R~k~]nIc )G=FE>g¸df s]
dFK1جrGlֵ jUNu25Ēow/ʙ 皥}& Udm7H@ >6u cn?Y mg =:9Un} !J]^$ˊ1@<SV<A h%s$0'QXaGOuW wqQRH#j퍽BYC+ r# s啥]K-B½Y펞 "3ܳ7pOqbȴ(.忊%͍߁{tEe<z(* 0Z /V{'U dZ
w[B[h TYŲ}ރڽF
r:4X<Sp2pi %"IQO^"'$5 p:wg gwd F00AxR_խe9=5~cI9<ӷ=M' 0zk?_g oz CmnG@ME U[/Oժe : EPT!~ঀ(#(A\g?/:<O 쵵>rQEzgQE QE QE QE QE QE QRIّ0 襧G %,ǰ41Xe$I )L-`( L vQE( ( ( ( ( (vh S=ޠF9?ҹbT]O Vl͉qA [Uhiw 1Mg#OyWUh76^uSUp0=xkU^TnbbxIa~AO3Y!:;3>&֔*NΦ]+
# A5Zz?b &iHҖt$((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( gB Y<L1`)8<\SS3͢_ / yƧ]rfZ_گ Ǘh<G$c6<G6 <? 9%=V6 <? ?_ /.͢_ / yƎIvg.m yƏmWx4rK{9v3k߹ Zs % t}9!c)I- iJ
Jڍ9)]B_W6} C֛ xWYZ? y? f? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? j dz Ώ:x =EO9'ڀ.[/Oժ=R5G8#ڀ.U|
<
EUn<(n<(-Un<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
i{DaO`qP? D TF"F;Tsϵr3*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? K 0Zi]ڣj*Dz~?έU%Yt9 :x -QU|۟
<۟
KU|۟
<
EU<(<(Wι ?ι ? UV=tN6RF"F;PQE B *P
h hb?(A\g?/:<O 쵵>rQEzgQE QE QE QE QE Vv% ڿ&I8 ~EE]:1#&?Lae%jܶHF~OtȞ"dm>Y'&v(x mCjgcg?ҭrAy7f@c8MI#ӿ~P~NŃ!y+yX!N1u)IŦ8)tӎy;<{zgGdYq.k./wȈv`[IcJQnQ;>U*[=4֫sOص
Xt{ڃLn?kR7jTCvK$Q3N*ԏfJxW &(#;zW=C W % m4 Vhϑ?M /B[tQEv aEPEPEPEPEPK=u-
m( HAnO{m P.qǯ_\^4NWFڶ-?zXȮc1lyG$y ӎ#>Xn3zaܬp=8(Frtq+K)8@ROUuؤ{HD.sg<b/KxWyw<5]V]4[%1=;z<K$
D1'$_ʸ*|CIi/4a$YFI Ҹ02jvDɤ(O+OG _/ei 5#GJZAҖ
(
(?IU "GJԌu֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhSrhwLw-ր E3-іhS2ޟoOր E3-іhS2ޟoOր E3-іhSrhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swsw~ૻR
h hb?(A\g?/:<O 쵵>rQEzgQE QE QE QE QE QE6W_ $IӍߝQei
1T*q["I=ٸ|C0 ҳm.m%i}pAj*qZX e-FObm2
Z|c*ƢN/VT3NW!~A ˝R3ěV}o{<k%Xciȥ.ʛݰ``(%($( ( ( ( ( 7m:SF(/;38ҙޝEGؿO618g>IN\ e?ΐ QE\i;"%VR݅QVd F/k2 MEO#- K^IQ@Q@ ~OUX?IUQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@J $Ԛι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
ë
gs@f+
-QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<) ($$(A-MViʱ('$RhZ*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z>J7\ V( kp[BgpͻhϷ5Kg ? ֪ީ:Z6wW ϟD h "4 ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\,~5RMjU{}~C4w, CQ(J?.5#/(,*?pUE(A\g?/:5 #*oٻ< ڵҚlƺn
# _ / yƽ i Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi ȭ= B1Raj _v[^$ŵ9;j*TԺt䤴;qҖt0B((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /| Uj 0Z+?P=ڤ,M<\ hQ\ 1 % /LLFfE.Xf7VZL˸&~m,QEUKi.dG̸̱<@wl+f(pL}qO5, U(u 43f6'=8Dڎm'qqn9"h5})V㷭*jd#f8 H{ ТYk120\xۚ/ [ ԢtD6PREb{Ҵ( ߇uV=tjYDz?έ[/O(
(
(3)w!UFI< s@?o 4mo ShN<YT7#ȩ@ EU-GCK,AwXz M KEf l _:
w ̋ߑހ4h`<iE20Uۃ ]ShRg14#te "&ih
_쟏_ d /@ ( (- Ussnи ܨ4\]hpk=ٺƀ,QEUX<3@8"y;Qf>u<RA<W0
92J .!kQת# _J hFO ]ۢ'\ِ/'1 4rw'ksGV8@ /| UkV>` *ڀ<)I+ޝMO)-QE1Q@UKU]*CA[̭EO "w uI 2`lez*u'LMr:RG^tI3.r cߥ.e9YJ(&b#Hg
8*n >
9%)QWFm) 7Ufeda&@AOA)'9Z# fj?7Gf >
|JVVF(SJBS? fS m\ x_Q^yP
T!Z((AD ?IRc-QE( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇JZAҖAEPEP?
U` Y'VFQE QE QE &ik<MmVS{
9.1%{\gHȸ??rGR VoTྑvRATZ+ S3 {+3X^%v mbqM=H~?֓*J=2")eXUw73N2~nIuin5`ۅps@ 8# ˬ. uTMeeC;_OZ ?-\DF )~=KZYEoq#K"ؒI<Oaj@Q@Q@Q@W j!]N[=&9cT 4h1GE2 GؠYBA|;+3G MOT]Ynlw`#6ڇ jO\a mh2.eaOy5bИlI@ fj)fi* 'JeXZL~y`rZ'G VHU'8X0 NKNnV>[g +7,,k&zFIhQ@Q@Q@Q@BT[2 *|Kǽ;0Eai^!dаhp i5`"iSA$S~o =
Mp cֱn4ɗSZ)u v v@ m B*;(c-tU1屰g v n7k@U ܧPJz
ri,:%ΦEC1o\8.[\&`^I2,zP{MޞԸD[d{d]<H,A$ u{RC;Ak4` }뤰Ӭ6qր4jI^`^<oQn;oC1TFGQԛV/]|ݕ`cڀ;j+dMJ6RUWg?w] QE QE QE Q\u[6mH7Ơv
aczn]P@#cyޫzcQnGP 6+gXkxgViP3Fp3 *ZI3M<dڤV )<\Uݴ0Jp?%i BsVlԒybEأ(B5pdPpCYzg,e:CC ?JZhtLy$m6GӸ zCp6nqθ(WHK
v:#'B[^=I' V# +}pݖ m vRb]Gn3бvcIat6ok=G%k
qPU,C`" {JfK1I䟔ֶ
vS`j y-0l.Ǡ̵ 6"ԇi<9?7kCSJSqs1
3ܝ(Bp1Zֵe @i_P6ɒf'8bD2%8$$ctW!]H,N\}u QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QEV_U>` *@UK; kvTP:Ε>~SQ ֺx?ڗk8 X6mĥCwRHvZ,QäGQ
p=HhR=zM
y[]CG"C}+S d
!3z mzMe"v_1a6&q5k&e2yw
ǭuz_Y8 fi70^xPu?*W< Pno8k{BUCW7wg%Ʋl>czW[ݘ䲱8un
3cvZGm"_o<F2Y : `+iȖ$-H_{cZ>-"K $ZWq̛ >%.b:m-ЉcF !W ֓]b*9 FXcd>v3@<8-gZnKiS* K[a'ۡϓv3. DIs9X%l+Ubdxz5J!T} timE19h;-qܛUW N! & ]oN{ }/_ m6)cɸZ,1/ rdɯN;US`:4/HZJ *{?U g? Z_쟏UV=tj*! cy}paXynw#4i<o TUWi|;q
ƜOo'9$nGOK<
:(u \d MeiV7),H6
Aa1
u \d M hlir[C?sZy&D}+LHݷi8@YW }I ,2yinsbIB2=]7Loܣ d;Ě51\|ژ<c#Zoc;]s j} -B@ r p:-Έz-ީ{m&[1e0HsֻqS7-l-# 'q ۀOJƲҴ4ӠFўIPw
~r@9=kբ Cu!U`xqJ uh
X2HSXG zסBI"F(0Fy:W)S,%ʰaH9˷ ƶ<?ac}89ZޡhS$]ܶdEbEFx Nk{7ZN 0C 2GzV.i]r#^}sIj%bU /#@%Ƥds
?
\vF)c*' +7yk MTrvQ@l? D Qe :% ?_ʀ-QE6^D6q'L!/Zi4XX$ϻ t~
G7{6y[T,u_p[9[dR k6ԕcDGmL tHhk=n[Ҫk6Wm Ф7P IlO #uz?))Bd\xs9H ey>?rfʲJ|`S<99@OX8Up37J^K@~܂@id/%张@2%SAm5t^ ]P~lr,1JdD/IX=Ÿ%c'G&ѢWAk,b
IԚ F{{vhfs2##
?ͯu[KTT9< ':O+ŷ3IG ]tcZxH-gZʅ}gLz{Yp2kWPgm;K,W ۂqmn:}+j{m F~ l]QZ8_ӚΟjn96N(e2ɥ'8i[-??#}+ax/*#ҳ/z. <E섨
wQE U>` *ګK 0Y@ tSE:x) _Z~؟m S1>m,\!}nGvJ5O읱ht\Ρ76+*54S*{ *m.Ϝ}̌vuukyԡ trzj4kHDN6*Gh>ȏ,̨$o`ӎsךοUK5R@'0eW:ejǩαÆfݻ g=kMخWiHwoҰfXQ'hiӸN[=z۴s0~» *̓E[UuP6$YOao¨ 2*})[-`.hLA,W`J *pA`{3~q<+ڌlg V.Z[YI G˩ `wG?9:<L
Ɍ9 yl8hSזXd$)8[n$}4k&s g<=( <~l v< sIpH kIS@E nJ +C50쮮1|8JEY$y݅zo ڼS m\ X_Q^yP
T!Z((AD $(~TQE
(
(
(
(
(
(
)3Y:EڄK0PRVAO kIREPEPEPEPEPEPEPEPEPKkOeg*2K8N?_\~~A;=kV4Y cvNx V Yfq ssU?1 _ X_) vx߆8_NIo
gn-E_ 9
iW]
=ͻѢLcAg|=~=ŝ4sK?F2 O!loee[ipַ-/-: VYA)|>rZ5_#rDZuW( .ԷzK~ # )iJZQ@Q@ $*UdZQE QE QE4mD;@ZAcX,jW_kksc#=).HK|>B:} İt|# " эQIa;(PK G o CjOaxWwWZ\b7
~$s闺żp\y+[ \g^p8w]hmC8\<:c<XUbUc$(~&69 *[x0$rp۲kԣZã!% G.IMmOH*%lMɎo{fIf%3 p~8M6Ff)ILwf( RGhcu4u lY,2%1wsOmbr '澹ecc.$I68=8t'ҢvH rmPEPEPEPL
IYf8M y uI h_^eɡVzk+%4Ef8ڭ[⪠j`ub]k
;[iʡ
95{'K:b|ԟBsJҬ^؉|ұVvaUH<?jw˩ M(< Q#P /-H8GB>}m@n.h v>w5ݲɧj"Dph:.?O'x/ 2/ g 3YƓi5kNH`qc>FY=OOtjΪ8e QWKkwo{ڸxۡ Um4 uXIUG<Aimj\Ʃ6s@h ( ( ( ZiyY *d/>ƶW ϗG6aUѭey
Z,mfVT֞?Sׁ]LG#(A%ޅ]2͌}=+[%mVI
V7v_ $ /fYG#R2dϲе]09%e
*PEVHIJfMZ=<Yyˁ5R\V +!=F)Pc _ CKY_i=ŹذX``t84 %O]\f`;`F0o7
w(ZHY]ɕ3N $c~t1w!яMw P4<~Ux=`)gPp}Z/$ʓa>mGU~dol p1zM IӮ,>=d#ȡp{c]i K
]t Vn.4ȨuUNxJN 81#K`* ĹVxe'z8Xݏ8?_:V/'Kˠor2N9Wnmumv1KgjNX VLv_*XSJA 2 ?gNN
*+ M4(V p;Zլ[{QX j bȮ85@Q@Q@Q@kEu]*cI;W~J4eƍ"iKlӎ{Z)#'7+RK?}\=jGߤv
I7K<u66(PF x+USoD|leq۶!q\ G4F0L=ww{hN$4+s^=t2FIl'U5dRBxZSHu߯9-=i&9_-+QR2#֬e V@< Cg^Ykb%IJJ?ʄƻ+ `0Hi ڰՠӍ{%y>wb'v;PimF-SR?(ns0kY v/ZiZiDP! ܞ5a _n-CCn P4]X呲e_,tAjJ]ޥ:{zۄ K-rWQ+8 v ~uв#!*FAx?ZZv]jh8$U;lb{xmY 1\@@ Ikϧ %XzdP ]i%W7 Z#bG Am<p k&aIۉ\ {Voa Ƹ,s [ӮRn P1y1,[71 sӚHj5U FIaI%2Pq\W L GOϥ bi݃vr3[0 [o1\LUc05Ph: s̓'F ?^^QX=&>D!ߏJz ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /| Uj 0 Z( KI|6vc } S/t8u=Anu`=C }x[P&|; FRt#4;Sbuuo@BZ3먠wPКK2kt~n9 U ڛkxe$c玙YE ro˻!L4u<T kL_h E[c 19'zbZ(o Vy[vͽ,AぎxoRl
MwF!Ej(sZo5{yV1jܩwd U@ m/b!n0zGNih dz έU[e :Ul? @1KE `i}ap:`Y#;~nOb{Hzˆ[ -%u`>rMoNCOK<݉gs55&k`v>*Qm
6
*dq SuoWN`6K2zb( } K}.͠y|$vn2+5\
: br+1J-$gw;}OUJ+l3!Mǜgگ@ |gk+Le0e:cOl//ځs qIpZ<W]E sZ5͔%.]ܰfu 'N ў[/cI2[F܁3~Q@ <& [Xr+m/m#1}`M}:֝ QEV=tK 0_쟏_Q@ .!OmqlYxm3 iNGһZw>"$İ8b;:q^F)hn^ mCR[y-ؼE2IvҢvo$dI|zgi;ka<?s-KnDBxN=+C[[V%fB1
z(4)[6y[ۜy$f'o4yZPGbtP/qƹ5 F>psU ;ҵyWu1sGvtP+O ꚓ\(D嗦Jj
^dY#
G$:k8En? l<9}\qo~LPȋ* ǥuPEPY= UIE:tSG e<QkGX˙ܿ߾#T')?hw r[~7zN[6ڱX]Ne;U
;(
-VY s*)D 54Al/<jZr,O 1 IӋwcUVFZqkj~Y*wm<@\,gngkrCι):Q{%e4{d&hP a!^ƫ鹻@rqӐ>E
Aԓ:<M m u ˊ#41VC`6G\> -]m4a۸>?ʪElFM+<- + u Cj(L(@*?pUE(AD $(~TQE
(
(
(
(
(
{9uD$}q[.`[y-߁"@ ppwFk
D8P B@ɭ+CXB .okܶ5F p w:"ڙ!`n|ܿ_닉ZOCOq?\ δ
ψ Yqc_ZXcXccݺ^~ߪZ/Lv >7vKX*/ T{+((((((((&g1St@HmALgQh2]Hol\=}ǽbwZ6o(g+}4 uXL!b<)3\kdF@ sJ?Tl1|=sD͛ƒY}LP]`CCs1L.ɂUI e_9/-$c'*yZ4mic)`.T،umPj~IٰƸ>>kM,N"ɍIO5pLv
?[֯[H1 =]k p>D>E T?[u=As@-P((~jOT( JZ&:[|e~m cך ϟD j$FRtWx "4x "4 u.{D TV"> o U` v "4v "47DŽ>~ 8$XP p ȟ ȟ/g Ey'| ' cG'| ' cGaxw= > > K{xw=O OƏO OƏe.:+?<? ??<? ?=s< ϟD h ϟD hR Xs_C"k3e]ݑ +id)D r A(/F 8? OoXZ9b1P ]QE QE QE QE QE QE QE QE R@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@&2/-/SM}0 ~U D<= > UNV34 Nҷ//;sOiE!Q@Q@Q@Q@&)h(Ǎ%C 2iP'u;I\{cp: ֡ T/]R/&/SM[ ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( p^9r\>mժ(m U(m U(m U(m U(m U(m U(m U(m U(m U(m 𨥕.Sɇ- WE*['6Wi888"@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m !FK7`tPTn.+0N@V
mhm Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj β ; Or}*PXϦ
@lpñKzb
) o_ZlQOoxNz`QG`;֍^F [}g_Z7{}my}h`Q>xNz`QG`;֍^F [}g_Z7{}my}h}my#K ɯ]l ($$jVUk9mJEU~B )%)(AD $(~TQE
(
(
(
(
(
(
(
( QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((V7PUW \4?MH_Z73 w4f H]E;tW } <?M gd8E/F<? > T1 ߳Ch9pqa1 Ͽ> Un Cc Ͽ> U x} w w4} g={_x} c [f w4s> c G# } 4?M fg # } ? V١h4?M ϸ{80 Q LJ *~SG١h}DZ LJ *F<? > Uh>SG3 =MH\Q#;&7VHc2:*_Cn$ě֍L4?M f1֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳC0IF} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F fGR8S} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳC) fGR8@w֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zdu#~U7١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?MBdu#~Tgzѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} CS
|ƑQ>~ঀ(#(AD ~OHA2>:Rc-M() )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@.Է]Ҡ "lt ҖtQE QE ?jЬ աR0QUpOPUU{W j ?Ɲ*^Ċ < EVkkycg
(@ (un
j 2iyk IpS3hđ$A$lH } UK{k-qn_[+ Rֿ ۱t
*9$H2HB{VFj>z n(# ]'T *
(
(
(
(
(
(
(4 QE QE QE QEcTqo$cvc4ECt 1wlzdf
ztY3 @QE QE QE QE QE QE QE OP[_QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QEUA%˄Rp3P) NC vhhRhdv 3! y\ )8 4QE QE QE QE QE QE QE *t @E QEU'1<jèf : ER /Ƨx'dTj)3Q3#r KERMFYDL+ڭI"D$
} P%4xxR[][0u2=h -Y.pdOY*v/$p8fy
EPEajZ}VV 0v15$fIUQOj MBw@Q_mEP z?O@Q@Q@Q@Q@ 0Nb j-?~b hQ/q Sz պ (EUQe`nIQdVw[w9+hWi <go|U (=jv֡MÄp3(
(["C+y8Pz XBTd
+i1 g;*-?BIE P袰kRi",g;q(vX4ȃ;} ֫W_ w(
(
(
(
?OPGO 袊 ( ( (qp- 5B Y{g r0bA*;+qP*9$HTOVMJ(R_-
E Z ( ( ( K~ ΫX R߇M-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0/Vun6y9BJ+ _ f(S@ ΟL/norvN{=AH`Uh%K_ <{nxpMq44b'4u[kovmD85[_[qFXtՆ60-.㎹ oǯ?iϢ˨3t @m ր5luktPm22[cԬpp,MMjj`qLgmld DijEN FNct5VVգ e d7hhW
uOp喋\~% # mqI
phl'Ӛc% ZSP~nvs eBU]{gh|=
$/p<8 vIҼP' λ-*'Q $3UtFr,co TzmaX'o [\7?/m F@5HUd`*䃟4^9m?Z|?aԢR)SkDf6 =Aq ˏ wTQE A ??ʧ# ]'T QE QE QE QE QE QE W ⫛soy^=秥vx[} e Ʊ43K$ > 3[Z}ů'i Ī= (Ew觐W^qЏ Q] .D0ݲ=: : <Ey_qޫce`H2A Q\<vW銑YUa6?*ͅyH'A> vw1_j j)RxhU`zpkgm\i
yC?z*Q W ʻ
<Y$o
r tQ@ZdPHHWApq\=k&{)`9灑wz|* @>Y ' kb(0I
1rRQE QE QE QE QE QE QE OP[_QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE p4=DC oTSDu*~ o ]ŌJ R0k#Soo)8cX w%ޖ38 v<
.!Pݫ1U;Ic (U<GH*@\@- gs kH +ol\Nt4 vjVv)i3I1`suRdK_W/+2h[uj'j
O*;-^[ɗ;H iC,bbB 6 N:[d.U@8=((((((((((((((((((# ]'T *
(
(
(
(
(
(1n`8yo',E?ɮۼ2)n<FHOc< Gavb&o8 I;hxQ'&
ͨ#+81VDžUyvʳ.'do*o zX_JA8cװY>I{8ʞ#]5e1x d1ڀ,X:f"v OJMwʶm }u QE QE QE QE QE QE T z? OEP^uE'Õ;N0|xx^
:י
W0T$_$ q]'xs'qƄZëw)~ohVڛ# ?>ម8@Ea^WͷV?/_9lV |G g#*[j/>ݓ8 j K{ [82A'ɫ%Ԓ;1i d ul`A)8 Sa qg{O
T/Q[6$,9Or9ǯ`8rJ͆f`qmo b`3l 1lީ8P9DQGr_Ѵ;: Yd.B9 c^բfقX}* o ő\ ҚfD^ ,÷ dXJoj3$C, cu{ u0$
HEKkLWQ<8?m>vQ[ O' xjt摃O֦P?\@.Ag ߨ%& 2 dO mp #}Vّ t$1ah?aԢR)Sk~\k(# ]'T *
(
(
(
(9YD#RH: 5 d 8OZW̅'p,|@<e1 mYUO ~sNέlh</gc]g? C
4D].%'vKMID[6c87)-s}Ze22^~<S-i沷TQpj ص4հyH`=p>Y_]G?ۢ Lb˂v#~UGmn&B ߕq6 ʵ) G pv9n bpG;WMxPE,* G`l-`
H8IJ6>;C'9\:?J Qie-Nd ʲ䑯v
r @=}W4]JK~S KUKCݑ ]m[>[o+&`pjw UR \uy:` -m봹8U0 0U .&4d\;U}BMeZ4YC~.0NG^OztfW<= ]W$w(CP*y6WY.V%Ιre7` 9? 9 "&N h 2+?Ooφ?{ RNIs+c
_C\/?] c20_p8 H ,`H~x V ;>a>-AV PQ@Q@Q@Q@A ??ʧ# ]'PQE QE QE ͬ m#B!ڙJA5S h YJ BO^ ^Koy<2P,p`;%Ŭ:|#WWwǭe `bIR aA9HK)-_g1# M4N^L @kP ;.aZ^$[ ok^U]`,(6=z.RT8.#Dq$0y ktkR>`?^l"NP"'b(((.Է?pU-:E(AD $(~TQE
(
(!xg]:Ƞ*A(xbeI]QC >ֹ 5 V] ]e8QCqEH?ʳ5kɷ u3XDOjO<j9 ه@ 1t$5@u ?_OIӒuCfj
IӮ4fg`rN}M uQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OP\ oc- KT ( ( աY =Ba\iځUQ4:=k8mKW\" aU@ >䚒 }{I+on Wa(9̍ihsYV=]
Ţ]C$
W<'=EtRi֓G S&AQ@ U5Kɬ80pv[ZLi R}>b t=R <d?{ Z>uV<d`:`
([wcY]6od 63֝5ͽu~ 8 B5 wW!\z
vp (ܞ=6i.خ0AMuPEP z?O@Q@Q@Q@Q@Q@Q@bk7_wg8 E P,"-Z^3ʷp}k:C-%ΆNnҧ (;{y lo#9ۃx3N<d(s;kVZw p9+{d#mR}O_{Po
b("T W#}UN kk22 2N\±@ !%l ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( <9ޡ&bns+CUSle;+R 3f >w^Z[4M8 D%WA9 }5,kyϦ2k0M=BE3/qk/s;z$qںj( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((I,/R;4Y^=@ }@ u2n9|xr{m<py8a+~ moΣwN
D qӏƫ/omkx¾3s쨠FݼOm[oTP3
(((((((t S z("NzgↃ$ȶbvN
wTPXjbl|ϟca^ [Z5Y"G_ʧO=k9->f_Jxon}+7LOZڈmP' Ԋh(CϫTɭ?s`ۣ; A`EE sAo)ǘ77^H?+6WyXa>T}2IP&Ks- d="흮
I
1v WcE rKZC8
螟Vl-WMF(4-YT } ] qC2G Ը9k
OK@KG$?]A \Q@ F{{,,R Ǩ ܚE r~ olnf= YE QE *t SEPEPEPEP+麞v/*ݞrr9+ iEEW8@z
ɣJ5E2#~njvwJ,
h>
Q5uŻ-zsIn-dh ':(;IH#J=EaZXkXI
+8Eӵ+ۆ+dėl3>U|yS(2
H5ԕ:_^ΐi:g=M9=sҊ 䆛^4[@dc?5~9 +1ҴenOSX^jV[y)dWcE sF}3VtM:v vN: zֽ\˦FϤ U1N pkCDOH'_$>կE RPky{؊
<WF[2F~@9O= ;7p }j 0#
( ( ( ( ( # ]'T * ((($.||dRy5@ ]x3=ۅ
p~ ֬E^ۭޚ)fFx$?P5;{xVg"L=֦.<q)fdkF ҴQ.oA|UUP0 )PEPEPEP?[u^ *?W
h hb?(AD $(~TQE
(
(9? ʐ$|,!8=QK ޱamh{ kh}l) IeYXdG<<zvV# 7~[UmDz10qgemo4ĘyN\}?
h"nF"(j<Gʼ%Њn O5ulAsܞs xaX Qx ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇JZAҖAEPEP1 =BCo0 {5#'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGah t S41+< bL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=Am Gaj(f"
}hahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4 GOM؞1R ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'# ]'Q&JO T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4 GOM؞1R ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'# ]'Q&JO T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
?[u^ )MUNI!Z((AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QEX(i Y"j #""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥+,Q Hc jO"/Oք Z K@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-Qmf?Y T yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@(̎p1'B¥?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?ZbGVj$ Z D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE VX2::ԞD^
""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""j53# cYk yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@5 ƒ *Y 5EE(AI #ږ?IRc,o_Z7:@7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7z :P\ oc- KT ( ( IUڑQ@Q@ aoߞj ? ZX so { G 1 ǿLi q~ciIG
\FA8 h 1 ǿo { Yvwl>1"i6y @? Q Lde,7"aci Wm[r.@>h 1 ǿo { Y Ǘk88 M1=sZ5h k((k-D_h C>̘l8pF}zio n?PC|͎W t4U;iʻ9{T+mL'WA@U;=Bk&F#8nu}:O&y@~q iQQCq p{u(Iy9pqEV4g\R2rO#: H
8'Ҁ'KYK[ I0' GoJDYX@ fLmӃU / _ .YKڮq8 Z / _ u ϗ7oąl\ y3hZ4ÄAw)~9
K k58u8L yMv @ Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Ej(?- KE]^:mym 7+Y 3PEpp20A $w.no'dR|dGE`X]A6~C|n2=1U`S%kYm0#4\(m3RڝE. $AF _Ҁ:+?Kв[ n
( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
)H!BTd@^ҤF O @ȫ֖s B۞J EfuԾD 2MwYبkn9$&.QT;@u ū#-g'=?
+*#afK1&Yn(z4EPEPEPEPEPEPEPEPI
OT QYiM: ;W>d\EYڛ<eFw @ Uj[Gbw_I6O JXԵ),ؠV+TeGԊfq5֜1w,ܟ lQ\MjAi7,K7z6 S?
)f<Mrϫ [ s_hrY2y\lv098 qU=qlZ 13YESZ+.~ΟdӠڹ@tW)7ޟl/H` olWI R[-v |'K-RYQ 5EahA{ۭ[f}:m$ h\sxO_+GE#Xt4Ec^kG= 0v}~,:彡kΫ1@ UNnll eW=mkq` U滷8})y<z}kRO@]I >\4"nGm_̹!.Iǭ uTV.{srAvCI,: ڠ((((OT%( IW) $]5yU[ SJ:: (bd~ iy;/ f:tAU
OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq,Hʡz;*^AERQ^ek֝)eUu=I <Wuj< }
SfmO;E$זQcP"4l" 6
JVvr8>*FQE E?STPM-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(({_ ?/\tZ Jh[K-+3P >uKr#D~Q4G *)(w q9
|1O4Uq!ID7?QX1j6`e|jNm3}}?T
Mx/*c&i ^cg"l?zlڳsV (Smyoƀ6.meY7m\jrQN&m8 aEo[t4 QE QE¥k- bLOQ B:x G[I-Y Gl m ymaq@hA&>j `L Κg܀ c mQٷ NsHu6wٷ Ns@1n<xE
XA>5ӮSmG~w&szU{i >Lr *@Lz}d,Uemqu eg *_q=6rS729OcߧQT '_m?g1Ǧzu Vwo9q}j)K`{ի"}=t%1 Ϯy^~QFySU:9cvau 1<_*HUN߅jFn`[q@ 5VK{|cv Vi!hd1z ݮcAHE; Q{hmbL c@}:E;KJ,0faƣOԭ_n4uc} ϵ sxC^ 5quxC^ 5 vtQE QE QE QE QE QE QE QE QE QE ꖥ T-U{vb랟ZCK7SGwm)xGqm>M)>|\rjڊ7.d .$S\A⤽ҤS&!N<IX>
*O :?^*杦Id<0=UGy&.|1)p j @ < #]Vn'9Xڽ!>c7gYw֖mܟ }(iǀұ L] Akm[CPc QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-dkrZ ̌@
IZ[}irgU{4$KxWn `Xs r*ƥOs7*Ð{?.{y3u <
Jc>e4<<cq@I QZEs9)QߏNE2bU8r?zt{]JΑ ϩMyI-п>0N2{ zi$ +Hp;S{UH?k??[6z\]ټ `( lKsߞTNM$БZ$& +˰UtdS!A$ Cws" NΎ3B nYF~A?\S袀
(
(
(
(
(
(
("OT¥
SmOr@D+a f<k_UӎnO,N3 c?:j- |
Gm"F_ɀbGeciFj֕XSE9q ת/u Υq?qqS@S _
O䋽3Ωi?֢~su9m'L[[`!-ܚbv7Ze3sߎ3քM=ޛp`i~ Vt0Y4K!iyw?P!64SGynTs;ìI??ʶ:- n1JrS]2 [Fv [yeM gU{XӉ,7rC S~m ^pI[e H:c kY
Aqׂ}뫵-j s4Ho؊ p[L~|
nn$[++ d#Zw[]ݙ-Џ. @O EPF NuncE8|yzWn@>4wd{6Ѡ
:n?*M nDօ?i;|+Gej,Զ3P)ijI-Lm@HǟҴ<4Ug<tkFu.c.}3ZZn|l7$w=I ,tg} Kaj:E5u'8 ?Rh˧nɓyvc෯=i Xz 8
*%u 2Jߎ9/Z.mqR,QGn)!cC+yf Rێ|˞D SBG#<u-qy.3t ջI'Xh&( d GfK5䷐^S3a:t6y _{e\i-tgY'ig(W c^;uD;
4 [Kq:[;gֺjt$zҠ((((OT%( G_uA t{ d+7VխSqpy: DbͤxP\yGn#SksrrO
@+߆Ư ;
?w-uam + q \U]
=Y5ݽ qjngՊ# (~륬٢
(kڛ{XuS+g=Ouhhi`$?o N#\|Oz k:gKKT+ ,c7w ZDBy{ ku/ I$ߕe=pk״VV6ٔSiEQYQ@O(~g T?pS@KES(AD $(~TQE
(
(9-S^"3[EPyzۆ#T ?Cޱ4J6[;Q2y,9+VRRԑb)si\ZG ,
AI.ieԭcўGMR-Z0 , q֢uPjݜe xꚤzt
|$8E =e9O?ʇ9%l>E*;dnF.98t=Z[ (1|u4 QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((
?Ү% WjFQE QE cj^W uǭcd _ʊ u /?yƻ*(?<GV < 쨠7& y4d _ʊ o <GN < 쨠 m"n (((k-D_h ( ( ( ( ( <zs2 < q*# Ǘkih ?<G# ǗkӨ1 {X u. y9?oPEPEPEPEPEPEPEPEPEPEPQAjZK@E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@C%2Ȓȁ?OlPEPEPEPEPEPEPEPEPEPEPEPI
OT QE QE QE QE QE QE QE QE QE QE Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@D_j$ Z KEP\ wJ^V"p IT1mH YZa |5,<^ ,o/ؼ_ ?~_jvʨ m?/ Q˦h).*cRhG@P t ٚ|ve sZtAER<W{^#J ?" k9ȴ,9? J,̠\K˭WJխMVڼ8 @' "WToR:$r3BpWJ1 <qRQEH( T?pT j )%)(AD $(~TQE
(
(0|?gscd]&2A vVPgso*mIX9=i Mp᱐:}kn Դ ]C ֠ O(&>5Q@zF-sv&9b;{VPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? F:RB
(
(+| JT>ϥ]QE QE QE QE QE QE QE QE QE QE¥lh ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( T-E =Z(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
("OTU- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥l h ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRIOT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
O~ ʀ%( (h( ( ( ( ( ( () 5E, Z((AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@U6?W>SUc {VH~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch du#Tft S?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ 2y /١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55M!GSI ??ʧ~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP1 Hcrt @ h>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@p1 w4 z w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w5
CԎ1W* I T f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME S"0xCX R߇M-QLG(AI&GJZ Y'IQSvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{.'=?Y.Է1ҖtQE QE ?jЬ աR0( (7P>߿=co$? Q a I 0 ǿC L?Ql_ pQyWPN=? 0 ǿC L?cYڛeݰ"$T4Ig<t i C L? { XK
ȶrGpzU}܋cP8 ϧZ 0 ǿC L?f dj _
;]?P~ fwsaZU{[ t QE QE *t SE`iL;#oQ85u}kd> rI4rFC6.|3V6Ab?. c>QU`On O,Lb?<PR{KxVi ANOwJ<n: g~EVκpdZkiײy6@Ads@QUHm (U/-y-$@\ USZdh9w4
>9
J+Ai3;9Y
Ĝ8 ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袹Fk).2BQހ::+2Xӯ%- g3Yk(6_ _j b\R.bl~St]8F 9 lQU: 2?%f[Wޠ$g@h .y.eɇ~SޠgK5)YID\U8:KEsZ6u}s炊vZ (mWSJC6SNLiػƀ5袸kZy6I V Z (ӬtrBzd\EZ<eF1ߟ테W-嬀u
*+է7Vv2m1bN j[[=Z9/ @yE <Ld ֬Xj[]۹e94ErVIumqxU6z Yk}@ WA(ƽ=)*]b0W z5 $ pЎ(B((((((((((((((((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袙$$!UFI=V2kLp 8#vё.d_%sך Ee:mD 2OyY(7RrI ]5BRd GQ?nn Z29r~_ȰHno$ 3 iޙu(s@
Z(
(
(
(
(
(
(
( t S z (b&\5qejo{ ~:+ծ$'
2I- xZqq]I}5-JK+y%bFT}Hh7i5r˴چ}4s}dwaԣk[ *cd@TQ\~]<h+ O vU;eg%2?Z v{1 Wzc @ڀ:+3ImB.\aCcE7X:uN.HTO [4ErS niPK"*0?cKedc4bl[iG)n `]@hfkCQeȊ 8$ilu3H& F:\\\qhU8W[{;[vXw oQXWI=݁Z n?jͻMsO{!\B qE uW7j"Y$ۂyې?ɩ@\)_k)P@ mVkky#gҝ9?G^alrz* yA@sW?ic&0@z5٠Gڀ($ n{ H oEPEPEPEPPGO I T=Q@! )k.TI*Wu>t__Ώ:/\x7J*w!W =ի=
P[=&mN }c2~ug&LaYXZ5oo 108{
ztRUt QZUc÷:,q m *@kh(C_;[V+ Nz+uk]^\ OU>ęIQM<V4DAMyU5+V1#F'|n
*(ZFZU
˜f0( -:bK~ Ϋ4QE1 (AD $(~TQE
(
(
(
(
(
(
(h]\T3 KE %`:8 IEEXX:r*Z ( ()1:ӃqREPEPEPEPEPEPEr%{]'Il}'9PsEr6fǸ ?ʰu-->Av$ 2IM-3G":H<Ub/*F1d= ߎޟ vTW
6&<7*V۵V zKˑ?( R߇ -: t )jQE QE C }ڴ+>? hT( ( C ,?_ҹ<C ,?_ҹ nV>Rf==+yffT4ϧ]Aܴ(_u
c"ʲJJ s}(5S6
! g5\HRDQ.OV Z<"Y_ ڟSkdp _O U C$^%ʸ| '6qZG5ޛ'Ķ啻~?sJ/AlA ['
{Yn&DyDMWxڹzܸmӼ C0CXtx{[ t{[ t QE QE *t S; ֳtu(hA =GXiZm_q #es6p2Gn gQU-onlb$v"ә5#+ _noةW }M V6֒>E vFj̺})㵱X;`N1縭tH#ع-UD/ZgsznU@$v Nh' իg]Du5QݼtF[Mt9>7lߏ=8 #7"-UK}NK ɁǑ[7z;m綛ʞBA cUЮtl
Q:O\։ ! Kը,x7 P.;s PG]\ |m >]S<1io Fs1^ӴoM,qʸ;9s ւNq4W_Һ:Ӵ wd/n ( ( ( ( ( ( ( ( ( ( ( -ԯzJ?'[U;r)F!9gB C
(#Y8 :H)2$ q/$?V߳A^:T7dm7B " np8ۏʠʹ
졜W'1 54cP}&7 u{E,L-0*0G^o_[CCi\~|`ҴɞDc n454|YsԚ4Yn` NI`6NJ t}-~P#OZm`[kxפjV k ُ{ Ҵh?9 -t_\^1|Oknv#3? M{ s6F|9 x~ ך?:8ޥsu}Zo߳?61ԓӚ \ϊ v_խmg43O$"rsr];N`pz1zU䀉?ޟqMĎcfR&GNKJ6摗%ր(0ԵۏY< mZ-$4hbF eWn,.KUdH&U}
oǾi0b\n#ׯ Vv}9 Gֽ3Gym1x7c qQԧCЪiUycY2ʧN3OR麛p<3B̪;Nyo1n2imm;]Jg7_,JPC0?`N 7nG.L )&joifgL x4 'ipO!S . *"6Q^lJ5[k[00?Ͻ X( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((t S z$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ= [Dx_
'֨jVS)%q( PV\ġ%E
T`' i֨>!y&P =eѮ]JΑ qSRKt/f0O
WȐxH V0p8?TN ճgIѿ>6aDzFĽO7?l,~}@D oБ?iF eG{
6
o%Q?֠ƻuG(PO?7,#?* ⥢ ( ( ( ( ( ( ( ?OPGO[@$Ny0ԵۏY< WN:ۉ<q;wg㨪#IRo
GkX"F_0 T)~L0;5zI7E4C9j:=Gu\y `g $ t *Su"FLp#Zeu߂Nq4Z
rNB6),zWZKc0== Ϥ\-i CKԨe'ךiŤY ~w<~Ҁ#Y}x FxA eM]5ewc qL@E9\\ژlȵ?)p?ַuF{U/~>lgLɏEԢE=ET` P!-"bm| WaRb+p8S x'8'Gq1N1sEWm7n=
ӪWlbEWZ5R$pUy2ْ1 q؟ ]tʪF @ )-WY8X۷zWvYϧR#ٳ ҴT.>arܐ:/ ӴmCPIp tQ*p^͓gwjmKK|ҮS$pz
5fS/L|n]e;O5o^ڡIw ZԹ71gp!G| cV6\I [;pze% 1ɪͣjwk @? qmaf 䏹 QyЉ&xrk~Fc/ooUyu" RΎ3Aܖ
fBz䧿G[1*A`yc+x%vbṃ8qpy @ nDobry4Axyzօ9neH_6<ueA^)[{@qu>z4t3
Jd AZcgyl7Mpp
: ( ( ( ( * I U=A ??ʀ'( ?vA t{ l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆R qr s*ރ߱5֥C~GC»-OA Ϳ\Ւ]@.m_|mjs ?/]=fQEt]^\uaO# ?ouֽyⷉ" k5j^#P9b{DZׯ<E:ZZ,doqi Xr?ƼWSȀ8 U`zװZj.m={4#QYQE AsU\ ox~ঀ(#(AD $(~TQE
(
(
(
(
(
k2cIU
Q]녏PRJkk72R?A]Cqw)ڋ31-Ű}V%!G\ :<9;D>Qq? PArqny߸g qj.{8D(ZXIpO n <אF1ׯj}EY1uaw?6 Q]:%H^ypQjp`Owq}>Ԥo - ?OYWIb<@yր:xu7ROُ%Cn\zc֔jΛ{g?eZn Ƹ|[ &CnG#4 E13 hޮBytє
+ k@tWAt|s
Ԣ( ( ( ( ( (敦X&K=u-
m( 5t c]nv|3n@ }p
mbى+G<CHrGNxZ Qg DF|&ݽgTϵKc,
ùX ǯ6VSLq֪7I|7\+=xM_-֖[k"y[UM pdeC )%1D`I<cZdk%cXфgsu8_F{L|C9 QE ?OP\ oc- KT ( ( աY =BaEPEP iqwy n\z/F < '#P _ Ǘk8Cy4dj? _ڊ 5 //yƻj(?<GF < = n (((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
J?Χ-ԯz(
(
h- z= QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE *t SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGO I T=Q@A%2ȓH?OlPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ??ʧ# ]'PQE A t°*MZ8GVȦ5 b[(.2:+6E
|5,<` .=ԿaEW;: :7g>1 ȿ/2]3FIwW ; 揄?տt z|VE sZ ) _^ڐ҄l \u~ HO8rak0,̀+c*)ks3Uҭu{Smr=ՇU>8 k JKݑO+۪') du$r3B į"b*yh( -:bK~ Ϋ4QE1 (AD $(~TQE
(
(
(
(
(
(1@Ҟo<sH\*6<nIe䃞_W( 1$Iy]ҹbMʌFH TP 6PU[ݷ~"J'9N9+f ̻4ҭq YF I`r E S4JIpI9-IgX+%ry'( ( ( ( ( ( (ݝ^M^ޣ%%
(eWeE q?mmݜg麙 w=?ʻj( uRx@=@N
ln' A }WiE r=ˎ:`I/&/SM[
(
K~ Χ.Է1ҖtQE QE ?jЬ գR0( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((((( R o+ : ((((((((((((((((((((((((((((((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袊 ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * ((((((((((.Է?pU-:E(AD $(IE7zѽ}i )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h K~ Υ)>:RB
(
(+
>OY"j #""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,Q Hb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw5 QFц#Vj(?- D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴPe3# TD_M
""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""j53# U?ֿ@SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@(̎p1Ryw4'*Z ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋ(̎p1Vj$ Z D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴPibc," *Y 5EE(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(( 7|tǵg o { F ,_ҹ 迷 = ֣ j4 14ᤣ#rz~4k j? = ֬;Sv컶RğjF[4<玀w
c ? Zgl0屴-˹ ƠpANg j? = ֬ Cy5ART Pca &͘m EPEPI
OT QH̨܀O@+.=sKQN7@ jXZGX$nʮ0FW:Nł\ I@誖Z6)Ie88@V%k %3 g |vʞERl1rO)֗Z@z~-A I5Ho<q mXE4xnԐ]Ģ#?
Z*bKS%mÒ F/Ul G֘H! [[]Ҕ3g{N[y}# PFy ,`gq<{U+}cMC #?L Ңj6V7ms*;MVCstEsvsj@e"O,q=sַ+hyj(<ԕzR[5y i< hm;dr@Ys@;zƝu/#?L@TU[Ku @z jw@94r(((RԵ ꖀ%o
oR - 2(um>O*P_Ђ3rF˵6A Nz@V?$G [*j0O۫΄S: P%szVu{\,EPV3<:I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E6I$2HBhVBkT` vѕ.d_;s y@}cNȂP\@ ;
u M$d*g#XPbds{@ ]%eX]$zL77r`lf=:mԢe@Af5( ( ( ( ( ( ( ( ?ֿRI
+3Wm>ɧA'j;S~{ gێ ZK{H@Yy~&Դ7s [k0TYZ%Jr
LЮ&Ӗ[.囓
+k s$6ss+7nPp PME#0U,ǁɮZ}\=x"5qM uTW;k<*<cU rk1}kޱP3Vvz)p r 2=*gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF
z (=_T ( o>U|uLOC4rOր4(VMSY.a4!z5=
-cp?Ƞ
+YOՄm:͐kvQ{a" <b:+ UY۵3=.]9ct ${{{PMEWH9[S 8 fC/^I@4Vf<dSeYϪ>e7 f1A' QX="kkk ( ( ( ( *$ Z KQ'(Z(
dEr0EQUq4Cb: +Ol?ӿ /i SWG PK=&]8 u'V;.+Ig d%b]}3[Pc tz4RUϴl}EhW \-ā¥4QE!ZiҖ_.(uWSԟwZVkZs)8Q&iQO<V4DQMymV1#F' <P`ݏXi%iWk7.s隒aEPS j *Y 5EE(AD $(~TQE
(
(
(
(
(
(9x _R/&*v9l}?ϽZ;.Nc̣p+х oQXv5弁B۾9#$sNoӬRۀt עWvc&/^JD'4QU/o"{ I+^(?Ҁ:+NեB?&r =:m2Oo@V&fZ(fSSֶxA[ hQE QE QE QE QE TιpXqx[qahҬc$u7| T ÿֻ]lL a%F7n;PoHŖa85S u ȟue!gcM4d;vhZaӝ vuA0ۿi||(t1x?) SYjk3G4Xc .OQ J H[FX =kr/:ïQE`ki4AYGszW%_>~G!\{ Z z(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(({_ ?/\tZ Jh[K-+3P >uKr#D~Q4G *)(w q9
|1O4Uq!ID7?QX1j6`e|jNm3}}?T
Mx/*c&i ^cg"l?zlڳsV (Smyoƀ6.meY7m\jrQN&m8 aEo[t4 QE QE¥k- s'w]=Q:<ObmN"q;8onk mBtW( @? p%h67ML ;ip3 3[1&H[S9 `uTHK>\
Ϩ PҼ\V&1ʝݨ!x/-ܓ$t_ih[^/H8z*8F4{!$
F}
g\ fR N c*,CKm5\s9?g+dޠt Z cr74XT =R+[''gO0F18PRIu87S4k$SeQ G =*RBy
G1"n
ild囨鎤Y~ێgҀ142啷 x[K=01@tHLOy 1V@0A$@=,(s(tF7[+،ܖjQ\ 8
M$w6&aX zLҤjm
?
7B؆ՈsC$Wf(m̻rFz榵%ȟ tc F;Ku-rqz|4X Ɍ8wm i f~~4 v?\f9kזK=* `nv0 Z
@P$Anյ. Yd`; Uyt5;:(B۟()s UPAdn.E
[p8 Oߩ#ٷ ^sJ.>yowoIی>3l"p=2#5dS:Hs qYyvelIPlZM 1s ~UC a g7|g?jl4W[a m>dwn! H# ~R.&*}S% $r(R ֓]70n(Xu= .rgHUB3&{<A)p
vy' {eC w zZ[rr'i8a),c}yPQ@Q@Q@Ej(?- K\ƣ SqL.pz dQ
w+1\ 4O^8Q2 T -M;]%֣pg1}۴R&( ay^ sJ ɾ۪] eتhs4zv uEm
EmJ[_1vGq)'q(F+
:
?fߟ8 1 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
5-RfF ^zԭʹ[3iY+,99cR'⛕a= [E}x_@N: jg1NR_ b 1}8 ~$("BI Z1*p9 L= .rgHUB⦼Ҥ_L`' = RD_ 8 ǩ = 굟 f=.H|0{ބ6%Yc~sZ *'M&_MAH?ϭjxWO eG*̺2Kc
?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Z y?5S[q'n'1U Pp5 {lF#X/1Rx沊145vJ]QK)e8 xtRϩ
IU'rEތGT Qm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4Χq!/39=8,M
skJa_"Vçj2&l2rFI9銯 ċ z*: /
inwn {稫_K6pԖpoyL͓5f9%+7QVL sIiƣqHq GeciFktRϩ 64OAuz Iob\g⢳6Ih@l~ ;F1Sz
^ѧ̖S5oڧo|Ȥ; Uciwl\ܛWOZ
j-A0bNV֨4ˆ'~J?af 9dfaI\^R>P$$34zTAeǷF*$ë !2t6^G D:ɞ8B @/9@̟2 Mq<;D6U dpy b [vW=qn Fm!4+V-~ *>f8rId ٤]:ʊCs ^ t-N+:}Z}2XcԟZ@Q@Q@Q@Q@D_j$ Z KEP\ wJ뫑 U : կVn[iTucZ(@IyŇ'I݅ j
FjFGE Wm
$_V
7*w7oAZRØj9яWa :"zkK{շxG@P[KYDQE 3u]*W6#ʰW z^<[DI=ǵf%F; uΖV2@XVoz<9ȴ,9? ל*^ԒI*zׯiZj.m)ӞAG}M*(4
("STPR(~ঀ(#(AD $(~TQE
(
(
(
(
(
iXh'?C@ Z~n\4 OVu#--7[Nr9z*4d6o%[瞿m/5$B "ztegy~o3>bm}?nVw6NVi7!9oC:K&wq8 CH* nO),%-g<Gqcsw[4nG-Zwv\IԀp8=@^#g $b8 8
nQ߯$g9#6+~1֢rVO j
oOh< ]Zl[q}=ΧrG z~y%uL 1so-F2( Pwec ?]EehZi[.]fh ( ( ( ( (扡T(b-4s`qk R!#O_qX]֫g
|c wVXO#o ?f,党%Q ҹ3dg9\.qsfqFB9_X)S r`Rr 9`Kk , ʞF7[m>Xy v#=* [Tvl1O vSKHc`2sy14$)ƫvuĖ'$ Lc'OlC2Z/oF ==Ͻ uQE ?OP\ oc- KT ( ( IUڑQ@Q@ڽו. qX: Ǘk8Cy 4ej _ʊ u /?yƻ*(ɿ _ : Ǘk8 /?yƻ*(H|ۻn9}+f( ( ($ Z KQ'*Z ( ( ( ( ( )i((((((((JrS˷@
Kxe&<t
(
(
(
(
KRPZ ((((((((((((((((((((((((((((((((((((((((k-D_h ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ h *-DD {f
(
(
(
(
(
(
(
(
(
(
("OT¥((((((((((((((((((((OT%( G_uՋioYy8GVȪ[jĶQ$\duv-I?c / w Z^/ ȿ/;
eTu?\6U ֨|[4mqpA)Xw4|# (_κZ >;2ۊO:Oq) +/u u ZDByk khbifP]Ag
IT奉fZ֦{wS^Q zuu KݑO+ڪ7) du ʒ9JqB+ȥJp}8(aEPS j *Y 5EE(AD $(~TQE
(
(
(
(
(
(
( QE QE QE QE b((((((((((( R߇ -: t )jQE QE W_ >v/| JR0( ( ( ( ( ( ( ( ( ($ Z KQ'?REPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQAjZK{QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE D_j$ ['Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'?@E QE QE QE QE QE QE QE QE QE QE QE QE¥lh ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-Dd? KEPEPIE -%PEPEPEPEPEPEPS j *Y 7QC4QE1 (AD ~OHA2>:Rc-M() )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@.Է]Ҡ "lt ҖtQE QE]U^k s w5V? hT w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f
i FGR8MhH I U= Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١ja 'P[_ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@p1 w4 z w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w5
CԎ1W* I T f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55M!GSI ??ʧ~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP1 Hcrt @ h>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP9",d?pU-:E(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0( (7P>߿=co$? Q a I 0 ǿC L?Ql_ pQyWPN=? 0 ǿC L?cYڛeݰ"$T4Ig<t i C L? { XK
ȶrGpzU}܋cP8 ϧZ 0 ǿC L?f dj _
;]?P~ fwsaZU{[ t QE QE *t SE1cRB$eǮR!Ip2
z+զ=COHݕ^B@?wh^j6 @F@' hQT// ?T]Ҡ$r @?P(^Y-lV[Y/12gۥ$זO و 7xʞTo5++ > R$RZ@z}A.HH y^xq ~x@4Ve9bT fHm (Y.{Tl14 1
+5yÌk
F 0Np#C ]-u:O&PF~4[ Y )
A
Ѣh"Y9W|ޗbc@U[[kgǦ5BM{IC88
٢I}k Aqz5SsJD>z?\~x kQY#[ gCq֮E\E@hMViC0A8 ( ( ( ( * o+ : R 被\[G\E?Ҁ,Y֚v҆aqIyXXs&<O Ң[^ڸuo<@6A)$
>l^BIeO PEEVvن]pz}zPvrlؕ<NfɸYLM 8TաNM? nY6 t@ 6=~5.Q S(Zqik"q F`Xg='ڟkyo{lۓ$gt(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * I U=A ??ʀ'd$HdU$Xɯ2H#Y$̌UۋKFD!|Ϸ^hosyL 3=g`HwA'v =J ?e1 G Fa1jg~OO:+""a`,s[kzeԢf F~5h ( ( ( ( ( ( ( ?OPGO ӬtrBzd=Z합k3Tc
hbV;{ v4'Դyk%v'Ե),Fح䕊Q"Ou, ]7'@TW8:ITZ ڕ̲M?n@@ޣQMf
IR\=0FA=P[Esv̟ٳtϵ;\z=jCf5wXc{P[Efi7Xˌ1ltȫ}c>v ZTN B3`֥4W"W9>EqwMAuwIehP0 @5Rk4xFm >sIIg3)$ i\][\}m =k=lr;6;f/K:qk:hu{C5UѕR?Ƞo5+Y˖ENr_z; idV226Gq@UY)kJvssa/ #2>2r{@ 5X^^68 c# MoY7c!e# ױ"Z$cԨ&((((t S z(
B@<R#)$]1US
4 |迾 t__ιDnT1i 4C4M }z SWG zzM. 9$
e#i,L³d k"ߥbaq(g麥-pA>LJntY@U ЁeIQE%-yvZvWˊ?U$ W{ֺ< }
7k3Rxi`$jWڬcJFO(tTP9KHaEP?[u^ *?W
h hb?(AD $(~TQE
(
(
(
(
(
(9Z =l ht uuSW_]ig;Ʒ,k݃٤\2O>ݿ^#2Ḟ K,uEb kҮmu-G2,{qpZWW )@ p9T)qo#QȬHl忁2>~uX$eݝH><CO<1poZoBzgu?hXC$GRt9-
ß`Oζ֓{a ?ʵn4 2xLKq/ l\f[[fO<E@Q@Q@Q@Q@Q@ Ik!8p>w WI~j% {~M+M3 yرMw
{pZ2r>P=G4 3bc|`z pX:o} S\$|f$'ޱ 2+ F[! d Q k99G Ah7V^uSUp08状 ]LEH,'{3ZYNF%1Z%ZB#p<Vm M7Jy nUޭjh:R +ӗ#_cGdUȒ"Rv$1W
2}`4QE ?OP\ oc- KT ( ( աY =BaEPEP7 a I a Cr g7E1Q[Ϧ[34VgR;)}:FBh URP s@tbɷi#=?ɮB"vo
~bm juK[%ۇg%&,^U#0Mi98(ύD ٮ~>%g,, Qx bq? l\q2#Ȳ"nڸ ƣn&M( $q: zàkok((# ]'T *9맪'I$
} Taڝ9"U +y5_YClt<:;mP1kwz^S9
Q&'ML ;i֭q8df`q~sZIykhr玕NM ;.#P
'Ubc,}֢PKg$B2GOmIk{/J dzڣGԭd$4tRiJ[p'c* #Jm5\qr9ݜ 1HDl@@Qnug,* =R+K7h Cy%g0LF8{OͬO)Q dxqjHS o(U ?wdRA{ɚHNYqONt+քYIzM 8 Ҁ"t=WL#T`r 8qSԿmWJCwkql[e*9"K ր+[mZWvc URMkiRz
,䝞S(va?x=hFl > z ԚOjB #d~ug]R!*xsZShplnWi HiLv,Bw,`>@zϕ'pU-<u F~Qk<r>zr(ϩ_O٪IoϘ6cNsoJ
Q:\m :q3($g&㳙5 /vhvڧG8ޛ a3 3۩ M?ȵC|. 7JK-> r畇>q[ }v0F1|Kr^6*H=ր2rO{?WKx46@'jhR:]52pr{ҿc->͌l&io4Qf<}IWD.6 FH ] o~lgdT7P) ,1@qjS\5۴n>o1>aQ "K;<r(ߠ(((( R o+ : a\"r IO?AWaY:/Z9<GqGz »Rݣqy :ՉﭵIR; x2]Guy#P@>Q>vr^i I( Z 8ft [
yīe ݺ
;MkI$<c
tY* gjttWU"U%Ϯ}2[x4lc[n$db(* U4X6B2[ VFyb{p;BjK=_`WnqEEiI\d @Ci3[ 1bF{i2xzq·̬rU =Et{Gu.Q;n3MYE4lY4s[ z K eV];w zvug6V3K}c!R n P6u B
v =O )ACLn- \u'u q.Ȕ*`V|p_h r1<b ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((t S z$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ= [Dx_
'֨jVS)%q( PV\ġ%E
T`' i֨>!y&P =eѮ]JΑ qSRKt/f0O
WȐxH V0p8?TN ճgIѿ>6aDzFĽO7?l,~}@D oБ?iF eG{
6
o%Q?֠ƻuG(PO?7,#?* ⥢ ( ( ( ( ( ( ( ?OPGO[@$Ny0ԵۏY< WN:ۉ<q;wg㨪#IRo
GkX"F_0 T)~L0;5zI7E4C9j:=Gu\y `g $ t *Su"FLp#Zeu߂Nq4C_;Umyk _HAd5As{MG>F &:snթ@ [)H*A9 6T븚ݮhV nJrSnq4ѭΧq!/79=8,M
skja_"Vá ?Z wNA<dzbǢQ" ʪ0 N̐i[i1 v6zrKbf"XwNF09jK8'Gq1N1sV WC, m,
>Ú O- f?\Tyi% nx<du
68b]%W)ȍBq67zRУUc`?ZԺ6[osX;]Ҁ2|2t 3TZ7ͪj2/ rnG.L )&kONӭ%;ROz VK 6jz~ukmԟ I\KnɓyvRN1yo^z4P @ Zζ"q^:^`Gi2pr>sͼ!o@r^?֡5ıɪ\3B}* ڒ 9e@ܤSE`h &}Ox%vblA NI[c1|a24REvBKSAO :imi,wnjAV5; Ck8Ol t*EN@ >
(
(
(
(
?OPGO 袊 + ]q3 |?*[
յkm \ jBJO7ذ i"Q۰ =H8OTծxU z
5ᔂ?}\`(ܨG@9
7wMumQ S usoW)tD(dv Wt< Z\DŽ? OYDQE 2]*W6#XuS+ g-O ujxi`${ZWkhƭX; ֵN#lc7wZDBy{ 6U- X 5:VkڋcF^}
9h빩EVEQ@\ ox~?[u^ )%)(AD $(~TQE
(
(
(
(
(
Vt1hrʹv<He! m Z#ӜnL [Lf9%I:U=6 ?{KԵ Ʋm8j_XY[ie( ],V4 ;䜞}~-՝^ML#4k_e 8iPjzVLgYR(@tz]8"'B
Ud E+pʻkjtHAerBT5WnO$- x~$*L_&IXϹ}=U$^@#Wnc:Ȭ撏- P
!kF
ą&ZaŧBPo QE QE QE QE QE̓_:crYtM{m>eH\^nP: 1/!-nG."4 :bM{8ک7kX r!?_N*"r~O[fsgn O_ eioB*8nLյYtoH\81UDŽ]TP=CxE)T/ui-%ƌ$;ݑr5"cBϰxP;yqL }I5ZYX E}ɠ tQE ?OP\ oc- KT ( ( աY =BaEPEP iqwy n\z/F < '#P _ Ǘk8Cy4dj? _ڊ 5 //yƻj(?<GF < = n (((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
J?Χ-ԯz(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * I U=A ??ʀ'( $Yi3I횞 ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * ( > V IY}'ԞfKo@eG^EfxHwof ^EǷ Z>1 ȿ/;ygTu?\&U? ֦Kxh).*cQa}?/OȶkRQE!KVRP0" kxoÑi \r?tE\lr3%S%-nfjUjmGW abIbp ) ?{uD#rF}(R8!wx]@%O8>-TQE AsU\ ox~ঀ(#(AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ C
Ώ>Z5#
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * (((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袊 ( ( ( ( ( ( ( ( ( K~ ΫX R߇M-QLG(AMJ݊u57Z\<EѢG(4Vw(EFE HhYHX
+;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFE HhYHX
+;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFE HhYHX
+;y"U vy}WE=c -SQE QEX(izϑSU>ϥ]SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-YbG'SB¥< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋ61 QAh "h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,Q Hb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SQQ HbI
<< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< Fdu#ȋ?ֿR^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_MFFdu#Q'( "h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+Kk`9R(~ঀ(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPu Wj #
(
(3ó߿= ՟ L Jh ? Z c `#>ӆʸʂp9 c ? Z,M۲K}ceEo$l:ހ4 = ֣ jɞXnEÖ;Ү.\ }: c ? Z 5 /qISq@ ۷6czڴk?C@Q@Q@'*Z?ֿRE#2rI= .YDI8NA#EajM `*^W5; s V<' _Z__)kWPGj& jXZƬK%̗2gڒk/#;2c*z~PJQڤ
OA?Z__)kY: E <X Wy9pq
+
yFe nDn Xn$([sDp(].{TlI! dG lRW?ͤ9 8)j
Bڋ0OF9 8 \um>O*P_Ђ3td Ah 2<K4G*pT QE QE QE QE QE QE QE QE TPZRQXZغM!$(
+]KH\}kd`]M W3j:Zx`;I Nq=jm65 t.p1AEV\N=Oj硇\c0,n4Vf|څ *PڤPZcθmOoP^ _HE{&
㯧}m;3s+ԤȎ 2I=W7]0O tW/ 꺻4bzn?v3Y PCEr ۚ#nɎ0Mݴyۼvs hRo>_p% >خ >~<TS-<j 5(+r! ? u4QY;c_SEbh]immd W+jC["C& ?=]<D@QK$J[n5BV݃l ":*vGϵ8A'Oa=Kgg/ d?IEsWj߸L۾1\} "8?TZ3 ŏUVڝE. $AF _Ҁ:+mp c Q擰ۿ\ya-2DTc{b:*(&[t(aREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPI
OT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
OPQMD $ u$5xE]eK^zP+6XӮ =g*kBC]HwA'4rg# 77-X l9?/PWIYVI
ܘ2Y_4Λu(FF~
J(
(
(
(
(
(
(
("OT¥Oieڹ="-rߵ@*6? ꨮnV;k^v 2I-"xM hVČ' tVVId6\*>S4+ዹfhb\"@ pCMMۦT GQHK1rk}_Wy0Hvz @ ]%sٓ:{c늬ex`a1}ƀ:*rזQ\u{55gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF
z (=_T ( o>U|uzLOC4d
+ڄouG 6no98 ]vmzsZ;_G+H?P]IXͿkg5mV=Y.Deu*_J [@G+isk?VG$vِ|ג}M-ƛ6m'+*3W?fBZ (60^@/&x8 ^((((OT%( IW) $]5yU[ SJ:: (bd~ iy;/ f:tAU
OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq,Hʡz;*^AERQ^ek֝)eUu=I <Wuj< }
SfmO;E$זQcP"4l" 6
JVvr8>*FQE E?STPM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPu Wj #
(
(9X sk +l>ln.6cޢLfh Υ@ wSLu-HG_ <2,$8Ҁ*\?oFz]Uą$E dE`Ũۣq%]>:ꖶJ!(K1 P7M5XG͌`sgqyQ=\|KjYY[ 4M عdGdDݵp=ˍFM;Q>H t>@ -?ֺm EPEPI
OTxtD?LҪ^C=:zD>Vzlῷki #vѵ Z^c1 hI=63/ڛ
8ҵn4ĚkI#o-mO qRM";.#9pT7>4CJsX *t v L[trN<~5mImz."P5PX]섒@* 4rRqJnH;yj8ާر
-s;8 [IX{[ ;zuhks]8aP HlbԞx >h CwI%f0LFQOͬO)yF ~T HRvabt*cgvMIV%k!9f IֳzЋ'&ќ?@E EF
G6 ! K}UmmLg#뚭>r.仰0(Y5EKm 'Ӏ *I}Z5ulAy >lXi$D뵃yst58#6כ` $ נ I$ {0Db@ nH՝smF822B>$/.w<qIum97c;6 p"iv?fIJ8H yGJEϜ
3qWjrj;6mN>Q:KE QE QE QE QE QE QE QE QE TPZRi^WzZUyx\y-\.q'9 ^ uRc9HW t~Մfڃ0ZI/<n}z
"g#+?Tf%yw'q(`=S]9 6вqvӮ19hFFDFyH
I=0=k{`4men?W9Ks1w'hmF(UQTcgE^>k~qw'ګ kWc#6D` Pi% wn9P?jӬȶp
%W=c ej 6s2\4~Qc??N -)n @/_P{8BJ!W}k^K
L0SiaK q( njPy237mklhyq+`hז9.9(T0 JaGfyfoC)ʞӭq#Ac6%kkK J?:Uӿpvc|@ p[L~|
~tpvY_w[]ݙ-Џ. @O .hdx
3 ] E`;ۨ Jk5n>P
Fzq]gGzf:c >ޔ\M^ɨ_G)E{m&xgc]W;A㞸* rkn8qZxWs{ғL͵6 19:dӴIh%14slC+p g'-(_J5+/ F߳q8CSdE) uЏ@ }XOH2J >E"{6
F$U @jEǔvs>e5$:_0 de uwi5K eÌW:UOy z ȷg+5Pv E ZܙKr~dgigIs4?Uѯm MsCc ƌ<vo_iٖr~Jc?o5y mioxVJҀ9R4R ƻ]et
cSKm<i>Xzk/UKk%8 tpvךФPB
Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
5-RfF ^zԭʹ[3iY+,99cR'⛕a= [E}x_@N: jg1NR_ b 1}8 ~$("BI Z1*p9 L= .rgHUB⦼Ҥ_L`' = RD_ 8 ǩ = 굟 f=.H|0{ބ6%Yc~sZ *'M&_MAH?ϭjxWO eG*̺2Kc
?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Z y?5S[q'n'1U Pp5 {lF#X/1Rx沊145vJ]QK)e8 xtRϩ
IU'rEތGT Qm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4WLQf8$g-V}6{hYSn|8n- =9K+ܷP1yǦz \ieYs1+^Kbf"8n+;t 1_| li/_YҌ
" g6m JMKMMF5rFw#o>k( J0?]%`C\w:ǟ}Mo SA ͿAL N S^6[os8EZ`c? `xzhI'3bC! 5>,-֟+z?JF,uي'9 BkKNӣӢ(]&(j[ (v;k[khQزqzO[;9I n~}Tg8ր!VoVH:Vp5mHmXGS_5 a'9+zT Z_ f[h&tT ќ=C >?iVs\Mш[,8~ Vn!Egos fD#Y 4ñ`PA=zg>f͌g$5壸nPfDy]̉ j;Ncӑc$ ֍ QE QE QE QE ¥k-Q@r>2 |?+G_Tw# VAYmZEQՍh%'_ m'S[;v%6qu]xU z]4F5}X`(ܨG@9U ckKcoݨ F?] ʮRQɭ.[Vt#?֬W5 Co]-fQEt]^G*êQ^K ? k{DEmO;D$ CxֈLjqb{DYׯ<C:ZZXc Y""ܰ wS^px_RI$@ )^jڵ>̧CNz- 4( MQCK?Z((AM3lNIQ?
LbOҏ"OU)[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~{ʂK~ E KT ( ( IUڑQ@Q@ڽו. qX: Ǘk8Cy 4ej _ʊ u /?yƻ*(ɿ _ : Ǘk8 /?yƻ*(H|ۻn9}+f( ( ($ Z KQ'*Z ( ( ( ( ( )i((((((((((((((RԵ ꖀ%( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (i(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
("OT¥((((((((((((((((OT%( dYY3I횚 ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
( > V.eD X:"n'cDqבڳl
&p&kXx X j_x"+Q q \W7/_ ZMlѴR]Ua :k3G 4n(9>=Ƃ(xTF#d@~D xsÑi Xr?YAu#5%S'[kZ{OyDq(.N vE?j(u3'*Hg҅+
į"b*y⤢Q@O(~g T?pS@KES(AD $(~TQE
(.Ŵ[ݟEsڝ3Dʬ3 23Z˾6I3ȿu|Χ8(!QN)0%#~57dǮ@@[OS ]ȹ 1@W;5iU0{[ /<
P
A#A`=+Ӛy]pG1Iz"e1 VT? (?
_¶#fh՝v1 p}3@S!9.}ƨ(Qr;uȩmBjyjz@ h\-HmpA9]
QE QE QE QE QE QE WjtxLQHc˱"m }vΪ.5a> PƫQk/ 6|B=Gp? +y{,J (3]-&(+NJ 7yXn֚Wv=(0( .ԷzK~ # )iJZQ@Q@>ϥ]K ?ҮԌ( ( ( ( ( ( ( ( ( ( ?ֿRIOT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TPZR -Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?*
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRIOPQE QE QE QE QE QE QE QE QE QE QE QE QE D_j$ ['Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'?@E QE RQ@ IE QE QE QE QE QE QE ꚢ
M{PM-QLG(AD $(~TQE
oOU%e$2L)A@x@} B5hŢxaGr =Pp19=B)t{E (tĈq%Tn _V5ɎbͥBx'l Ǭ7oJV}>nڏ 4 ֬+H}>Y:o = )\ 'Tn.Ҵ &NKMnxQ.rz:?hHǐoz֤͟kᴸ ^ TYhu R@mngCֺ:ݪMw$m#Uy]FXZ *' sDW`
Z`Z~F <?&
t0_`kU Iv1֡{ BVUՔWOQnkGYWSYa D_wlW3e=J] #w0?t秷M@Q@Q@Q@Q@Q@Q@ J 4.*'O_-wYio!?D#ȕS\ ~n|s)Ӷ 5gKKI~ _k*x~P Ȅ}vzv:i
I_[~q[o sH}YnF} T טx-YHV$pOz> qᡪ>~:CKú跑) dn8
z6J)_sm<yp$w9uP \ Zk eI-=53]ЬXR6;O@+kMCn2
QPXT?[u=As@-P((
Xd f =Bd?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME SHb2:*oCGO Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP of<ʂJ? w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch du#Tft S?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?fRp1PGO4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f
i FGR8MhH I U= Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch!G * _Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} ) ie<S!\ ox~ঀ(#(AD $(~TQE
((ޭFXKp=F;jC=6죵k@چgqyfUtnՠ,c{! 2G4P5k&XDraGӊu ?չE aRY_q4s=Zw4@"24P-Ɵ<(Ӕ#E<eq@7ӂcoQ@ ѮEռ iyOZӺ[& mv?hQ@v7|2"?Fsڡ]6C U9()wWMrJa0+IWj8~( ( ( ( ( ( (z
4%ɗqx\6OZg" Aꨓ (ڣ tax@7QY ?nc@J9 U-[ΏK mrO*EI I |* 8jFQE xέ<S%ݲ ^؋F:z ^cy|}6+m4}:gVI1=?
ӫO/stNy|S
yRH r9#oCj̻4٣4ear:5JNJET* -: R߇JZAҖAEPEP1 =B {VH(( CPϓ~1cY { G W7@ '$? Q 0 ǿDi q~ciIG
\FA8 h$? Q 0 ǿՍgjnݗvXS(+y&g 0 ǿC L?ce,7"aci Wm[r.@>h$? Q 0 ǿ՛/yƳ*J tCM19}iW7o PEPEP z?O@V15lRq G mQT5 ;
ԁ7t MԬYrhw2yWp$}qҟ.M+r8 EaiatX$<n,rxb:֊_=/0*?\P+.Yn0.z Uk(ۧ{ *c|J H
C.B]d {b5hљ-\8 }AkZe P8PU-ǔwF?
NA wۻ mM;EMgAw2bnc#?EUO2 ?uu{b,g%L8RFzc# ꨬNłJ `e tR2 'ns@ %֘$[jszqm>B\ Ip(Jս^uOQY_D_3g 1@4U[[HDC ja|]^EPEPEPEPEPP[_ OEB"$ų>~ ۛ䜉no7Ӭ%cfGNOa}h 5ҵ dz`~?zh WZWHm dqv QUg4
>Ɠn>Tcsvu{F#ȍ=G&:X:ssjq. }kJ hwP5 ,<6 +0$ h>
Iw#z( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧwyme)8 g C u6W@I?VW,94~̻<@~ >OdVrOi& q Т,wW 7w9<1 kE/ (mr`=g*~mӄS=rhBS%meG$rZ!.LFFr=@UKK[̖ b>Un52S è }p(Vזm;# Ccs?٠;݀OhBxb`Xb:eZB<t_G"՞Id chp3 F{TͪC.geeWal{5Y^=X̃w# t
o> ;ۇv隔 N к&Ǒnϛg8J"EŦy*9sӶ>v ṈMFG5s> M6 gHK q]5 QE QE QE QE *t @E2I$2HB{Pd$p F*"\Jۯ4r˷t۹&@Ad
PPn
Fje#X0rds3{@ mavi0If9ӭ2Q 3#?L@QE QE QE QE QE QE QE QE A ??ʧ# ]'T QYZiM: !W=2k -vߵ@*1 uW1y\Ioi =O;}_dZ< [kJUEdjZ#lVJr
Ln'Ӗk.囓
+k w$*-mJY&ͷLmnoQj (Rp$)jƮ ob#] (}joA;z =g]K/&y2qǷ@ }GN7Q]0uס~d G`OҀ5Fu2v%F*1&;I|T##<WWݛ] t QXƩ5<PA#6|j$l3ۙOր4J]WYi.>
s_V5rt ݶ9 C@TUk[{̶AG\Ƨ[ٱXUGqLOO;
+ WH,lH\ n?z<$S]\} cpW=@ ]Vk{y#gҝ9?a\riR
OtQ\ͥ4D"nGzFU|˨.>bBN=@ m_\\0gmGCV QE QE QE QE *t @E R ▹ I"鈈D pipgSEu'tMzoZZ?
OUmv'V3.IgVrd%^^/\Pc G=M,X>hۇBQ\o<;s<^*O}(1)k˵Zӵb\Qꮧ''VEͱSi\ImO;D$ו^RcP"4l"xFݏ[h]@ܹjZC
( R߇V.Է?pS@KES(AD $(#g&2֍ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono K~ Υj &O@
)iJZQ@Q@ C
Ϗ>Z#
(
(9 nO n:=.ُOz}2ٙ2: M3PD-"4J CDȲp J sMH@9MuWK l-n-W=vTZ(<9, @4b 61kI͜V1F|n_ s-9g9enߏ \ҋ6[Ghb[ Ev^ ^.5q4niF# t ]%s~ ]% QE QE A ??ʧ# ]'T@48q{+Q^hKh"L]gV_S`YL@6OבTHA zUQc? WO8 aU`@_"A 9 ZP# vI[}e1pX!ҤLgTG
D./&yX1=@8j`5 c0*: WGK. 33Vlm& [E\ z]lm@GZՋHt[xI$ gBtO3OK),(+: N-F
b*DEKE"2 : +DחNS PCK7S%ݴ 0z@Ũ˩ݵ|1!,3ҥ`MSP3, i3ou#@_±ll/泸0H0IҀ&o-f 3 1}
ޥ0,!%Anq>iPi'4}S]tZuي$*}
eGŶw62FFAWG@ 3cXdQ.zdtns/-!$sIc!Ӗ)l$QЎ
Zo w(ҳ8)na`R_mZ+[88 t^-wk~q[lI#'Zq]x]a@Q@
Ģ;brП*nozWwczDC `^*.$$l60; t:Dqw$W<d `4
đw:D kk:!pT0>XizNewRc$} k@ FH CGCUi ٖ-cMPGI JrT0Ϩ g\o9?(umF; :~a`m/,{`#= VM e{zR>/q6`݃?z omgʟ'%"v?*]jVT6ln'?=j"-C q{lZMܷQ]jw wr tQE QE QE QE QE OP[_QE s^ y ]7G5mE}2Vg> 53۩L qޙ
7-[ NY.%3O/ ZYo<;JS 8'ڀ2M 5=;F(< 8qۨwP ncf :~bh-a{{tI SvQ-ޛ6cs@[ȲH7YqX_w긎8z5wQ\LKwsOQQ,qg e@ `jӢO'g3j x'a;I瞸Y_ws533`ߏ@t2[yO2AGE +"o2\?z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO "i.q㻑rVZњ0ќDq Vέl3"Ă8 ~4%ψpª Dr@G =,"cvCqKgIѿ>6a@<82\^LLbzq"jA`,Tt
&u
ė]ϐ%9d*gf+k2M8;#=i3)Q9''2Dgȏ # n_rc H8jfSY9P0Wu?@Z
1UĈ1ڋ]A De=O<u <Vѯ.uE@snKiL`2"1QSkU*b$BYIgK 3fYH 7_gZ3F0
bO_gp`&a0 LZg*: c9KaYBK;:}+hOq!i
5.IT1\ ʎ m)"T0ldG gY 'tX$ӣsyi'#~m-s8 O\}Y[^ZܐYeeLtv j<Y#CǽSGV`Fr s8DuPBH [lyׯĂ1$'V˩ZGg6&y Z:wp"@pĖP, 2fe6W5SR" vfҰk%LNO`}63\_
wp Pڶ2qP[8tu6hDʙ<u QE QE QE QE T z? OX䖱0 ' ln&mwbބ{P1aY),9ǥXK*)V sh |T
Jc>e4Ŀ<#ۊ Xb+$ȡJ :7/8ª q9 L5˩\#Pr}N*{*In qJY
҆ ֿl"78Q(Hؗ텏Ͽ=} ="_Mz:g?ӼlaV#C!Y-0Ag w2!.;
P%$gA?\TQ@Q@Q@Q@Q@Q@Q@Q@GO I U= V h䀉?ҹqk6矼uS[q'n'n<uDi:jM |TZ(uQ2?5Q/i~]&(yY>WG{+< ۟DX Jηd]ɜn~uKLδ[]I1&(k2Gjpo-~ XX,3F(<noӾѨ||Rssڵ(ks4WH'857ʝ" :w[ mт)NJm>*wPZjWs،
yzg֮keo47,>_ ոkXI,7rP<cc=Z -/ t$ӭјxdħXUMxW-bKh~ nm%H;PGz 4ۂ_yD_;qGc?ڬ۷zJ}RAo{z^P k451@ P;CS ի ;W3m^z֝ g
M(zֵ.M)\F)6bv ,c8y )B yUj|? =[%˓Jrɷ8Ӵ! bNcԓހ3gzt[ 29<wEmkmm ";\n=^]:k(LS [;9Ig ~;uzPB_Yծ ^D@y?u)a;8?
s%]w y(P ^(^Kh&tdќ=A2 T K8:v5nk)%3Ym{-& wP~p'QԜI; >oHu]=^ 0EsnJoyiNz P3Ǯ4kVtۯ*) %J4[ñ/of ۀb:'U
:-:A,Iz{ ( ( ( ( * I U=A ??ʀ'( ?vA t{ l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆R qr s*ރ߱5֥C~GC»-OA Ϳ\Ւ]@.m_|mjs ?/]=fQEt]^\uaO# ?ouֽyⷉ" k5j^#P9b{DZׯ<E:ZZ,doqi Xr?ƼWSȀ8 U`zװZj.m={4#QYQE AsU\ ox~ঀ(#(AD ~O Y'IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ C
Ϗ>Z#
(
(0K+]wg:ֱ5 /mE q? Ǘh<] dj _#Q _ vP/yƏCy5Q@ OF < ?5 /mE aowm ϥnQE QE QE A ??ʧ# ]'T QE QE QE QE QE T[A;āLs ( ( ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( "w#5= QE QE QE QE QE QE QE QE QE QE T z? OEPPIm $ g5= QE QE QE QE QE QE QE QE QE QE QE *t SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGO I T=Q@q3 |?+={JV<NՃ=2)C$ˌͲao 1b o/|c ?~_jvΨ M/ LLtѴR]UùCo]=e^m'֥&(C<ŗ4$aD k߇""ܸ wZ143 .
g*J-,JZt]^\uaO%=_dS
GY AdI P`qB+ȻJp}*Z((( K~ ΫX R߇M-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0( ( ( ( ( ( ( ( ( ( I U=A ?SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP[_ OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?~ ʧ((((((((((((((((t S T=Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GO I*
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGOPQE QE QE QE QE QE QE QE QE QE AsU\ oxՊh hb?(AD $(~TQE
(
(
(Zв/ Shyi$Ls#I^*y5d q$W_ߋ;E
@2
+>*hJ/l?j6Υ
nd'979e2Luf8 r-♊ &1I}2OEx}azq@ <r2 !`z9I,pf1 3i P[
VN{3[4k.6?8@ r2 "`z9%smxr;R3[:}tP6x>z* y-]f>]%ܻdg;ғ؋#yG};V%嶐Ue%G +{R*ps\~g$Po "jk5 Pq8 Ҁ:T Jk:&73q\P [ؑor*Np?Ecisq{}\k Pcat 5\-byn , o==3cy k@}8bs'.` [ 8.yj 0B13Cuss1 X}kku{dgU ր;ʿxxuƳU
Fz8 9*ޓm5HI<t4<̌{S 29첹.ZmN"Wb<v\ uw
R6=}(( ( ( ( ( .ԷzK~ # )iJZQ@Q@4AM7ZA JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE AJ`S(G(AD $(~TQE
(
(
Wtva s~g5|]+y,{\Ğ68 [[y 6F܌M^i- T?@ ۺ,QU5]p12l8aM R,":=Ild@<;r/C#`~cUvcњ0W
ڀ3m
=<8 eq8k6uöpҌ~A5hZ}͌\D~nJV6} P2:sڀ8s uZ@~?m[PCY T3l,"0a9=N{֨' <n; V&S]`D@g= 5<`c u w'w\篽Mmm" uڋ @( h Q[d'<v jnۻ'ӥ-ͬ.P: Ҁ9:\Goa̒ʤu%rz K=O?$}3SzMz AP--ax<:o>C#q[VZmZIƢ/n@ {["ؤw# =~m vK[K{(d~?M1'$@? swZ+\<śezu5?HⵊhbRE=@y#HG
0 Cqiow `#7ݞ(Gh~xPM_nxd*g<kgnIx˙PmV ހ2jҕ rryTo />h_3VetbK%Ē3@ om]Qʪ1?*zҦҕ-;6&&g 7 ?+ZEӯ=YIj՝P =OR~(
(
(
(
(
K~ Χ.Է1ҖtQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE(AD $(~TQE
(
(
(
(
(
(
(
(
+1.G{=؞b<4'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ T4#ǵ ة .ԷzK~ # )iJZQ@Q@kGJt W$m1}k#u 4%tZ1vlh+u ȟ ӯD jh+u ?0 _ '=;a N cG& 4{ okEq_ӯ? kQ(J?plVE֩i /vs F}*c rzfN͛V1 ǿm { GOE` m { G1 ǿ{)voQX? Q L A}+o j? = ֣K}fsz ? Zc RoQX? Q L ]4V1 ǿսS(i
QEIQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE(AD $(~TQE
(^[->[q6<X
Ң֓w{G*g9pFsmxRŃ}y vVVګo:lW+bV}E wWX!m?7$d|ҴY.WV[DLI#u-~ B͟8:-uf-博\-u;+5-RPky$0w3N/mKov,䓌Z (= IMٸTJ9 ITڞ*Kfcb{mERk8v^v
(
(
(
)2)h ( -Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R( ( |[ a߿ e>: <G}3HRbWreN*K}yl<~W
I,}1ӚV-T=mH-995}9W OV+3XҋKҗPiIs~zo
/GtFd_NڭhjώSA$g+nc1"0G xʅz)֗6p QimgeԌw͓ *ʮz*ҶWq9\
tQnzQWWVFj'PI!LE4qOC5qv)]@K. ҢK{'xØ܌㓃Q>b^4!̭= 9 ~U)ki I%{}(AgќF73d! ?7~?NzT0nƲ`cua+{3aYX&(mPt {y :Y-z<i pLVFkp}5^P$lΈt钢ō{aP9b~oh>}>m,զ@I{pGaHB96zcTjg*1fUwyYtzQ\ǠQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE yYXJ!$3
O ;Vs7_3 &MWM.ow8i[f g #݁d ama_ݷ9W<<G'vsSctFihsJhu1>5v/{o ^' 8`8>c-Z
0@A @9<g+7LXinHNH}pjEjh65u$pJ횖VE9mw 8 2k@}HB~Gۉ'w^qT?-5 U1X uX>(\hNMYc
|%=r3vnc>>Lzs]
) L{g ]Ҍ
qMZU%{jk
X$FW`~ TW_i 9 N} 퉫ʯ7 od2g>PGA|+H@ =*%k* o؈E,˂q> <I4gp}r/#"w ^ /A?Гn̽EVF(AD $(~TQE
Go+r<kjI@8oĚ ηy nTz~ wãjKCN7>&ڥB#{qYFE,km+ ؝N~& PD/ NýEMW5-)/ ,NO7~Oֶ<?_훏g\=Wލ5$Ԯncܑ:(8056u]^ad J }C4eaP30s\ _3]ֿ Q/*m$?8YzC" (]+V!1ְʛ2rOrsT<T-<8.<(qӚ${ji?AZz1Z^_(Ot@6urhL: d }3jtlS2dRCc 1?\VEⰿv@ 鱦>}}": H[[7ج =}2K+4矩zϊT$xݜ|tȭ
7?d hU+-ĀGRO Unn-ՠb+*=Vn"0ywJkKKV8?0Q\\إ4 ̖BJAZz|M<
G Տ\62^J&ҢOh#6 + S2ck/vE'^/x#o2I]Iu& /~ 躱o -24, <rI* o33;GtkI%вr
wguK¨'̙uw;V.2 dՇ(&%e#
ZȖwFQ.GpFvǽYP[ .Be"/RqYɫ[.l"DgjE o$ikgr89o%د 6A`A<A46l;p cӎx-Mk,>P$\c>R)믤ʀ,0E6-X vSx~g
=ɬ{ 8L.$%¡G jj"H3Dpyz{ӮsK?l.(YUO] QE QE QE QE QE ?OP\ oc- KT ( (o߃ ]tٻw c8R=+ wX zg<i-
'KfFI WQkQYgذa ?OW wX Oq^bq:اcBI 1?Jۗ^wvN`U!C
ϰg9 <? ? ?<JPljUj6?l?Om;yƏGu '֑#3g-ы^^_ <?
;XE?BM ؾ H*qT̾ ( %QƭΥ ̛!N7Ŭ%ql'eG{ < Q4!U[ؖPD1Pr=ͽ]07 ?
} < Q4f?0}B26($RCץVRXn̾ ?/?ƅXnuo{ǩk,`У~᳐c;2yh̾ Cb?{{VAo%QWmÞ?jDxȣȪٗ GeGJUWBXu\ Yq*;PUNM'eG{ < Q4҂w%rP/$cQ\pQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE W'ζ̡,G$z 23296m$,c# <T_6% L }+>{(:mad;T o t-w7fc*.maas%w/9n lz鲍szҢ'(#}3P1QH /Z "L9$&W<7Bj*'# xCLr}}0h舎&dȗ_p=Qt8}?AY7`(+u=DI;w
((AD $(~TQE
iPxg<ӨQE &( Җ LQ8R@Ob2)UB0
uE8K/BG#J)W#"E 3bl6#H(( ( ## n=+6繖Bg}z}sZPb")%@u R斊 j:(Wv ґ
- UA juPMeV`Q@ :RE QE QE QE QE QE ?OP\ oc- KT ( ($ X KD }
J*VUQEEZVEjZEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEjCZ((AD $(~TQE
(
(
(
(
*嵚 n"OL$hdp?: }OGO {-b3\8D OEA-f2(GRNeOP)e9 K]Ea s6?n<wM,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*$4nFp9jz( R߇ -: t )jQE QE UV~jaEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPHN9m=2fC?2&);+iG'ou¸ ▹}8#ҿ:G =
۰̎I O [+n2;+{o_ o=H? Qou¸:(>#ҿ:G =
۰̎I O [+n2=T. C7
Pᔂ
z[S6j9C%1 >gm $&$պܫo(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o++r
:@4k> ̨ 1_
$4܂I#8tWQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WS㸆S'') ƀ-\CRO@ o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o)Eݻ 4Eu*܃@*pAhK[nƛ8
41 H(~m o*WQo*WQo*WQo*WQo*WQo*WQo* r(g5%Tp2o 9tv`t϶?IfILI'tWQo*WQo*WQo*WQo*X]۱~LdWR5
-n EPT!~ঀ(#(AD $(~TQE
(
(
(
(8
LȤplr*qﶾu!spNKm fQ}uV+SҭKyþz9G J6ϧ@y<$kԧyu(t pw }X)5>I?c[|Id?5 ZAIgx`Yz3`v鶚tFC;u " B a<V<QcLq
Bh: j͵E|h8v[عNz Un"Λ;sdժ^\;n ZT q%&GS
u b 7 z5Nm q $ϱ=VK,k Qesߕ h g% OCҳ5<>lq nك#ֺ%h$kۃtk{{x^X7s02H
SR-%ɇ!r1CWmԡRU^2.ކ"Nh^Yq Ǔұ6gPI (u5/dx,pfSKPԵ%7,|省ڛh|]Q/pO뚧3b<_J ?3 TŎj_ AN_\E pA9|| -i}l_j 5]NK7Dn,ia1'
lG,nBM o l0LzV \ oQU%3Z3utV?X(((((( R߇ -: t )jQE QE UV~jaEP5Kۛ("kW(Y8ǥs4PG Ǵ YZgWN[S }SJ oĢ]3j~uiׇdI'Qӵki"]BmD%7s=}i ٴ
P0 84Quq o+ D+v&'w˜<g}?].=:`^[7 iQEs^"QX$!]I82:PKEy-彘'Uk_j/}qu 1+gfk5 =FާSoXԴWIО8T4\dh ?{1wZOu{yg'=6o,Bgr+CDܠYOqZ-ex]NCn# _7_>v?{ ʛ۫7R*W|
" uc'ҐyOx%T*).u D$ > +;KвKa ? kF
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
7 BX f B " 8*(
(
*ͽbO ۛ vW+r[8 z ִ.t(ƪ4W4&Z[Nʸ b FG# %Xxd Lb ihX[4cv=OY-QpGStSn=ٽz61 pW tva? V{'taEV1k_^HAH=rJvjX5}:e Q`4K77:4Ko Ub AHgQ\D+oq* ݎFI U ypj7/$vm !v䜌c@ e&k2]\QEDxon (ˆ:_~X H[݁=@<\߆漶ygk݂0t UXUV/ >` *Ue ?_ʭPEBQC+|2qP+2c!-Q$1ږ j5KO Νs$$VwwK: 7dF眊C:+zT%k۟'28Oӵ+ Qy,l$- RWs J+R\Bzy
fFsӌbKvw; do\.7uP<44W1xV_ԟQI0\In
(sT@ ]}Ɨh.R."q_ܫԼ89qX{bmbHK|gh=դ/:ڇimő@ Erik K6.PUo V{?U dZ_쟏 TQE UK,a3N3 $ U}f)g[yݤj7 }4QU/.%ia"c''ӭ [@DY)d$Y<<Ixk35[a:}qzP\7<i Jc#|2;NK>[\4 $ۖuD KTUY#pp<2\h\_9ydz(~(
_쟏_ d /@ ( VYcWyo3 /1M+_Efi761Md v9:C
+4e ex g=+oh%afavK~uɠF~z}l[M{<gҳ|EZjv֩|,a6fs ^F/Ou{IB; 5k3]_"2:wJ (* 0Z /V{'U dZB@5 +cc0!F;ݎ4'M]ZH=UFn?Vg
=-n%$:(( _쟏UV=tj(C_M-QLG(AD $(~TQE
(
(
(
(8ƶSXBT_=E0Q |;58!W1 ~5jw.ƈA`8 z*( w^К#eiBq]kOﱶ"pWU6>mwO͌u9W)F| Z tU o-VMDEpTfEA g)iw4F׆ݷـ:A5o ksu dZꨠ. [hv`mo9 . )?,(+|".Os} sqpQ\qK;ף ilZ1F A Wh nRm t@'otP=iM1pq HZSl, s8b<U),c; &%!'"BDPKE QE QE QE QE QE QE T?[u=As@-P((~jOT( <] K )ĒhQسr ZzGy{ 9ۻ<}EOX gZ-I9:ɠ bĐúI I0/ϥt]xe.{l 5 r_w ٿ>+Χ>)C_Oʺ? ^ݛ}W3mᇴ[.Q>Nއ7&մiq{\+eK(+'$gӊϷ_=石y_nz :zUcET .D2@ Vq.g̠ t=j?I8(Q'?+SH JO+ێGC =q
9
A⫨;e`\68 Zn\ WCO
@z(䏩@OF8k0Gc9Z-ɴy[vm\DŽrf¸ \Es ݱ=rN?ZH+"~(=70L.. e@ Zi ګ|/?û9Ǹ G ?:]:$}J]ҳeyoYIi?K"gAq#ወY_1
<sZ]?e0._v= sԺa-f唌}}ʎ4/Gnl>] G ikcj% QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE &o+b ЅLDpTQEyM\H#dh _6cv˂A85~y $;3 EiV!d# ttϽquvp+dkFN On+''5Y4Րy]ce
g,m(b$d: ս/0 ڹ֭Ֆ49c ZPCd{
v 0ɖCĜ5PM*'aSua{ n XrNRvwDVwGZis
Uc ^1\ϊ&AI=\Q 3y1fGfюzt/_vdQErkA^P phu;0J_쟏UV=ujN9#IQV u s# }=+V.~T c_ | m[WM ~_Й^YE,Z4 )o4fN]ź~
Gh7q+9~Xve{?!Wږdd2\nb"d#QZSՁp ݰ
FխP<ށbs4F++siqx$ w0G) AZj[J<-mutI{8$O
|3Ǫ3HFߜ1 @PhNh5;xb! IJ (? inhrY%G5 K;q9jzh:]ңBp uUb ?ʭUX_U>` *@` 횋 5 -Oiԣx^62buԼQVl9(aE rrsYT os NYl
~sL tA9TtW*} >{hg:r0+pdbYڦ{6H)ixo@?ϴZtb xn0WxzS\Xp gqU5o glr L SxATXGȀh?Cs
4* k
J/
uY ""FA"SنFq{fu}2r=2B gc.O?L;[/Qq26Y `'vlɣj_]]/!v1MVPƪ"-pَ[{POccm.ndvb_i6fZK4 Iv~ˮje(V(#^ {bEjs dWgf w(_C
H~(tq
Hu5\C^l0ji. ebA0y=574T`˓<\95e 37O;E';B jáj \U1*}yS]Er V >+uhe 4 V=uj dz -U[/Oժe : EP9ʖe`q^r*gkenJd,hi-ڝD A*@'5oU1A(5B5Ķ<Ìc'' Ze#%9A gv#<0BR3ltWV # 7fe=]f2鍫
.B0#]&$p٬, # r2{'uImNYKH%0>AaI zS>Ϫ4Zđ۠?)|*/Kԭka,^xo"p~MQTX #ҲcTկ-mǙ0`apy(ZM>h&PHC Z`B/FrxR;y_ν2#O@?Zѿ'ՂDRe? HGCrEP[/O/| TYDz~?Ή TQE Aqqq1ڈ2Ms]qkO-}Zij"YylAbkY#cUGGn"[;w+M áMMVy802#ryS8Rk k]GS=s>zV=z4W kBczp<zWkx&M,\>_ }'ڪ/w:phqy$&c,|KY}TDVH-B.]kø FRn C+(''-@ &[iEkwڷ<)qjnnwI-9Fx|c8>]_&J21vs\"4H7 `o vtQE U>` *Ue ?_ʭP[/Oժe :@7V۫˩]ök}.+di(*~O{
-%,WR Fk[DmCg gj֛љst4.Sx< 5{2eKau=bO<Pq]G4 nثz;U=#fJ N5ɟȝyU!q$ k~<nW6k~ݛ=+b
֟ϝ8U}3Z(Dz~?έU[/O(
~C4QE1 (AD $(~TQE
(
(
(
(
(
(
(
(
+14}:8d"KsswU4}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=[ NO;FO@AsS?[tKH:R( ( Y'V $*H((((((M"n~Ғp@ k ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( +_ T Vdh* je& 8
)Z(( ( ( ( ( ( c^:
+ez]T:nk/Oժf@GJH#uuQ@Ϡ9vGOd iӥQYݱ1 +Zwb
(((( 3 ZM" _T Gn
wY^=̣*q @_ R`i}r= ~v+j.a@T`
}P0( ( ( ( ( ( UR @ꭗ{'T B#%$(Q@Q@Q@Q@Q@Sp Ae :% ?_ʖ@6rhdn $ P(JZ(0)h
(
(
(
(* 0ZC]Fn*Dz~?έUK2"?RA [ah'] =GSQ@:M8v>1xIzZ(Q@Q@U dNΨ*@Vq 4f(C_M-QLG(AD $(~TQE
(
(
[}.5y~fcAЗ gkV V}Yx{\@ v8J SM9
WWPrd c^tW84| κfKU0P`: }wLB © iF2c#&L 1準x@F@ltX.]p1ߝ wk\Ҭ1K; )x6kn_&l {^@j̅+N\%#r~@Z렙.!I@QTK܁i4-VTl}(S$"C$*' >MIA' ~db_ZZ2%́ }@(}gMȂ`\@5 ;@I? fYVW,95
W&G>S>Oz~Yi
fc :[.0.x 3EPEPEPEPEPEPEPEPEPP\ o? F:RB
(
(?IU?
R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( #<R@/r1vd
3J ?lSȻ 7 < ?4 7r.cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9aGm?A[ԒOkB)a2[) } E1~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~mՅU@F Q@
eWXd+o~Q@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m >;xb;p: * -uz(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حrƬ@5\aiP_[s4} E U?S4} E U?S4} E U?S4} E U?S4} E U?S4} E U?S4} E G Q1IEw:Tϱ[s?V
bƏ[s?V
bƏ[s?V
bƏ[s?V
bƏ[s?V
NBs՚((C_M-QLG(AD $(~TQE
(
(hAK~X =:'zHqu&NPrx ?@[TF._1Ixu ZH
.A#Zi:tЭ»a}@=j˧]፹g~# ƫe (
یdphRB10 : *ݼѯ/\v< ?]MM[Qhbܠ$ cio\kD6ֺk,7
GOK}
[ S]i b?~Pfhڥ$}G~&ѯ 9 ȮQQB V~ps|uPڀ,]oon]Dݑ 9E,֘qU[}5} 6I @ *嵴p-j.p2O_ XmrKX^db UҶk7TӓS;BeoB=^M0,ۂX cҬjq%ΕܫsչKLw>P b}je1Nb_ b` [,1EiJXPFBqfjsaU8 ަ]kԮLʨP>=$Bc8a?j |,iCS{UH?_?[6zT]j`(GlKsߞTO i/= 3{֟`ip^6]pGSha
rU 3jk^tq(z3⠟*Z((((((((( R߇ -: t )jQE QE $* j}* $*H_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J~C4QE1 (AD $(~TQE
(
(
(
(
(
(
(
(
+15:Hd%EkqvU4>w6 7t}A%2ȓH?Ol2cpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@h&lX0x2*z * -: R߇JZAҖAEPEP?
U` Y'VFQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE V<p䎸j 0 bh?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j N; b=*U>` *@".SΛ- R ,? VحVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVO՜CgnR[e]S[/O(
~C4QE1 (AD $(~TQE
(
(
(
(
+ռA Q4V2bt}+pzUH-^I-̖( EEqKd p@Nz۟qWZkGoHw 4\ 'y%p Rė.-)t` hW۬Dacu?AV ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ $*UdZQE QE QE QY7ޗ6a,q 0 7 iي騮hx]uG -t1ȒFr=
1ܒ{zv> #aPF+9-*)ޣO |Oj@utV W *Wp@XF)oA F!Yv>!n.6FcԖ uU;Ŀ%dY@q=zj@Q@Q@Q@U =:CQk&/Yz7 hѿESE<bX:7! Uyu y SEΠD\IdJYIG =Oη ?p ТktE@ʒ{nCoa4FdD%Fyf6hj;O J~a5n9cwDǨ9%Q@Q@Q@Q@Q ( (KVc/?)y
>5R;+m҆ xzR Z6} Jм%Τgr&4-T<5gYgfYo%foN(Qj6J 3Vd:q
O mC :4\z)aM'v?-iO6 [8| _&{ye!8`)o&I"gβlutr OhEPEPEPEN{[km}\#'%z {+" ]鼶a6qT/ 7 iيKEfiƝ`eRç'Y`Pen^nvY]; BHϽK5lnn# t4U u ( T \ƛXIogf!ʹTc\ZV&+qXnGˀy_.-ZL29l* ٢WVFsw# q֮EwgHUf%dx@4Vƨ g[RWuvB[M> \@W'} |*ẍ~`s\7= W
)K(8GCH$HdU$ >.Yi| STxؚݕ}U~QU-/-: U ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * U/| Tj(+"]{JCs/]ϏPi5T0Źcd(-ᶌCnz☈o/̴d:*r]8ǫFrgz miI]
3%OQҋ
OX]]7ʱ²\o [oU?Ңo 綗 }Iq 2.I nMbڛ"-<M/@mCj6vv]$m\8[R˂93|3o8Cҹ8~h33%*ωD^]jF+tux+ r $<PcXu{HR9fH/ ( ֎Bf[wn=y쵓&fB" A^n{k-$*-
Xt'E 1 H23 qړLIY U&LqV&imɭ%H$
?br߆v*M ;2Cobz ƀ;|Amik3aHڤ )w[ƒyUQ.K;D[,vE Ql/IM2EN苐yӰ FK'hd~\z[F{{-D)k1Jvnڅ@7NI
xqFw8YhѐVFFݓp8 wQE U>` *Ue ?_ʭP[/Oժe :@a:V$<en>kleqyDyFpzSBf>"eAZ';D*ȡ8#^uVCU¬Ho·<8(.^;ivG jmufq%su7@$T|saoq&7I9ǫ(&k &}Qiguv@H6c :vTjh7\Yf8SSj:e4y#1
'' t=jӵgDFڇq 淧K f BB'-4OG,{&]a;[F<Or9k3e TWVW(DFBߊ9-՝N9@#{Ne?:ԯn>զF8i^9~5xҤ12#.\ y<7o ֓lO r1 U#W#}cmoيFN\g z4.ѭE2g ZTՊmە8{Vb "&;_* \1~3֖<: ]Ԍ4.T$9OKu=4e?7[ଶOK3߇54^Eqn
~vqH99%kD̥,Es8xh,{8.% 4 Vꭥ G$F.j V=ujDz~?-QE U~B )%)(AD $(~TQE
(
(
(
(<hT>T-Cq-jP1r
7ۭ;p)l+f;M 3QӅ<By_If壵% nidaL|#K -82t6m/!;s\babL8gqni)3\X<a;zsiNu"08 Lcf~6sw⪛aGw~ȣ8 kMгK7gz u
i3EOjuaKEIb$UU$$v ھy `z'3MYmْi `yX}
|<:W4꺁 7y ^7#I"}}*J `\@F}Sv9v[" D " Kۥԣ ьvqi_HrX'YR \ZJI%s~?TZjVWċY9냊uy<K
43<֫݅ qj2? e<o^2 vIO*<~dcc z[}][LI4r2ǵcO6b { ?b0E%w۶hkS,8?21՛BC]HwNs\T2"!Lh-# ZF|=j[5 HptJu-1 =x {kV d>1ZVAmL{ ljc;( qiB=~` z qYZ:/i3D-go7
GII 2U.;
ԁ7t ж[ ddXd/^p QBK?Xϧր6 1VzUִ˙ 2+UYSWB. 2< ޔq4Wd#ӷ?D4I@ Q[WHd0} 8x $?t<@ $r4k,D2#IX~ 9 ܠ( R߇ -: t )jQE QE UV~jaEPEPEPz"^ y,dg9@}k;LZ5Џq?.ck
KSvqgy*|2,Sܜw +[hgɏ!?m_u~$z'?|~NՀ[8/ ?^ 1d݊VcX;@m}7WoF R%'@y`;sxuyf6*ǀLw ߊ& EΥ".YY#@ AExd &Q61SߑVުwQ1(o<(ǩ5O
z&rڧ0|BxU]Xw=.l`@ }.xWQ@HQ\N:#0E\6k ySMI»^O wZQ2G;#ʜ >bL䵊In$Ȥ$}hoOL1
S)OJѮJJS;,]qں
( ( ( +ՆK}~<UT1rx<{M5Y&it)-ь',qG^@ O[_Uz"ԫ :+"ۼ@>$f_*Iy.<ͣp8PMqf[5 ~g?ŦY`Qr{;t ٮu&#lJ lN75}
ֻpz<L#(.~ ǏҺM7UM`~c X\"<
A #YGؠ"(#S]f-l$̘Tz(>jVEۭͬs=Oht?Mνe'mojUkg8P \u"`X ?#^kgN[YѶf#
(
(
(
(8gYեT0 ?~?:c m<AӶ?ƪ
丞i`QMg - ֈk],q{=]y?{M6! 3vN8?ʽ>Ck$[t;%܄?wnlj e۩ea n+״弅nA<eOQ#5`j[_Bm
&y!tԔlnk;ț[Q š(LNUA gZhUwk Aٸ=qEPnt\"鰎(6 jKׂ(A,@mv Kφ6GدpfmspSjIb~
yǽrj\htcHio\ Pc M8 D K;} 5&pECF?xqiol㶋Dp: cD]00{ 9 )
oW_E+\ GV$?I:~f9n~xx,^Vk\ PX@%ӯ/VKKV2ZMV]0yeڸxjtٝlIo4v?A-c&yZGILgd`q@%n j<I\IH< QE QE QE Wdti] j|QoWJiFҜw4K h"u:U-ŴRظ$^4ҵfIo^8Vcolw;dϥkϩK/stD)AݫfR H8W'$o1y3#WWyh/#e9 Gj[GcW{474ReNǎ21 -(9_5}U 5 /[Ɠ{[;hAyi#- Nܼd5#:ˈN22Uzg?Jam ]N'bO`:lm $>OjtPUJ$0z~V.-<سc +RC=?:i
l[b1AW= esikxYbtm8
ڭi.P y<w* ,i
K<r 8L\iie > 0,r@m .WC fjcpUJ -lt{i~wǨR
i_6$
H"Q=<
vǽ pۣPa$JNQ:n kjR)R`!v#5cMJEW$U{&R} SU/#ѵ{ U@ 2,Y7 q Q3.
3]yhgv"cP:Mryx *ϽjD+tZuu aha|W ǿֽ^^iGk( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /V P(9}nuVY$1@@x-^q
BkwЃk ]JC!k7]ɟH"-Nto+ , I'Umlm,S˴c:j!7w1*?7"u+{Ac
Rtͫ~ON;kh^? F Ls־t[mZ+ffXrr :=p)8كá# .6K tIlo$ӏƺ]I\R<gmJ+j =C_~v͈L$- ?'{ U'hv9=%z I<{.?1;Z ND9}
l];dr9@< &xgUԯ4"3
G w~ ʽ. ( /| Uj 0Z
_쟏UV=uj+L:NQ $dZaеk_1l/*7o=I47 ^`xP r9֗ Q (t-f#֩2FWQ xH OR_sMc+NC$ .8}+Z{KK[=>MƎ` H-QRQ՞Ŗ$U-A ֆ hAr3.FIv W]E y yjד7ٮ$+^*ڍ 5hrU( k ;} pkq-|hiY }+Չs1rC^QOh*0"8M?ZӴkJRv(*`ֆtu=VVH\B N88 +TL~#
4q 9h'@F n$ E^E R-5LO ;s9 P=jPUl? V{'Q@P
T!Z((AD $(~TQE
(
(
(
(*gm;Ls SPϥY*f q(-Kh<A\@0=^jz(-W]4ק<\Ugޒ? sV1,1$)QB( V.Wz8*4 ,&+qݑ4hn&LdץuP4,c<<Um]:Q4q$ZPCcj4>ilF1 ei$`ƟtdcP}gbY$55͝@ b9TPW5ǘ @:v`?jA Bm,q=*j(4
)A_+vF9$ Nx,'8d"!99ִ ҬѬ "~XdNsV&Wwӓ f IpN0B3J}M$d3}P+Z .g5Ђ қyߐnS,E_)Cnm#s\X4M6U8r!~ֽ]-`KUĒ N:RCiĻ|.Iy4P{khm!8'zE QE T?[u=As@-P((~jOT( (њ 5;=RnP26n1 okjt&N:15UqXZSHU$`2>V`f
:ecS) @Q0k6E0mUaGoZ4WtD=fkh Kh2I<}MX
鶱X6,g>IEg* |њ gg F>j4 QFh Rf
(
S/ >h>4
{[x_GsV<jɈ 6br>VѴ~lYGOE! ^Zl>: >r* 0$*I O nm{iAッV("PFO ( ( ( ( ռ=G-`84
h`H)݊}p$e uEcɡiNn.bű#3(ϢVK$h
X0OKE/8amP!fzE Qӭ/6O0DIU$ V(3 ((F
=1RQ@Qh (dRȥ
=*h8nH }!$vAPee?tp אm-ZĻ# ؎jei}@91_իK[Y`>f ƃ@g[h&S3٢ ( ( ( +X?gx qVN6?·6
̨uDT)?Iխ-2N'{y^Us2yN?uvj" cvqQ]%.7lHV+cqW(Hicic iƿ쎿S5<*PXd*J)JNQvI>*Ѭ6$N9PnlkV c6ppy"YV24І28
Yرɭ*(ifKoW;u$] ȋDnI]=',k4mk pjJ(2G4XX3Va0]$Cه=
Y ;`d^ Bʜ=>ڶ TqzTj:%3/ GEzh: чOOs]}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPUe _ʭTRIJ GPhZ*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E $ U v.2X
_쿏uTۺh\y#y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otPYDz~?ΐ3
LJ *ʨE
@( W?pS@KES(AD $(~TQE
(
(
(
(
(
(
(
(3Qhdw덉)ݓ=SK=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE @3M"<{Qqx튞( .ԷzK~ # )iJZQ@Q@ ~OVz2MKTETg(g(>jwmkw(< A\" Wywg+UQcXxݞM >T-Ϸ>Uzϛ?QG?QO2~ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ƕin w) ϨywlEg'wsxAEY語l E l EIe*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [O2^CS@KES(AD ~OlNV
br(EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ oZԧ9&:RB
(
(+/|JU>?ϥ[QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE 94 QUM'hXzD P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [p:'X( Vzd?>ofM-QLG(AMe
֝E A Hd H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE Az (QE QE V_ >n/|JR0( 8C#0 )[RhOο@TW? gW[wn^N2ш##O
*(dgK*R?gv )&nv(V=gq:U=?RK>fH1ڻv>E 2AJlH 7| U Jڙw6@U$ќ
{P\}#)5"Ml=3 ߢ6i>yϿFH@䒘 6E"̹èaB3X+I ̊H, {O~??:VeeF# @=;Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AtHy{TEU
~ `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QEV@x?ZbEPs4Պ|2 bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPe V u#
(
RqVL$x%H$\q,{R?.s$
L@#^1%OjQi%M7 8/?=H5JQcGw21ĖQ A 4r/A \$ &]'<W-,ɨC8? Uq ꭥgyo n 80k< zg8 G
@}6_ ێ bΛ,6u06Ryk
hF7OzʖQA3 Zݽ34 ofBI+ mPI(Ry>5/$Jڹ`aHQޢ+ iƎ/ h# o3A r=u 2y_ v \ CavrNP7xۜz4t뻹 hJqsRff]yQF3|Yٜ~ G 7$htdT2|sEVHTbIUd=k88U 8 TGS1@9vQvaXr?1ڮ5zȸLqӊgm:
:8-H
Dr3| X2TQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PY\5mpg1ZM%_6OU}]$I&#P6U ʸ$8IR*pAfG ˷qg7F/F ƟXaՕ(] ;{
g<sJ ݢ./fK3 q?ƴ-Vs e0[0* `C Sk:khyU
+; b + ի;% U/.Zce uN}-4|KJK O@zQj$ 5)VR7Lr)'w;v ע%q`Rh.LF` $S1; ˕e?ϵ iYI$Vѱ
{>֝ QE QE QE QE QE QE QE QE QE W P߅X QE 2 b7LX(#(AEYbuhRȓz~1($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?L` 3EuQLAEPEPe V u#
(+[%
o)![pz Qg>\{<qMP3͎7{
~?Mz5A>vq[[4OTO(ePцh֑[
,5}> nYY~Vc]\qE
P;( ~ -? c =zt5ŤɕMv>Q@0nw!F >Ol mꨠ
*e ~+/RԴ.# eڽKzVB-5
? cFx #ߌDqirNHV $C OPFAP :PV?j6!;ps]Atx 9UF̪@B/(H,>Xv-GαUe T*Wl@#fP!Z[/j(n! bą 5yq t~Tyq t~T .!́L cK@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PYpZ(
\ ʪ[t& (]b-Єb7Z7bRyϧJ
@ J6w`gր0nUN|kQ3ߢ SjoGrLn<pF=EmRV@8@Z~'*UdL k>%M>>镁%FOaY\tonV 4B(QYz$n*ֵud[e¨"T7~Bݥ$68(y,%tv<(5{T1ӿֈU^伜} 89<ye_8 tp+V kktQSW14 ;>Q
s$Hb89b w" 9Պ((((((((
^C~b
(#YCS Vi E(AK))` Y'IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԟ§.ԷQEP((
ҭE VFQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ^=ub*yUUTfʰ
wڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ K
U$`I?ҭEPs4Պ|2 bZ((AK?
JX?IRc,E5*n W8|Y #ѯ'[kyH(? Sb7(0 d\[ֵ|1?{ JlGaE((((((((((((((((((( R߇ -: eQT ( ( uO!g ֩Hh t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : Ώ֓ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ( t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G hi< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEG|hJ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G hi< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEG|hJ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~ofI,@<S@KES(AK?
JX?IRc,7?'jU/Rڶ9 !_ 3g
+YjP]Nc d=>䭹dT{I '
j Wk ?$ j/W
ژc{/֦V v oZ+,"YO{ q]WB *`ٲVAERQEF
_ʆnך, ypbK(XvMVPW1
XWۜ'O&ُq pKY11VKd3m8 4"}y۷kf2D +H+]&8)9r0XP Kj9g/HK+psPԗO^L{W#?K EED13ɼvހgڲ'KxѭI|@#O5h8U OKI t(2[ӿF8 AHsZ:/Z djYb$QH'lVdڄjQ"@ ʘlV%݄r U YR'@xn P ǧ u)5A hU\
߇k
wJWHHp84O)5\y }] GS<>^1p`19'E QE QE QE QE QE QE QE QE QE T?[u=As@ *QE QE A }JѬ գR0( ( ( ( ( ( ( ( ( ( ?G *t/SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOT * ((((((((((((((((((((((((((((((((((((((((# ]'z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ?S z(
(
(
(
(
(
(
(
(
(
(
(
( t I U= QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OPGO 袊 ( ( ( ( ( ( ( ( ( K~ ΫU-:M-QLG(AK?
JX?IRc,S1H]RGR7 'RψOjZq[=:;a+# ݮ?
uJ*:n]WP;9jI ! ?Ot ;(%aɻ˩txn.[| Vs^h6 I\; ERQE/_W>P|>o*HbB35LhZHƀ96Xl
6;1]}E$O1'S 6ґʰ9R{v5@ o@genl n*کIxT<]Ŵ7q.r7Q:sڳ ?<@ MIno#9 8j\8cMѹ9' Ȋ " 8d!G>@ ݪ٥[%tGT'oنE O~ܽ܉; 1 A5)G=
RX,!\H=2=%|5Gǡ6X'8jo+)d,ų"<:PO_X "[oH6 _i-+@[q z(((((((((( R߇ -: eQT ( ( գY =FaEPTo }:!5vmy9mX?1={v4vmQ!,.{~-FKp=kI FaIrx>7wi,~L2 s$DAej:ݭK"1fan-F֘f!`p3ӌWhL,a uNK NF~G[R 7*UԺH/R>ѱ_]=MM 1 dthڤQ^Ah2)u
I4d/уҸEWV1Yc7~xn}Q#*œig?1Si )ϩ2XpGjaԆ/#CR!x-ǾG_6m|֤W>n8 &Sq s ןi{g!Ѳb<eGnkoMAτZFz1` @ Q@Q@I? ?G U= QE QE QE QE QE QE
&`:8 +
dB*r?:/lɎh?p J\UDfu>LoOa@W#/y],-dsׁitE8PGEbG6\l+;Si:hsz ԬRimt\uYZn?yq{bf} mKaHO{ot<+ ]
<q{nB;ce{ G cP}*J ( ( ( ( ( ( * I U=A ??ʀ'( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (̙X~-Qԭ~c-Rr?Z LHX:NAEF.gwNxZ 9;#T4GSqw0O</ƀ;Y]ƹX3' =ϴ-A~xw$7Qp(ၠ]]C dЊ}rkJӬ@"_0}kOWΗL#76g h^¾"vML U?
B q@ ]Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GO I U= QE QE QE QE QE QE PiaU#s `zZW$P; c8'yy./qx͐QI_=ʀ;& K6 j\w
[l ήd-=q-tGIR¦>'%$Ccw?Ҥ2
q=a #~˫[I12䂽{?ʪjYIr.$r (GYdC`>Ɵ\~$]}@YUǮ+((((((t S z(
øm+uؠ IJ1 *+5 -ԦH Y{J ?!}_(5(H!C k?ܕj{hZU2JU\{ .k WRlb7:v AMvõ]ʄNW< [U> hZ )0 kb--乓c?_A=π?0]9x8
'ר =Nӿil63 jm]:hKgNOr-o\K7 bEpN8,';"SA@ 6conRɈj52Uw;қJKOh\ /N~fQWRU%ܞqP_ku{=) OJү4fF @ zO4@H,5%BCm$?h)w8U'W1Yq@ Q@ ^0[ɵ )az v8=Kğ u#] (lz x1_RC} # %u EP z?O@Q@Q@Q@Q@:mhGP ?[Y[5Df
=\m!
zkG :ոm=N;W=:7/$hyc] r
q&:JO[*أC k.]A-l\>і5M<@ AP8a=WX"a k=km>[<lkHFgH2Ȟu Y {h6P_5*jеo7M[0?^pˑӣiۆ2uGymWCr `v z G Iuo*)n zXYT x pqX 47YϹaDdo zEf\:moq.\dmcg^Iϲ,dq{5^eh\jgkwoylۓ8zvPZ3:q\vnX|ֻ瓞Ki@O#Js hC M RA;GS±&kDg 8 gk 50 YAo5Muo\iV3 ;H SҀ/ S | bI x~ylo6cs:/OIPd
+~\hO\>hA=B ǩÆfO{*]<8P2qCZ:$Q6 9 s@QE QE QE QE *t @E QE QE VcHi g]۳~߅iם\MM|7y͐Ts]kMhA3RX6
mH qǹ=~zeurJ5&y^%َG7C
ԏs@ YIs'Dǩ?Y3l°Kjd"_ (ڡU)oi NO@ &Y1R9֑xyK"ˏ W}a Y &=RzhQ@Q@Q@\ oxՊsU V)%)(AK?
JX?IRc,E !NXaCQA - >o <= UQ S
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.ԷQEP((# {VgG CQ@bzևa mV443j-JŎ<#?6M4F B14RrAR{u
TkhPAW9b{ɭ8<:dpà buY>Fr6?PEBWeX$ahVo}E$H (`-?A]]rEG+eP 繨mmexA
;n|9
&+Ir Kt'Vx,|<.K-l
[߁/ F2 mƽo^ڄեd9E*[^[F@#oO *"_,"oKӣmD+˞]OzPPa wkֶ^X ѱ
G~նJŪh@0AщO4hViqhr?#@m/<{ev2.;t,.uXc(䉎_ ; gF8
FW-?g f]dy# qz ߢ( ( ?G U=A' _ʧ((((((G y
ܪ6mr622GC~3e5jmi9 HHk]=N{H}:E2NC7~g pB}2c =+k@o3cz?Z۹д˩LņcT*p[̶T 5iH Ҏ ́^cl," ָdյè<&(9Q:( w7g%ʿ)Z誝yA{( p8* j.
. gs, UmWEӞ9/ ݢ( ( ( ( ( ( ( # ]'T * ((((((((((((((((((5/Q!B?.rҼ7l #.x.K8R4da3_h \=zUo]Bx{I0wnN>jl,
.Ӯs@ ~v{y_*տVo r[qz w溹t9XD000s<?Fs[?s@ $#c [-d[Ljo~]k4aP RCm%E\t,I4UBZ}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Ks̡5&+xu+: ~^\hW{Vٜ"9iU\=`<F?]/6f`(×0ț[>]OM6bXW8
ww j M23 UqZMv& b1
طњ3RxrT1˨Hz PiZ ^U&p# WY\v"j UPEPEPEPEPEPEPPGO I T=Q@ eWRJR_^*nP%`B}H^4fX^ Q\bng dh)SL[ڲ1 iof,1
~) Bg\zԲѤӮg9s}@1nG_]Z 2d i Avw{~cwIo
]x< ɽ[weH MY\QiT܀t:75əc9;ÓZ:֟.hR-pZ rѾ2HS0r+5eڗ<s#(=~w;)| Tl?ko'.Y&w?LԚ 3<~ImosӭtXam+)
ujP&fP7TCգ s) Iտ>>x
[W
^0# ڻ%-"[b0) ǭgYh6Vr9vn ONj]{H-q O [\Li <}C>koyc̶ hu't LMAZ
:~n'KO5xz
hQ[K}i!9, oZޣn@`ww_Ca83n }kicP ;
<) Z I_71>h ( I U=A ??ʧ((((/:UC
ck
/>Q]{G}tne@8ڠVlqt&Qr#1P9\H<aƿ.; ֺ:æ-`
C Ӫyܿl ?5q'=sǩ44ꩦEs$*' **K/Pj6eyW;DG?@w L:7.&A}#}Kke p8+b ^anq[9\:U NM{yXg,
Ҁ8ۿ2[!&[%#L d]e݇#_ GOB~-(; ] D!B"86m: /x~]ճzeފ1m18,`{gW7c~] KfE?#(9Eďwo=q?SeZ Ww+ޥL{
^:]]z]L` sx|<cQvd>8ݭ^iIy4?;L1ٽrӒpǿ9xtKּNTct %g ]kR ۞Hj;WVӥ<-|sG+TƄ'@ };`5/equQ9
P{Tmjv2I2ICaps>x~ ; P$סJ 2c;!.Z /t_kKE Ul-x`zgGY vyc3P(
(
(
(
?OPGO 袊 ( ( +[Mqn !nI }2+ЫD=d\p@# }>R8܌ͷu~Tbq#,p!M\n{ThVl%%eQw DQ1H<q NkcWDM*` $6]JJ>?z[ݜ@g\zPavƃJ3ߎ]t<;?O«geAGJ@Q@Q@Q@\ oxՊsU V)%)(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
( >Z5 }ڴjFQE QE QE QE QE QE QE QE QE QE A' _ʧ$ ] T QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ??ʧ# ]'PQE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEP?[u^ b\ oxՊh hb?(AL4G3S` Y'Iw١h4?MOE 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(CSCDYF
\.ԷQEP((
HʌO ?UT WjF3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)PvC"gK < QM?ʥy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(l NN23ҬTIOP(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)PuA#dgK < QMO~ ʥy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?TK$G!98JQ'?@e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE WY$9 FzTl ['Z g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/EDH$rT 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @FL\a V*Y ޢX(#(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+| JT>ϥ]QE QE Q\ ,_ҹ :+(C g tC 8&=Μ(7I _ ʀ
(
("Ե Oƥ((()h( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'(Z(8#i`hJ+?iRH#= U;KtwpRPۿk@TQYWZޝg)Y2PN>EWζp}ٕT @ EbE{im++t 2(h6l/Vq2n3P( U;=B1#8'W( e8QI <)<ygЌQT5 [koLp{s@h ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
(((+55[w[
$?g>EAmpP%`qZ
(
(
(
(
(
(
(
("OT¥d$HdUX )*@
*ݽ>}ÅO__*IA'H#? iHX(, uAiw
"JG# (|C)*e9 UM^_&63}hJ+&\mf0K'88P w FFr=++-'z6訠;VxNQA"DIUQOA@״$?ֶ( ,0'k}O PE2YRi$
ewP'*#<PTS-<j 4[ [s'o sSր.QO<V4ӰD^e G!nyH"}F`:v
+:Vl.0G ִ֣9 3I B@UkKkؼg@Q@Q@Q@Q@D_j$ Z KEPEj}KU ɣp58xY##K~}ֿ W(v_^٭c^}wwLD>)X.utWjPY-. sk
;QHǹ״[Ӧ?~{{f)QEcuvWbI?%7bdtQ@O(ՊMQCS@KES(AK?
JX?IRc,ELW (66Bf>ނ ie>Mi"[ا%\ܴ32
zGym8u>J4OA1G\{lSoWv=6(((dJ]Wy'Tj^UΥ"_q~n \2 ˞O . ڦ;X 0,b>+k+2ۃ8qҀ6W ndRawP7p@^':t[\ӵ zAK\NCg9Ԛfl̬r'GF9 d2+UH# y#$V5nL-6GqO r>ojͶkV+
"<by? wusE(&'Wpps;ϻ7nt@w60?&g}ol+ڬA#= MEa&26lJ[ha0e*IiҊ(((((((((( R߇ -: eQT ( (I?UڑQ@Q@ ,_ҹ c Cc Ē!$ck" #V
tUݝ͝>S~ M#@ d`MEv
Xkmڪ o7v~f ehwDlԒ[a
} ]PZȋ0L#w^b7[2V~ӛ VZm6[v0poa : usYq*X}}띔ks끺k؊`#8\{]M _! A5W B?k((j~5-D Sh)`lgbǮky (z o]T*@
pp+M
{f ~T 0ۥ owV# upv='*Ϋ.b, #U {4+iDDO)
Rv|qd s obX7I?6~u+-F KD2p ݞ9eP#P0 Ъ@f. Yn? :k˙5-^zvWzKg:r-5ȟSaX죎Vfd֣+*1>{co
]No"hV;qTZmƯsB+|
πyz (66LMX ?ʵt"4Csb98 [[Q\dӱϯj[d{#_CҸ%nm[6#9T
N:WOnn բ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ k?SPn p3;Vd3[ş! { }f .8UfUp{ Һuiv> kԵ
,*m9V.ck
ff
.>-̈́fj1a g ְ
O]Kuw³{c;F};R蟲HQYW0%< qӽ uϬv /,iFzt<DE] Jdz{me vPὲ&D`_=r7c=ӊсR
A'
S}j̚\zXetl`I t4GTN",0ѷ$}&3ezt|A`i]6xӭIc)ѴXVGQ0H
=Nl-Wc^ǧ\ݭ$m$4KLQ XS Aln,HV<S
fVw Z[]CfE V{hn.%HX E/aO A+$ Ik%/!?ζ>zznCǩ szϫE=" m ?]F o
s<zlnh~L֎?Js_oF:
սٮf裁{
㤷olon&T1]ͬzeg=KO I `3u^G";z*+xV's!QԴ QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-SW{T2KGW+ OrvmpW(>m_N]Ky#tE@wZ{kb@7 dquz4cdɥIY( I Uiˀ{`ۋ[Ix/&Yv(~7WwZtt +?SYX<3 ֦iHf8 @)߸eI q} 굟 fe%l .A'?U U 5 NivVրAi3j@KEu©:ogJUSRUt8^V ":`t=)i5tPN(((((((k-D_h;U}F^XqVf-OP 5cj}%xNvy$V%c̼ ZF\ǥ 9y.6됑e> n*a E( uJ\Mi۩x!B3 r[{ ,#`q@]TO~EWu? t *tz,^H 09'ꎏh-mB , 3U= c/Q?5M s20G@HȎȌ A;mo3NX<htgR<0kM!ҭO$;9 @Ym5[e",vW
uffN?tS0fFz zTxK"L|g3@q^ٽw "owbx&+w %)*At 4`#Iw}QLqitKIhֱgD* "]X`:n$HPICp1f_kp_3O6f:g?]- fQ@?\s@ ![{@7 CR ի
oMK%ydQVOA5> ʪ)EȠ AWi3jI =Ej t9m,]Q` 9LJ-KfW?upǥ \{+'K!'kyZTIP Y<Jw$[N[RKUQO ~#5b]ulceɊ NKh-~֤-&[;-qg&Byb
U"O̲;ЍȠoFQo+~D1[X pk~m 9ؤcFMd_Io(.8Rr=&s;Z FJ}zQeg ʥ4cOYO["05 j /uwyA 3O쯉# 1iEPEPEPEPQ'*Z?ֿ@E W#/ ]Һ|e UGq=?ki _Sķ:lHp6+8_ ^|S~ $
j MNZgVn]jBqQ^
$vC [qXvJ+M8--w}5yF2jbxv JH: A[u4AERU, 2 Їx[٦Mӈ?ȟk:^G
>d`I;{}+Hjڣ "`!\p?p uo'v]V>tm
J8 I>>C+
`MHcXU EdXQE ꚢXg T?4QE1 (AK?
JX?IRc,Ee4ZQdV9?(ϷJ{]: ̎A` GA}x0/DYF@נ; BOrrqG]'YS
BOּugаhQPOR6 # t*N( (M]jh Aی=~&M e_ ?/?
[WYoIDѾمS qں8NjN['OIZkЦ?\PD^D"ɞK/M,s ,&̝v'Ǖ$iRwd+O&
:.$u9,qϯZG 3?wZ ꠳#'X"hXmA1 y{*̈́ 'i<vsjƵi
h2ܫ>4I̓ ±5 W8 ˫,pR+XgV5֚l\.e#ok:Uхe<aAs
;HWxc ]NfB`S4aFmxY`Ic.גWrA J 9'$Y[aYwJz⤷-(V үlRQL/J6D| uTQE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@>ϥ]I ?ҮԌ( ( c wqiou]sH: Ǜh GK =O]'N < ?t 7'>gZtw7 ,j꿲t 7 ?yƀ9Vx|?Pnlm d o'O rs\M9V (T5d o'O sO# &*gX : \((j~5-D Sh --iPMTDE=p)PEPMdG 4( ((o* zgE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@ XV,=H( 0 CH6
=Q@5CcfE QE 7ˏvw9 cwP7 GRVh QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@6 z
ɽkI $%~8+^ @ g(eVX=
- UF jZ( S((((((((k-D_h ( "p>( ( ( #z )PMq: ( hD \( {ΝE QE QE QE QE SU3@ϠQ@#"ÀG4P ( ( ( ( ( ( *$ Z KQ'(Z(
|e W]\c~2}TwvE@ O Mp_A%lȮs4VAdӿ+п~F͵ FḿZ?* B }k)pY=Hf;DŽտtxMYt87 g'QEr# ZDf =e
=_7w=X
uC{!Xz z`+h" %6QbC}&G?;)7Rodƽ&Kz\۰79Guf+[TvTqDDǝ IYQE E? V*Y 5EM-QLG(AK?
JX?IRc,EZ]lmy@V-Aa:N,b6{-hYXjq`zckV7o{m C "(U5VFEPEPrG RU #( J 8>ԔQ@Q@F E #<ԔPEPEPj !?hA ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+| JT>ϥ]QE QE QE QE QE QE QE QE QE QE Oƥj~5- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@2H re=AS
:gE |?t~w "N >"3} E_ KE( ( )i((( T?K??EM-QLG(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+9u?'?ZX>keO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`Pi lO$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@Uͳc?̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Zbٶ}w`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF QV;6Ͻ 2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@t)U*?pS@KES(ALDGqS` Y'IwahL?
OE L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz(SMUNM\.?ԷQEP((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *?pUE(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(?IU 8CR2z* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&V>CUZ((AK?
JX?IRc,E*&v2IK\ s_SJoBݦL-gWs^Fq^+_}_ @5US++*
(
(
*
6@` ziu2)%!*F8
z+ '{ µ&f\U(ockE48=* QT# :}(qY9; \߶ x 4j56[ÞN =O@tUu" *~Z#K,P1h37n{}y QE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@U}*H((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ijߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? SX4 ( b|Պ|2 bZ((AK?
JX?IRc,3OM<d
uI`w_ 2A$ N ?#ookE=p06 Eu ?Aubi=N;B=\'mOU tR A |WZ{:[. 8[?k 71[ giW}p#8Z> gwu aK)tקVI=
ZQRPQEgw}JH0 ok3RՊ^[ Rd֫3([0>=ڱB q{# Z_\SxE{IxCw=[VK!ˊ<XwvZpIѤr|e>4vΛ*Ҁ9q #/1 cjӋL sѰ:U4Wdf _ZGT~8֠7ʎ;p=DdnT [Zd 2[e(xL's8o{ 8 A enb%2!p=s*ۢ K ;p Z3;BpofcJLg%t]Zˢd 85%2K`dyP1A(jT[WUUTv=zSK[Ff]eϥC͢D%b+2p1ޣFȺo 62;mEPEPEPEPEPEPEPEPEPEPP\ o? 2(QE QEYU}*H(*)&vڋ4-Mg' <s!9Y9W$uu+˜;4f*WjpPP(tl>`]1u TW1Z@"8Lw S$(W|}X?3Ul?/ƀ.QUEpNߧzoE })2"KOq#@h?zwG }
Q.#.E QKI@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@C;u{cUEI8tykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO) &N
U 7 QE G7LX! V)%)(AK?
JX?IRc,EJS B-&ҧ x?ҚOc<+ !o hn Ie=T0Ozu]Gw4ՐQYQE QE `ms.q{*؞\; ^?55ՕK=Kȃ uQ@ in3JSc}!N+*?
^TUtxA- 5eqiB5@ 6z^0UoQ8< vfy `D?;(VI WC:~f=rO[K$9h?OJߢ3RN%WVݴ \v] BUr?#vx1ůJm E\c)t{a=Fֽ QE QE QE QE QE QE QE QE QE QE T?[u=As@ *QE QE V_ >n/|JR0(
E/bң& j[Yyz xߚ.I3ny\ i# Ҝ\I~- ?ħ~ O^KSINE>b=J@$C)@NYQWq =}ooe!-FA,HWAd'@c j}1,2+2 O"4u/eWE(ѤV$#J [+/ItxeYZgaz o\ên}q W:W}*+ O
{.mQy >-֢tY?'z@gQCK"? t>ƭqGHÅ[; #G[$U ZOu
ޙ%'*ѱpr(#u H: ?5=hlϦ]ȱ ldKhU@c8hNiXFt 8RӬ#HYPBAjkْ=BtN^,npr
j˦jsa<icNY*$+P -,w1%o|We [B:\κ$ER6$9@owZc [Ϯ1}§`Ks-);_|~tVflbLRٜJЈ;s@ DR<bXX:t)UF T)yӆT$}iv&60u :tzӭĻ Tu?ΗI[F;?V EsviZJmk[?S~5ΖzD qPn{(1 ` rj>}\* 4ecu.. Y|A '${
Q/-6gM==*^i.,$ JP Ν mBڧw+<W8]\߮i'<$ m Ex^D
`F:aJzhu Zui6 OR;c.moBo ӯiwЎ Adxs7) Ewm23 AST%1K z )C_7-qWd3Rm"垧ܭñ% `z}Y#k[xD}a~5 #լ&_?Ə6op~һ1(0| B#p UX_9ᵂK,OSU ̱ى՝1 :,O&W&w_Bfᕸ*GPk?m_s[M4HpdP0qYm! d
v; (bNP■ނ{m=QǕI=?JЖ4=w:z9AamͨX8>Q8 } :tF8m*|}( j<W0 Y5=<|Hy}"숭 QGC}XYkVbog BCr6.U&qqo{9GR@ƺ
p5MP٤Rw]S)_tl3{wǞ]% i> %]_l ]ZM _t+F3N)1JN'YEVF&=kih\p
{1G w*æz5KX+t
.YpOjƽ{3̝2Qֺa94ԍF T'/VJ n9/+kuc% D Úo3YA
p=~n:T8ٚFMs5M@)優sW" t0r9+
KH،<C&S1ZM
Y H jR˺=+32GA[Uq (dYLd0:ⱒCx7mKuK@m?cE$x ,NzTv5#ma\ n]^\\RO<oH$U5-4\ӖePʸݴ 4 vW^M& ,T㧥i7,v8
`zO֜- jo+dR9E\QEEs]S* Zܸ2 ϰTc8 jY.bhݷ[
,ӱgg?I0*֧m#{gtd1{q߾kNE3u ո6א* * ZLZ%SIŤShߘkKw,QEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PU%)k;?(LX}RL{@ q?4 hS SMPu9 "?;[qݜ@ !`rLRT7ZkU]z3n#qwc@V]ƥ/! `b%UQOQ4fYW2
Xdd^ 5[P )5i.5fcTU
7-x
+.;饶 <?yO#WmYd =C=vZL(ǩ,nd`!>5_p eEgO{!Z٨y?뫹btP8< =M _嬉C<뚰O純 6B;hF{Kmb 6s ^(((((((((
^C~b
(#YCS Vi E(AK?
JX?IRc,E( JZ((((((((((((((((((((( R߇ -: eQT ( ( uQUQ@sڥȼi6f| GE$xAg%%hQwİѪObiڃH N cy+q4:?o :.tk26l`S 0zRHUg?~\
=m][Gw[HV[Ai(mFH/ֱ#N[jȥ' ` ~SM r
R.f0c'ƓTFM0& |wϥt yhA NH> SbEc 1 ?Tmm,/$*%Vb300=k(D * : zVL%&i -ϵ Uvh <T * "PH1c㿭tW۵Q>\qKӕB32T rSm5҉x0sw7 M&hY:1U
?N=7P=VByqfl Ak#kW _~D R@=;&kafk$t !i{o . Jd]f {vk bX }N U: 4T5XZ}:$bX/*,<SSNjMk%r';D[6dbI {kNKf0;oAI>VmQ/sgm]_Z&ټFI s,u֘ya ;xך6X ˗d^
)jKeZս2$R dp>QϽ2YkgRb rvӀaFg%V{ PsIIo`ՑtL
խCC:w En Rr_s7Vl e<f:pdʢD.|203MuԁUFM+6+Oy
ɝӒ jTaz& 7H7c
ttW7r94ReuHfAj0>+t`Hp H@a }N~ i2ߨ"BxݓFj-;PL[ʒ@$ 2 +*Q f jo&벥<55ioj1hFBI q Ht#Zs.}*VyU1\UH4d< mv&G2{kfdpKeRGg y !e kn\ڶ>M,E<^c+3A/12,zUE+as[ Ԓr~鴐3Ԟ#omXWN>t2p &iUxPҩI-lKz\-0j6 |'5jl%)" ؒ1ūڃO4|n95324U
ǭuaI1)<8J}ŬW>Y?q"t26r 3l%o`,ÙNd .ߥh7 Ί?Έ %ڋRs54_9nXNi
6Ҷ\9<g8hc f6!=zۋx{ys*MnJbZk t&9⺆L#Gj ▲o[4B
6;Qo*HI .rkN|&F .>tU֖jG#\-bҬZK=V$YGuԞkSI65G .{ڷ 0KM, F67K si&p@ܬ/`cHA, G8{3 tK(' '",Ӆ
" 1tz@v}hsOt
l-?U? 6Yc,.&;cV=Wޤ 0 G #]"i<x\wurꈠ@Vr]C DGy OVKzXQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PYp ZŭJ`ei| '@- )s*[fVF MKh#*2~~g zc`r9:~Ur 8-ѣe[cÚa;:' fʑ
*!QS]%C%3""T#Ҧ
yMT:X岈@RFAaTJr`c$g AdmBxS\$k>I.4F=8ᵋlK?5@] +Hj Ղ%z(f*Z5STֵ)apQ}GJ X.ZOfh:Ge8 bhREE%,^IǿZ ʽ5TgO*Φ F+ an
XN5,:9PjW Fhp8 6"{-? 5PZ-#sSC1E`J >,Ī%zz}iQIǞqI P9c H#*p@=) PC ;Ƹ2 'SPEPEPEPEPEPEPEP{
Uw
@Q@! V)4Պh hb?(AK?
Jdl#];v̛y 2o
@OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OP\ oM < QLd :(QE QEYU}*H((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((( ǻ~ άT3xYGZ tEASRPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP{
:UnHp!^YZ( Vi ՚d?4QE1 (AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+/|JU>?ϥ\R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- ̼~o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(48OZ()՚d?>ofM-QLG(AK?
JX?IRc,E(ɧY{(,u98zAޥљ3?Mn$QEQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@e Xj ?R_*FR ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רsnZ5 * z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רоڴj -: z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ woZz?O@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רsnZ5 * z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^BjѨ.Է ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@sCc楇X ƒ bZ((AK?
JX?IRc,ER/SO@Yc{Rs)
!\' >g55->[!lSͿ8=Er Ռ
~joE|S8A >O? ބBI-OC#űjd`1iݻ3±iSO`) ( Ƹ䳽]EI<jZ1!??@J%EpmW= _jKG{$)c =v-ST5; AۉVv1 p{sޟ4HW ,Ak[[y. PN1[ >YFd;v3] | 댃JK!'ǵ$Ji+8w9c 4nDz'\k{DHZ o[-*c,֮#Eq܀Ps$m+sP]{ %NG<tm@j<6W O?WҮ@S
qK`~Q\}~sz{՛bHuzcu@O?Җ][Y @o< J ([b;{w<lOr?QQ\#pNQEaj:AP]cfP Z(ѣ x> (fWS}:$s9@'< ia kX NӦt\ޡ|NQK"v~?,~4F5Weܬ4Q\ڝzR)p3:URUHWy#4ErZi A?.j_6u4EPEPEPEPP\ o? 2(QE QEF_+ _*FQE QE QE QE QE QE QUo&{kI#јg@ Z3Y7tPF~\ܞynj$%Y' TLgDr{vF3@ E z Zcc')^=e q EgZ_6f3 ~T7vh$pN>xC]Q=ʷ7F%QGր;A ҝX ݵ 2r ( ( ( ( ( ( # ]'T * (((((((((((((((((((((NLXTdrA Џz{]<ߏ~/XZ wC$*GIF`H4 +ukMV5B l sҺ <IfPnr 4 ) PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPEPEPEPEPEPEk:t9 0:* 6-T {r~uZ e_ X : ߢY/MOc\2>e' ÚYU%1]' u4W[Z wI1/-g769Bv,QE QE QE QE QE QE QE QE *t SEPEp&"
lW? W1c;_ ֙j Ecg:²G,3H>Q\H1. G ZR29n (-~Zi?b Z{}5tKI Nsx J (1u ;T*^78>_9XyaJ\` {Ǭ͞mk{p,'h >FU($B QXN&#@bUNCu8 +b
+[H23閮
sYZL\IeF N;
\/?/m F;:A sڠ`0ZH"-cڸMK{I4C'9!z (
?OPGO 袊 ( ( ( (#^UHbDS%Qw>Vy = G
\up mzUz[Xl 9h'W~$ =1Ŗ}Q
ޟV?ʀ:+;QK; :|ǥr6&RYH >6pq;+ Hd;Vf\^A vv :JGr`{z{P]ͯCuTzK]
vib{l9=@ 2rs('~r3 5ͮߋ ?ր= &r+2HsYVzڍ^kY r# wW5 HzR :qwkB;iP]NBpzYEp˨Yȵ2 k-lܒʀqq-<j/S}Smnb6' > "H]@3^[[ȑM VAVk̵KUnI6F@ ^a
܂F^}Q@Q@Q@AsS?[t=Q@Q@Q@Q@Q@GTf-"AsN[m7 >Vs{@ _ Vty;O j<ÑG:73\[Xgd#֕-J>QT4 P qO_((((
7CRIM-QLG(AK?
JX?IRc, Fu)l3 @[ ?Ti'˳^\ s_Vnn
ǒv'S?gqON=+ ߿ʹ
~ i&)N3G<8Py# Z(mRERQEO4ڄd T8-) ?c), {DQJ3w+~
8ܯT
s71
9b`wē ~MdlBm 9 Ooikg bJ^@6˴1j]!O:},[KK^ g 뚡j1liEm!R>i.t8>#> %VɿjF{?TVw[ڪAVֵV.W͓N9]^4 VG_F#[aĖT2O?uuA:F*,?I=yy@ ݨ]8_<*RǠFj+ ]: n'Ğ)[yyFmn=GN $?!L lB'o:: knde[B: &O~1bU x^ C-Ρ40ݻ VY 0ϋ\Ry29 ~ @1i]m:j_mu0 [uǰq]Mݕ~Un v Tmt-:Q2!fSXҀ2x`Db:SN./a;vΚm 7)|}99V՞c`Kt(9ɶ@ lqhE(|)sm=룻Ѭ/eCi ,g }sϯ@:$W<dzf;XڦH ?hi67O p8?*{K[1ڠ@z'hl͈/&w"ִtķ2$` 9$
2yLRNHS
ӂ X6@(z(
(
(
(
K~ Χ.ԷQEP((
2 5X 5R0( ( ( ( ( ( n #Wo=2( q@ T P|a54Fm"QQ4`ӥ#ǘ+r}+;Ou]'Qo!<v8'rcG#h
[{BI9$'8 UA4[[̌wc}[JME9{ qyحm& _{MB1{s@ |}k ( k[_*xy/Z4zH:܅8 :F* U _U-.-Od(Tt`z OxD T<9e~ҴUqq ƯD 7< kZ?s_* QE QE QE QE QE QE *t @E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QEM (U q\k9g6 G͟ 8;t,& tr3ngP6%̰/W9f<㎸'W5;[K [Jzszm-1:gNk/Pu4&B1rrh}k yUCOl#G,.$u QjTHN 68 T F+5y` NHkItj}V)ma@=1嚱yjV:Zb,߮G ݭkWf8^\ޙ-ѹˌtc1>
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Էz(
(
(
(
(
(
(
(
5n r>wx=V NZ?9=:P1ȓudZZe=ɴRvrD2>/y} ->z~5Y5[Ww?'<S}HNNFqw }ִ᷒uH~% @c5bOH֞T%8 / sҀ0MRKy#Kg3C]2bIJ. +5}6Hس@=EvWi}lQn P(
(
(
(
(
(
(
( t S z *ĭ , MQM(S(.&K쐉cqUI!2H ǞAW5tg.<G~uZm3쬌%B?Oj =בc.꩷#\z⟪
ScHI`x@˿/Ë >=UFA dy=!ՋT[G# BHr Y2ǿ 7s |6Ƌ'Ui<Ĺ% $:cַY ZMy.
ۂPH$,*02۩'<$]i<2μ Y\96([\K UkM
l-U($q
GGյ{$W@aӀ=j4
]i xB:dUxIAm }
j9 {Uy/"1oOր: n?9&zr\1ݏAYvm)˙ ^}gA߈nV|Xȟ =(f.mnxHϧ< CP4u Sm'?t+ُHs [\/?/m F2^qi"4帉Ҁ="_
YaŽKL YOq(t S z(
(
(
Cq֖<P,E) (ᕝ*A1i-֧5WH n <qTญ--!ẰO @yjCi4J\FF@5P~C1%s3GԒMUd*DYO kUD%.T\sz~d>vC
*ppGoƕr:!$wjm+WM{t@?֍SWR"dGL :DFol=wQ/Y㙠ifPI۵u" < V\VqZ Vi, * ڀ9шB1ə WR+ny7-;lg qwϭrv˛y</ ~ $f,{n eEa6MrsA gQDf|,ѶH7G鮦#')%}Ĭ 7:~T 0; V/p?qi%e\lku
&6I ?=eA>I=>l(u+h1YcU} d s amgoJc8`=ѦKnLl17'JԷkre?:n8f \Goj6cؤ{t, _ WǼ/PH9rIA'
@ j`RP ʀ35 \}*?E;K̶1@?y ZKՌO+C Ҁ*xBkğ u#] QE QE QE ?OP\ oQE QE QE QE QE pZ' [4fB0Â }Ee1i/1"T{w5ƹiIc~gK-ʹ1,rIf` F[stMFH̎eU8 +wsH(@_b
Yé?i $##o=+װt2B)9 ayjڔy9ڳtkmf[= {G[S=Bl;ȭ) q;K4ĒáVvVk%SnsV ( ( ( (4 CS@KES(AK?
JX?IRc,E*bND r*i ]2/c&ޣ *Z)JQHaEPEPEPF(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.ԷQEP((
2 5X 5R0( ( ( ( ( ( ( ( (^F$5QE b( ( ( ( ( ( ( ( ( # ]'T * ((((((((((((((((((((((QE QE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ '( ( ( ( ( ( ( ( QYAe}
IE 5s* XOԔP` Z((((((((((# ]'T *
(
[ŏ*5\g@Z f, pq]N#(](E'q#^GԔPRC˶dWd~r`pFy(-PYUԫAҗP6&Iu֜ - SvA#Ө(((t S z(
(
(
(
[[,%uP
+XTg.ђQ@1E)rrp1$)q梶ӑgRE #"G䲂8Ǧ*J(B0:(1
"
:Nwo1E 1$\ fDm@{qO#<틿݁}jJ(h\HT g u%PEPEPEPEPEPP\ o? OEPEPEPEPEPh P8ҕ
<iP4BF$G*C f lzRGPUQ} ?J ( ( ( ( ( y?$?-4 E(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
((cՏ TТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4* I*_Jjsqր4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B R߇e k=-ڀ4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ,OTv\v}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4* I*_Jjsqր4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
K~ Ϋ}Ҙsj ӢG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(ןCT2c榇X(#(ALÆ,Scs7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AMa# aRQ@Q@((
2 5Y 5R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ h ( ((((((((((((((((((((((((((((((((((((((((((((ST Ꚁ%( ( ( ( ( ( ( ( ( ( Z J)i( ( Z J(
(
(
(
(
("OT¥((((((((((((OT%( ( ( ( ( ( ( ( ( ( ( ( ( ( Z J(
(
(
(
MRS j (((((*)<Q}X%A{guLc@Rn]r3@ EPEPEPEPEPKia V).X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөVU7WpJ-g_ʵkb5KNP $g e:,cm3Ym:6& Szi 9+5H%: ݀=j &NF|-\ ,E\ g +AypY 2NFQ$֙YnRA9(YQ /bߞwg>/#k')r 0{yW03a#8G4ׂNhQ-SK Еu;}
( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ jV6s7E:
U/m-!QNhFőX9
E_ᵶxQo+RKp
&>YܱDy h
s vڕ#g⦿Z,bqީxb' xJ1[!WB L
c<-cyp7 ơWkmbpu ]u0?NᑺV1hKMԒ]JkJOķj @I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@E?j) 5 KEP/ꐭpNG\z)5-I0b)zԲ_D͵ab
MwkE"NHcր2W7ZWI%8yJ>ͧ; [t5ՍvEvwuڤ$WL B< lm`tܪv^ynNNkB;.!u xPm ⱧQPULqd ''֟a}80壕b4m(e1sQ꺄$1
*燿 B5OH`4# cϨ2Ié; ;l#hIq3zJJ=5m+ma-, q4^C}u[Et`H6\T `Կ$ ɺںSogӿ Ȕtnf3Jb =*k?u?AX~{/9o^>.D]ie*Oj Yjo/Xc uG_^ ^Ւv%nWS\Ǥũ`>k# A,?ʀ:}Jll' ǥcBuK hbGLwn<נ<Aa/ټ搘PK UUn*6Uwӊ g{ oݽ5A-YI-ɏ~Mu"y)]e(ʏr{ aw/~\86+E{Bg
? }id_9}:PIq,W1M+Hѫ k9#f drpǠ ֬ ݥ+ ccΚecȻR7|z Pv7hS V
YyRXy0 9LmtMrXt<!5h \ @(Ccn w'UϽ.ל#'=}?T͞Vg勏q
h@OIu|Zm|Cd(bտmn4KF e
PٓH{rܾe!؈bس '*?ttqҰ.$)LAqS1
dZLVRI `zek0A;߷=r6=Ic !}C &6h ?ֿRI
Lp"j&X29swWvtx!0|O=ҹ ]eӑ\JXpFqқXGzeep `}h dt^X5ymc{e (8 _֚ cClHPpG@#n 5*襂uϵi\=՜W ' +V ֒Yl2'(.G]sҖ OMHu
8o
ܒI:0E QE QE QE QE QE QE TI
OPV+f IZאwC(w\t4֣ bȬ "E<jeisYԕ) y?GU[}XӬX< _W;mJN3qZWwJZ@ cxb' xJ1ؽ6yGeC;4-(BI ƳS i Z'֯|l,D X*}Ou
vq{v~X <VdY %! {aZ4VÈ@ $S<Q?Vowfo>w$ Ub } Ds;m]S(_kP&n ?ugu \\t= ֹ]z\BѤk+2JuHneB]8 :
$$2JTu$VDWZح%Ǩ*ͥݮnZ<!Nk aĞ\|F@ ڈ:Ѭ^jVTrUuǟV P(M?TZ9u&p OVuka |2<ۏZ5Z[Ig<m g@.Mw,K}qYrjs\Io 3?u>thuOkVЋHP90flPMjCP!HkkJk.{{TÕךc;>231ٻ}8 ?QV+8;
qpw16<$N+vjj%\p #jBs@MifՆ
^C?@g[Ķ6ZͤpH4}lKub[+6r? ڕ1 qiu_YGtx ĊTy&20 5q} B4ڵԷRZqbp3ս3RzȯXk uiN.Yd8zZ%inV#e:f7h ( ( *) 5KQOZ(
(
(
(
(#TBGӼgqh@=T]] iz!_WiI&`YjVG_qު+,[-,L[FeԬC!8q5h:4\b@J oe${-ӧN=+ CСu%1Ύ~oQ-[fV Lc}
{IoL/ L# ca=ڨ/OHǩ ޮVET( ( ( ( u?,?%4 E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөW*j: b WUE svWSjwC hv=>=_NRێ%,[E rm6ztVL1a2=:H~Lcb<N+9^m ?g9 :LqlYKaٸwiq&ktV r88lE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-c^\}wa>^[P5o&k
=WuyoR u%20sg KW^AA n`NKM{k{m jX'v pN;(F #]ry3Pu3Y&;Rk14+4Qڶ袀
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
MRS j (
V(k1vqܓɫW=;ҴcN?F-D4a5ZlQ.HI#QO VF(:$^Fh- d۩#nj mfO/GT\pr1Ҷ@8MdG 4ihpE%`2q :o~'rYP͒y8^)UZ ,n]. C Vn%YzU"d77Ά+HqM~qP,_eϑ$8Eݏu > b@fqǭ>9_:_-cX`QVH[lq'ZIe @N_O,V)=YǩMof%JL20=pkpH O Ѕgk6yO"Fc`@I]CH$P{@0ǩ? ruXjIBrUCRm.G>i# a[x4Վ4" >^[ZE( 9-&FKðe $@ "Wl
<8Jnt4L+ ] :P>.-
-! ?ҪsksXGdb uG
5Q;.}(&(ZS{ss[@d 7 Fe[씃-~ u*m# 4\ulP cO6[ڸwtتҺN%mʠ P ` $Z$68ĒypU}$w:Cnw vf#s@ rw,`fxTj7ѱ [b(
✪0(h ?ֿRI
1)fflv8}Yj6F-V -v:(/PkIG:W=@jzmK;
ڹK.0@ j s6Zj6Q*89 SPH<5@ Z}ǩ&
c #qߎ9tcg, _$` &(MSX k-٢ lºp)h(((((((OT%}r ˛/.7r b ֭b5-[.Fz Q@ éj0<!m b?U-JO2tKYvf8=OCgqwZÖ- u+r )CF`Z(M_HWFI1@}G՛M f?%pzh^95-ŰfUز }+gLϲKbAa'__\no::Y\NY`nra}ZcnrXq~Q@U沚Yр U(|PN]WuXjz93nB3QE ci670&l x'ۭ@:c x'߽kQ@ ΥB 8oߩV4UFHA(Bꐴp;.qs[-}eDBr:r;f@cyl1x@#[GN kr8=XեE sChK
hr*O UR}{4(((ST Ꚁ%( ( ( ( ( GCuB ?tu;[ ֵuKZ)n;jKڢxrID͘
=2**ܶvM)7w 5 z|֥φ> WZ#si]E63JtXywq >L {Wtmbfw BzH=ECEtQEH((((
_R]KM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
OPQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ꚥ T-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TS jSPQE QE QE QE QE VI)#mkD6=DZP; ;Ktaml=ٻ5E#9gE|CY$ZfYmHaX(Q@Q@Q@Q@.X Ɩ bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬ )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >O~ ʝK =?AQ,r c' h*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( S ?;ʗz~92Y=1@(yR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPSlj!~F2q֥ L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( IOS*%C#d XK =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OP) ޝK =?AQM , S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<(
_S.n) E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPEPEPEPEPEPEPEPEPEPEPi! V)o?X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةSI:;
Vs$ $gh_ =@ &Fq\S;GN,M9kN֞d7|g z5&GJ/ns )oR`ՍKE[ #{n#; vf]bv vQsh/dh- 8 <PoJ \>uioE#526p3Kg_-ð9SO'($O}uiN~ ҷ448 |;:s@QE QE QE QE QE QE QE QE QE QE QE QE QE *t @rI HdI%G$Q̆9T2@WZح%Ǩ+rX`p"9ʺ sykfdX\i:mT}0Wg#Y6~pp tՋV|m3Ҷ\K hC,))ޡ
1 zTs_S)V`@[
YD`x -o]e fjZztJL!ڈ:k4W'nyof g; ?W=y<!eB-0TV ,w`0npkl t$n= GcI5ٰ89 =m3*f8kQW3 Q9'5KD uS4ήu]>
= tF-Jό e=gKY1`iFBƹ8$SY[\ Z}\͒ ޣnȤ }Gm-n v2wp;/WFt2 <9}@ Dr$ %W[[Gn| \
@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[t=Q@ @@E:3 qIjO'5s) U5fmj27?mf7CmëNJ :ڵ+o_ǎpq/>˧; [:&SlЈw^zT#hUUcgsmeShnNNqW㹻Ig[0
FN:4s3]j1
vĞZ~M87Wg G H УJKd˒19mF䑢!K;^E] Fh8' yI"Hu7ucmm 9Hq4"_5ҨR@'YvTq V Ե ?i
֭sm
с"@ ? Y7_?w_ڽ0~]?vJ %7Wv3X:OJ}ZvA7Z~} 9o^>.D]iy,A%A@::5a} ~ _w%nO}+xtoÒF`>k# Cؑ@ FxR\ ǥcBu[ XbI qy sUK_9&x"IbOҬjȦY%*.BSwE$Xno-YI5ɏ~߾k6&u)`V<FxMHt)FX!
qܾ\93Ln^ж~^; V~|58w♦ }dx@ &%ı]E4!f\?ֳ=JmE젽vH2> U,OovĬm3#\ ucN]crJ^AD=XPX_-9T
|I&98#v`:S=+>[]9-/'fܾV@Ks$ձ !
'@ EQ@Sݮ'8O`*fXK iڝ͞VgˏqV >f,i/&_!
]}OoʛiQYe?B?ƀ4M `z+!܈bس .<J.sw\߄f1 63{ mO[e3 N~^[&s
I!|LrB& i1w\sk Σ l@tQE A ??ʧ# ]'T Rdڳ]@3v;}+:46Ɣ&7שO="\~\iQ,F@? u;EQ)W
w? vD 29VX5mnG VkAjHP@#?Z p1T D,8^}OO{($ 3H +N ƒYlt2'(.G]tچ)ktPKF0$W]#YF t (
(
(
(
(
(
(
?OPGO Vs7EROAW*>])Ԏ1Zԡ]Y +BX)S+O-GVfj) W _5[}YӬX< 4!.cS0F
kNPRnd
qV/x ~Fom-g$vU8,"#үQ[P09Yjy8? S3 y[/HOP]7W{Ym,|vp}:VcYA %%#O\'<``q:mb e]*O\fiPOҹoZZfE+, ִFXi\ B)voE6 ] U#cqm
+TNk3]=hHC$GRN {}f+KVt vjWvE- 8 =9x`p"9ʀ5MA"y \UP՞TIlJ+0 ?7[(>[,aO$wU'#Dm@
T PWYia |2<ۏzӬ}^K+$i6208,]݂]:zV_ @ } u-ἴz@ͩI*I"[/"F!T N qZ9>ltlГ2;; VZS[lHI.qURTO199
Aoh5IyݭѶJ M0H=
#ufU
p~~;gHd. bϦ rCnz7C@/5ic&ysSE$fd 05%L_v7^r[ 51O8Ьj~ugz{ngӟf+X[k kOm'؝"]䳰f8 ηt{f{[UF7Z ( ( ( * -: R߇ 袊 ( ( ( ( ( ( ( ( ( ( ( ( y?$?-4 E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةW4jw#@o!0G9 4Y
7DE.ӑޞ ̊]n v u
:m2<":gKME ʸ*~ ]&z>XTG I$_Zwk}iR10vș WGE ` Z\),8iVWLViK!9<[P7#wS$A)|m<Sk&1Fؔ WCE QE QE QE QE QE QE QE QE QE QE QE QE QE *t @E;וvG__Ү_I ϻb(+K8&KZRÐx zVj
Feې ŻӯC[Mwv+:{ֵ^^;XЏP=4ڌk P ڭkZY=Ū2rwt~ A rL 絛mB-D0<('9 ԉsF#EP0 u ~Q@ɨȒ(ۑ=Aڰn-u_i/G \ ;ƺ(Xu[E3pqǦ}i&v$WnER2q~E qt:ΝXUYˮSi+n̿p!?ֵkTUb k2'ޛݴK z"(_ Fv9r8>5PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEP=E -f"P;qZc +QG
Z} qz.mwb&s +85ƱiĤF<8#HljzCƒ
(af9ڥEt\s{CCuq'壪.89+h :wh }Ccf9.m
(&6Kdsq3;HS. rO# WOk"7 pr3'ekurqnKԳ ZL9v4~_nk]3g(kk^Xwc j>D \( N985K_˱cX`jgO r DV,H i<ǫ2FrzieַdIV -(ԃuҠӥ cx@ ?!Y͞Sȑ8#{ 5<i"C)FE 0@1q rzuăVHw2ە6# 4|~ƀP98ր+[ kHD qaiv~ b0y=9E.y#z]iƚlFY}Tu vأΡK.!ђ` zfsisXGdb mk
5cD>}{ym[E)f
Ods[U\2 ߝX+K)noc,FNM*az kλ`x2c~Ե9$p(=%mʊ $Z 8T?CsVM\
b$tl J5cE'' r`^>$큚 ( *4w:'tlb )Q(m=9QPa ڀ EP z?O@B;|GF?Z˼MgR6j $lv_E qZM3l~]Wr-SX;{`۱bl b |օ sw6ZV1*H~_{kI5 q'' >Q "=QY0n|9~:K 9` \#g]U\F, 8+
PEPEPEPEPEPEPEPPGO I T=bk^K30 /G|VɭZ!{_u ;!@PS#=] ʼ:sB?YhWT g # >
ޫh3oY#u {
ޢ
(0Ags}fZ# p֍Ij3zQ@ :evsr}Iv 1Xcny[wduu+r Ԅ^i[݀5qIWP}sea𮮊 *O=2Ό{W( * m`v T]Krۯҷ5 fcX^p9{( 9,[^/-:ۯN!Ku1-;-V\ŪF;y%' ں{^2ؔ Gl֍\Z_ A:= w?kZNwjs z[4P+:$ۋyza*Oc\,NG?ջE QE QE QE ?OP\ oQE QE QE QE QE QE QE QE QE QE QE QE QE Q ƒ bHՊh hb?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z?~ ʀ'( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ '( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ?SEPEPEPEPEPEPEPEPEPEPEPEPPGO I* ((((((((((((((((((( R߇ -: (((((((((((((
7CS?S@KES(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeU{2UϳCX գR2Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} ) ie"V.Է?4QE1 (AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP =F {VH((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((.Է?X R߇ E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP =FYdY7Z_2 J4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX W?[u^ b;x5$k 4 $)(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (QE QE | JFIF H H dExif MM * ( i >
X 8Photoshop 3.0 8BIM 8BIM% ُ B~
ICC_PROFILE
appl mntrRGB XYZ
'acspAPPL APPL -appl desc P bdscm cprt #wtpt rXYZ gXYZ bXYZ rTRC aarg $ vcgt D 0ndin t >chad ,mmod (bTRC gTRC aabg $ aagg $ desc Display mluc & hrHR koKR nbNO id huHU csCZ daDK nlNL fiFI itIT esES roRO frCA ar ukUA heIL zhTW viVN skSK zhCN ruRU enGB frFR ms hiIN thTH caES enAU esXL deDE enUS ptBR plPL elGR svSE trTR ptPT jaJP D E L L P 2 4 1 5 Q text Copyright Apple Inc., 2020 XYZ XYZ q 8 XYZ _ Y nXYZ %
curv
# ( - 2 6 ; @ E J O T Y ^ c h m r w |
%+28>ELRY`gnu| &/8AKT]gqz !-8COZfr~ -;HUcq~
+:IXgw'7HYj{+=Oat 2FZn % : O d y
'
=
T
j
" 9 Q i * C \ u
&
@
Z
t
.Id %A^z &Ca~1Om&Ed#Cc'Ij4Vx&Il Ae@e Ek*Qw;c * R { G p @ j > i A l ! !H!u!!!"'"U"""#
#8#f###$ $M$|$$% %8%h%%%&'&W&&&''I'z''(
(?(q(())8)k))**5*h**++6+i++,,9,n,,- -A-v--..L.../$/Z///050l0011J1112*2c223
3F3334+4e4455M555676r667$7`7788P8899B999:6:t::;-;k;;<'<e<<="=a==> >`>>?!?a??@#@d@@A)AjAAB0BrBBC:C}CDDGDDEEUEEF"FgFFG5G{GHHKHHI IcIIJ7J}JK KSKKL*LrLMMJMMN%NnNO OIOOP'PqPQQPQQR1R|RSS_SSTBTTU(UuUVV\VVWDWWX/X}XYYiYZZVZZ[E[[\5\\]']x]^^l^__a_``W``aOaabIbbcCccd@dde=eef=ffg=ggh?hhiCiijHjjkOkklWlmm`mnnkno oxop+ppq:qqrKrss]sttptu(uuv>vvwVwxxnxy*yyzFz{{c{|!||}A}~~b~#G
k͂0W Grׇ;iΉ3dʋ0cʍ1fΏ6n֑?zM _ɖ4
uL$h՛B dҞ@ iءG&vVǥ8nRĩ7 u\ЭD- u`ֲK³8%yhYѹJº;.!
zpg_XQKFAǿ=ȼ:ɹ8ʷ6˶5̵5͵6ζ7ϸ9к<Ѿ?DINU\dlvۀ܊ݖ ޢ)߯6DScs
2F[p(@Xr4Pm8Ww)Kmpara ff
Y
[vcgt ndin 6 U M &@ P@ T@ 33 33 33 sf32 W ) mmod 0U6Bs
X"
} !1AQa"q2#BR$3br
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz
w !1AQaq"2B #3Rbr
$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz C
) )1))))))11111111;;;;;;EEEEEMMMMMMMMMM C
""Q7-7QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ ? Z(
(
(
i!FI
/RԞqDi ݜ'jfB?_ 8 { \6\6T غ L: }frƵdWK 6T}/Sx A1dj.5.cE&iiQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE Z(
(
(1
82 z`&HS WC, OVvϡRެj X Pҷ@@xXo,wh/W%]l/|EdT=nH)'꤃T^ BBt'Zz)#RfsGO%-'jW?OM~US)lQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
y,c$gIs AU RݙOKa < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o(;&y4d?տƴh a < V Ѣ3l?GM[kF ɰ 6 o( X<`NFYگxI ЅhEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPZ(
(
(Xe F}h7X7d,p+C*ʜ9U' ]M[+/Z
TGQ}EpZwyHtck[XK»
F=B$!=E jHq+{zDv = -x&] R+<;>#RH~RX)DP
BsRO摻oS?Zъxg]:P"Z(
(Ψ܀d^W'K3yVcvNvt5ä4q%?/ӊ|!{*@)# ? @ 떆t=ܯܚ&?(.;nPESӡE8?J ÿ tTV>%Ю GdRn Z) \;) ^a uTW'gMAǏ κA4ܟ cy 1n3? (SzGG W )2z
|eHb2XuGҀ:+w b'0?:ꕃ rB(QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE s Aι Oi S$fTfU@$_j A,l \?
G(dZN#r\=* SYM+#JCfS3@ e )ʐuA!hs! !G5K˅Tf9.$$!Tu'*SyWw,fQ-'}z7EU le[G $ܹ]r袿{,P۱8z J
=e9^FH=Ao(H)b0'@ (M.E^( Ьij)i gnmttw\ݞk (? * + y/5 a })ڽ[I*㯿P]K<O&H=pɭFmꭌ=hZ*WvӱXdW# s\@UU*2A `zUxn2!\ ]#G&7(FP +&U19r
mE QEVY &w +]ek.+9b?`ln К h^ 04rwy%8Bch_ Wi"5xݞ(
1 iʐ>vsWw_(V&7$ڀ:hdD5%smdm- 26?Njގ.-5ӳp;4Ec<Œ_2{zؠ((((((((((((((((((((+4Pr-3NPz5E 1Q
DŽ Vgj' B@Q@Q@Q@"CK!
2IqW+1q~tjn^;XА%b[.8k@mw'HpqӰZ m⫸ {eav06n}2)G>1r3U?ܿ59R < 8"i8D'
ik*"el`2s[R@<p+koPlb c\h^ӑEfq!`6 gަmoh`Hea^o1vgHOH]n1>g; t>JM6C6B]FK)/>dhђ9`[>cnqکA
RʓJn
lqso 0f2 (Qhh{vt QE QE QE Tr(d(X~%`@W BSzN_s_*&dǬu j`m}8^ke6 JA]=84EajMxl/-ͼw('p#L[strb }: ߢ-uպ%ad:n! r= ϷY%ݛs`J Eb1K62r6':uMe 8ʾՠ` 6<^͓[K7`A _j 謍CUr1瓐 vzKub2 ƀ6袊 ( ( ( ( λ,eHn_k?Oa}s^%I l0 O~HVGuKmA8`Yڶ-dmNe#%(f-gNma3O}kRxMUҾ`rezFkҠ.!IP> ji(] ~2gK`2zJ_ Hel*pp+8#.X4d PSoM2hQ[$ׁWeby%%Âsr21@Z6I3ۭBi 5#3vg81-Iw )' !ݳll9ҹ纵â l{7Vjj G
nր:+o3h%y9ZW3݄]UO ->q<f/mT S)ڀ5hsE0(k^t."23\\KD`T<zWKKo%qI,_!lC gtiL3̨ qsI j[۞5b{ G߳g!egngV.k1u✖dT@5/O Ѕ 7#%
Km\%#a%m 7;E ֤ɭfYjzPmEPEPEPEPEPEP
+!gib2I z\Ckvaq\F
ά0Djxd!8V' zmU B-: =>wmK&' o31V5
hX^%ҳey$ @V'4p>>W.Ul ܪ Sb3nКQy3x(9 \?-^ ޫ+ r u`ɩej ʊ5x SbfKԭm>QE QE QE QE QEZ(
IYHUQO`*JOZzL-0ouxiq7 JoXؑqݗf-#K/߫rOWk? ơ4˟
[۠5#!YMhjZmQzR_i͐|=-̛Y}
>w;
עf }
3u8_OpU6@ ? [Sa#v.3oV--$[HcaW~ -G%ʤԴ+ ?Mݵ~ }W@$Zg{7 ^XxdY#%YA"JWC~@4QY4.k7*4˭tnDl!O WZEci?r%
=k6jHe,2zu xy?@|{5Z?/vu Iu].~b\z2ƼR Z;Ȕ GlxS6i,2糏 POUxk:r=FK2(==k Z O;{ㄽϘgk.3oo?I*r#Yy+^^)/TtPhZѰXHAIxYfm33k [+ "so+ڨ͵[y
.$Qr=s]WU#+ԫrֿtܹ2r~ G _g o+ t; 1@ Fbe#E MpIn63k]"?ldWȠGj]%H; 75[9.#/wU#שWZ!~@ EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPY? i m?Ѭ
hRʰҿDz
H
} r\\Kh* BGKwR;!\kR
ګOt^ 3x|/ހ {yZ9n%%Y0~PõtA.ݶ@9~W,
{wmB &2A~i
y+ d !֊q{0m )H*u?Tm%7Q3 8DH kH hn( D3'9 {VdRGr0Qy')Mxoȳ77ґ38Z ۍI# XIy?Zl/-5X 5IbKj[/U*03zPkA !Y{Pp3W
r?PǪJ$ r(]^i/m"CW+?ZځzRH: KYI)+VC#th P-B ğ+6 t3cӟUwFgklfHX,涎I.F%y @
dDssgPKjd97 Ub[Qd9_³o
-%a;N1r3@խ!H-up8x ROlz@J GM$Ws
9ɨ.~5{E Viwj6| w " կ3ARbrIv\
#M TԵKWOg
l`UqEX,I~ Q}FPx*4QY{[\2wz5j;Vx>,QEUK1 rǥ fiF2 Zv ץeddH&l ~:nK7<Q$vk% Qkm=J2LVQA.$X_AƟ[I+&p:۴O?ت7:tѢFxY5;.!6,H\`w:+b3O8XW:DΛ\uu 5Ja-e
ϴ7ʣ$@<D5ͬ9U?] ݢhF5E ?Ul&3Qcaڀ .{IV>өZگ " ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (( Rw w'KEDŽ Vgj' B@Q@Q@Q@ l KKcwJC&
Y?|u WV4 ٌ ;_Gx!ip,s[x{<>&_Oq$#co] K&1BgKNd\ uK#T WeT,3؟:Fj ?fghfF˸ qdIa$
6 \:M8nB| hsU+lahc,س9$aRٵ 縼{P$7qިzؒiieb9 [@r)><t&/%|K ' ?Ҁ)jq`^2 ZeGw\ P@'nPEPEPEPX^$ <U Ѕn{X/!6 #=հP=eқkK6ZRHm٫_h tmѢ#$'#=yhX57yJ pz@$>go'|3_)ԉ6O ;P%g7jg(n`ʳ1`x8[glIx˙cUx=wVZQY6~G6 v Pk$wWz 4G F w= ƍKƇI!W{
$My#92v~ (k
* rGNM2_y@UnGP:t6"?ܞI?9xI0x>^3,WZDE sT&`d2`u >oV9,#84gDW ϯJ qI.>F66 R=
^;4w*+:PPIoCЏTvZUK[&X~4%n`êQ^y ;}4P
>
:A yV>QE QE QE QE p^)&-#䒫ݻu?WĺS"
9^UIH{VUƏosG SM qz4k6QH a9"%UQB ڻn3 ?.$ݳ85C3P q>˞jye%2k6=&#Tth fQ[KjGZ9mVT܌Nx*m<J"> zzb$fV} }(}!-Y jh-(O+&,u]kpm8PYGD7߷f,tqր/+[ݭ1 TQs.d$okrY@
yTHu y){T&s%23J0OvIGwU]:tDhcj$egyi++ܴW 0?w
Z?2 N 9M? Q 9k7cL:<Cxi60RRW=ja XQ. 0T 1{P5 L[ӷ NWJ^"zWkɶ]'ԚqD\imf=
KyP܀sFJ=:ƫ#n`N1늒<Ug}LHpƺEMO6\49? [PEPEPEPU.mbn\(}u :ٹ7 ۜcj7q~X_s 2'c W ZC ; e@ SE<bXX:7B^kI]2ޟJ2~cq֕ݝF @ ^o/L1G +b֯) yXi'sI$YWd
ژ[y:@묲^Xs/drhYcdVp\kRG$2LJ<dH ٥,/Iq 7uh++?9DDz"! j TOB
'M0iv lb?Hۙry<w{
C,:,#[* ^$+(g:gmiwP-D (# WѴ<#3Hf5jn`êQW.v j;
>
:A yV>Q@Q@Q@Q@ Z(
_ HIպF ^^'
ɠVx?/ l|6Mde>Wyy Igv:W
.@OMɮS&f܌sjLBt 7
49q֦}4]ΑJf hD F|O_aD,p5|<o3h݆ݎqǭ3S?' }V}kb7 x=T0 k [ }b #\@ i^o"` y4FI|Lm5džu
DA Q_=
R
R$Px1ٴR
y21oקxN*0eb A'iq#XriReg=IPM29.Co"0M[T > g G^/{I4/a$a2c??y-qM7 q@ ?.Wq ?\t[b u9qp|G
Q*zuΈ@9verǺ&cp%ʵU"5=yW}᷍QW<kojvJZH GR JѼs=R =k=Vzb<Wp5Er>t֟;= ZJ FV?^wFq% ζGGy_+>e}O39݁ad}Lvs@ O|=5bau*:+GMJ#0 ]cxG28?=ռ{5L_r>p>MlV]Ԛl;ظ~b?: QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE s Aͻ!/-dna iRR@bU(OPUA v("p fZ('HiXqRE &)
XQNT @8dGR<i"C)ȧ ʮXd Ъ Q@Ƣ푶Wk}O] *oK qvW ,j
}ۏW((6
=> ( cH6ȡb c"%NF{F7*ΡTPLx@E #4( ј;(,9 J} Sh n=N9P(,fc U((((((((((((((((((((((( [<$ Bk7U ٴ@ " ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@ Z(
|K.5T>tTP˓=c3]J1 ^'k~| *kzn]"ּޭg$sl ?Zh|Jsa_ ~ ^}j{v WGE#mxz~5i -]g$C^h u{Q 7WS4
}<:a>ՙMQ ıǧק_i^Mn q w
ŬeW_ 7gl۽ ~xST/uSb1W{ A ݏOP7ijApDJr51Ƒ"ƃ
}*+kX-"[D ( ( ( jp}7AǸ`i0IZE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE <f)FA <TPhO;tܡKmC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍mC~ mC~ ֍B+"%Heu鑀>E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE 7ڏ7ڢKQTTQ`%}}*(yo oEE;/GQQE`%}}*) |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,o oEE_7ڏ7ڢ/GQQEKQTTQ`?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEgvv,n9^OH U(%+Fͺ+- { E u $ GEbE u H Q={tV'$Z? _( G =ͺ+- { IŭRO`}k |0?WؗR ~e =?CiO ; v_?GQ.aܿEPӲ
?G=; v_?GQ.aܿEPӲ
?Ivk*Qe =?Cr˰{Xw/T?¯iʌԶaER(( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (QE QE
(
(?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP ߿ e>?-qPW٩\ VEW:}ɌNjttHYBas;VS+`1 &\6+ٖ\9$ȍKc5u[ʹz_h1kxl2< }A4E$ +5U+T+ɚ w<lԂ**K5EN K+GEVjG+ګkګu9-O??S ?* XEBĀ U78j+hEo eZ4n 5Fpz
63\HSkޜ TXyb[)aj
Bc w0墔ҏk{ V]C12cҙefR<=GyĢWm# ܤ}j텵rE'yOY- 4v] d,`wڥ] )$o5x / W稭})XH Fp'ީ^El"}=G֩TM*2yJ뼬:]B(c
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
cI ; })Vx ܍n5QWܙCzRʸ# JsJ kU2
dw`9އd IKI+mI Vikou~*m3~c fڵ s,X ԞW8k9gilEi>P"
z{}*TNV;o ʂdv<MNE #<?shv@
O9)nϽ ް{_v^֫$M~4q
88# 4wH#R@9V6j6K!D%#w|?StW{ dN-|;UWVeΙa1.ƫ0|A|8 {m"3;1DUqx'Y6Ee2S9,ۂXں/A? m2QY (AEܳ6Ԛ uDȓz~1($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?L`QE1Q@Q@ /~ ?<[ ץCG麜vW""#SO9?VZ[]>P>Qf? t9We*h56S(f y9s]&7Y^Gu\ t WT覕UZ-Ťl6K&zu=QEiN<s3WWW6+ׄrZI!I__iu?BG#HtJ'jK k.]ϙ|v罊M>HĎݳץe+!C=j:Iu.Xdm=՚Zܹ}q ֫QC-䔈jWA,G
ծMMpLW I1Ӄ]G.ǖ9?SMUcx'c-Jvl簪ZU6125EWV Ml x,Mͼ Z_h 2c\$X.Ao{hff#JCpc Ac5E5M're^N<wyYtQ\ǠQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ^2Y Dy<vj֛cxK\]N-WQg}CPY|E܊۬V)F 1#/9xUZ N[LGidѰy? 8-[kBG Vw4,s?D&6<uţ$;u Z(
,i:ё%ԏԞ¤ӡ RJsk!RSfm2oY8@CNzbu|w`7_]. oS-/v03ƐƱF0
N>((AD $(~TQE
(
(
($@ E&i"!'E QE QHH ih hel ր EPEPEPEPEPEPEPEPEPEPEPEA5\HY{},xQ`EC
)E}T?J
(
K~ Χ.Է1ҖtQE QE¥CHҕbRZ.+V6-UFŧp^bRZW^bQ}(AEO}(ؾ l_J6/ ҍEz*bQp^}(ؾ\,Wؾl_J. lZMJcbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\
UFWl_J6/cbQ}(ҍEEXؾN2Y<.QE1 (AD $(~TQE
ξL5
Z5~Hwo$c ,u- G~t3rOQ?M1l6N֩x[{c\4ر8
>gob39-ZD]>Y&&'ڨZZ-90>1 ש+Y渙I M" y7i$7 Q
&]j3Iou~m b?*҆ >ByV
,3Y[IP$</ )6Qu6 y!۟mֹa_iqmjVmŒFўs[:)3H6ƣ }>K3+"bN{օMi03avs3{-(YZ4˒X ބgx,¦6P1 0?ր.k ZɏSq
k^-EXdb5o BɌFNg g - *?|SpdjlH i" BvKahF.]@+Fh]X̾e.W;r[Ydnm'i韭uT QE QE QE QE QE QE QE QE QE W7-~=m'Sϵt#kbBrU7dؒTFQ.fo?@+_ Ok:^ mr# aIaTcPּFe2VP 8vwI; tElw j9Awy/ZX +F7̮4QEdh?OP\ oc- KT ( ( dZU#
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
~C4QE1 (AD $(~TQE
{Yٮۙ I?6q#(,8 ƀ9 5#ӭ"rcPX O UJ
k{q d'#$?T[h c=8 .lc,CR:ݽM!idrbR ʔƅąAa89Cu3nbAlcVsͷ :YvŅn w㩮
Ry6Z̐W_?ʦᲁ.Iwcbz@ OmVF$,TA +1A$s3(;[ٽ+]'UK3$ӻVgo1%_*0j Ĺu*p ïF!x_j)%, *pX-j̟SSv3=@+kd`kB]aGP/ݪ귒oGLF$t4Zs}j>Bk>UV9MZnxT?LJP.|* S-6ijFY݉' (?K.q0#$Qswf%cs3 coõn Z(
(
(
(
(
(
(
(
(
Q."~# 6dVr>?~Ț8
Coxtr̍++ǫ|?s//\Gxv̈NMury<*=GDj'VGTV$?ڳ#!3MވKVzQ\P\ o? F:RB
(
(?IU?
R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( W?pS@KES(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
H Rua"<S r9LF; $jkʼnnl` =TI ,bvO*<L qSH; WpƱDQF jM4QE!AsS?[tKH:R( ( Y'V $*H(((
0Z.4,jaQ S?TAIj`{e{ Ky5 d B {[KEbZI6VA =z۩ʳYڐ3G=\fky ^'d2 xnMDCiB@s|}?hv͟w< hҿQj$-ɴ+/9R ֫FI'<J pU ZkSTԀcMu*y
mb 0N UK/z5 H!ee9P t5lNfJ= ufbg Ar/۬ $\+")* h sT{ 2VsrvD6/ x裚 NBhvD ߽jum+lTs ;-,^kDžfᡕXn {f[ 2"6pĥA# hQE QE QE QE dU^\;i^=0
њ14O8/|<e\Y9 ő תJlZ+ZEд \@ϩ[` SauM<+]1P^'k"EcϧZ"Tz :-^2I _SIFx+$?' ZVyY3+ ^LńW3mCnr\(G* (qȠ ^-I qԷ6=_T%唦 K#|1YnϮq'VxveB+(VǙi4qͩ20
v#: X7m$)pv*T0Mf]1XFa$Jޏa%RI<LJ r8 \ᵎ}Bko\ v
s(66Vh`B|H=a}zYզa̻ `W5e` "Y
)%Y:qհVխ%BHZF#Ԛ {hdB ʲuh+,_pI㚷uaHZwQz\$]ܬB1ma >_n Cj G /w15ͤ+unvLf taȮcP00 E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE U~B )%)(AI !=)i wϵ&2o3ڏ3ڥhj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j hj<j ban=?Y y-o@ )iJZQ@Q@ $*UdZQE QE QE =@ﴤbذ8r һf#j%$CRbh_
[BEO!S ӽzey~]^YK,Q1;<רQ&(B\ƒ r?s柧%-s8E:t{LϻHI=oF?_ͿƤ4AY!ĖQٞMǏ'F?_ _NB[c?.M.*t(,ϴp=UqZEbح"lt{_q]\Գ a[p*K=>?ٓif< ry
Z: Dc8}cYiڼ'bF _Z۶,kT;r;ڮnXٳp`r݁`tǭji::EVɓHBz= bVfs#d Vhh ( ( ( +Ku@]n#k i- dziNK!,q$K! #{f6(Q$K - ˨or?z ^ z(b#cO*3SZ;]-I&l G=v7B[uoZ?*Tz>eMDĀA GJe [ <rǣ4CR&KiY$w\oAg 0ԑjH9 ea qYtP5q8f㌂L@3hӶn" X6X nUk+bܶG:g>\iI9
Gs} g3Fvioch8$ޕkkqm3,ں] [oU*T)ϱ5;֯clvm h/g,$pnU%T~ax#DEq pFzk|hh%1d3đI>bNxLLd0# djZ cL ldn# VnV "[),)|gi UY!d[z.K0wmb wW ۴
5,f
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
~C4QE1 (AD ~O Y'IER ( ( ( @Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R( ( Y'V ~OT( Lё\cSSmc\FI
O*PM]UdOcȣ"s]{} W^ o}?fQ^9 >T+Ϸ>U wo/=2+? O*Eu ٮQ^9 >T+Ϸ>U wo/="Eu ]{} k{y)ydW+Ϸ>U G]Ocȣ"s]{} W^ o}?= _{ E G" QpS(ȯ W^ o}?? O*fǑFk? O*ic{
з?`N :w.ⓦVEVGHQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE U~B )%)(AD $(~TQE
(
(9 -W_m %AIk˭<ؿ$<5h2k fO'9/{WQi6.ƨ2
gsɠ W^mEtP `q^]Gb6ɻ 綽{6tNC ÷jQX M``v8un> Qmy5 3O
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ]qҬo~^~jcvJMҟE 3kzцOQSmo~mo~([ߥ[ߥ> fFOQSmo~mo~([ߥ[ߥ> fFOQSmo~aiP6J]ҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6J\QSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ:4 [ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~mo~([ߥ[ߥ: nFNQSo~J *P
h hb?(AD $(~TQE
(
(0|=gscd]&2 ;}*}n+Z74^OZP+k{x#"p9z˱o9 7^{@_cn[wdug5E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((~jOT( ( ( ( ( (ڕ1z}(:㞸@
NQĐ# kB
(
(
*[4Rʅm 3ǵVtІ䑿8J ѢwÒ b
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(9]cXsii*f#=yoW{ k? ͮ)\۞uJz_: W(:YT˹ ]/W{ l _(pil _gU fG<sKgU : W+69=_: W(:YQ.%:GΫ =
͢ywi.Ϋ WS- @F@lt9k ~kJS|fjI͝42mH *{㢉 Uw| < E Un:(n:*Wɹ ɹ TP_&{㢏&{㢭Q@| < E Un:(n:*Wɹ 3OoCV=tj+Oq'AIV=t y7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j otSJ] $ }
ʮQ@ 1 Q#&ԏ9M d ?/@s =Gs =V
M E M EZ*7? y7? j otQ otU(s =Gs =V
M E M EZ*7? y7? j *J!ݝ8V U =^6'ޟ otQe :@| < E Un:(n:*Wɹ ɹ TP_&{㢏&{㢭Q@] $ }
ʬE 1 RU[/O(
~C4QE1 (AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ $*UdZQEj6l>m<:\& VFi|n\ڔ3X;K WC0 4FRη'5 -w #r}*ZЭ"R9QAb=qPGi6"n0+~Pߨ# ?s^&ӭ 5m!@ aUs M hZ;M8 Ԛak[Ʉy'<VOkHU
=OEg
ڮ?* ܶ4+uk- B Y$cc+uu,?
?t\m늓P%`ܦT]ߒY Pcr7R<r>hU#06wǦ+kPm|Qԟjʿݭh[UF U4蠀jlU L4& [+ZIɨD:0$(f6v@* a85%WQ fAw kU*JfOOkkqu3(VێbXx*
~խTKUQ7@ -qK1 Ÿlm2("v2^P6 V</cm%J\3 xQavrr ϭ[uxxqckVZ6`uH%?S@mag$d g5;IGU4=2ʹXPK<:gষ)L( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (5 O Ef֖ !i ?.)@,pI J0Om('>Z{[-t0ۓמ+UMRm]\62?w늧]Vs
Dma8ǭ($b'fd fC(IqUX0:o|S%!XmF她2 N=Ex$X] 8i0F _pkP_ް _zK{V ;WV/+ OX3EEZ:|̍#άdy+0 ~k ~j|H҇Ǝ_U>` *]^ H A}N*q7<mڄg4&ξ~˭ G ~ X.lNi%E,8 zS{!g^f\ g ^ 1HdX+ BxMid3:ƥe Tl.I6Z dr~V#5gOq5Q#1 |sPWw[^ivL>Y'f MI\DXy{]rpF~=*mYO6o,%ڏ\6xl 3ҹKˋ}[}?nHv!fr;~uF&+,F68u=+8V+i3 r1\G Ǡ z *{?U g? Z_쟏UV=tj*ro<`Uss0Q9)
&B\u{mgm38fDWQ}P lD ?Es$b}LI fszR \un?!
X`kq!N Ґ& 5;̀ IqRaNwN3:MIRcos.Lcs88ɨMA/w#MO@ ±}DxF =+ RIvG3 4q$3Kgc snr訪 01qHI\LN70h" KQWSg=wvF"ȩԣU6 (YH%H\魥ˤ BS>N?̂Xm[,$RSm >wn}}iXܩʸ; Ꚛbetz|j14,A[n%R{Pum,u/4IukD1,66?yyK}-"բCr =ހ;}/Z~c nϜ.F ץm$s &є WhC-B(k&%_)X0Fh({'>` *,? D P(
(Z]`Iwqq,`Hȉm
u'ހ:+GDǷǿ9 f^jBȦﵳnNq∭&>Kmf}nbOӡ쮮8y jqӟJSkhĒ#8W0sP[q-6a,"RpedSԅN;u]HivrS̈>z $ey|!s aeɸAFri<qp,41 U^Ĝ`;MG_$] d~ JĺmvQ$ 6Pv%6~i,ks3x
x8cqxO+6g!@ ]Q@e ?_ʭUYTV=ujDz~?έPP<VдA>n~i-RZq^B+i<h< JV=F]ҵg6q ^4v]C`\qgֺ
kR1ܭ:) P3
NJO|8>AX xk~ MfYQY~egs$`qVQmg
*{'U d Z( W?pS@KES(AXt3=m eiEJI3*qh :; Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>; K[} ƏK[} Ƹ(;'-o ?-o 㨣 Xs h kð}b} :>% > cSx[Svz ǵp F/j'B
-\+&I )iJZH( ( Y'V $*H( ŐMpLe6 Mj[;:n#U8 "d ZbE cQ1@ O$A5D̪Gg?W9\\ Q^^weMO.cuWQ ǀB.I-[VMaᇂO}K?
8В=p1Y> Vm"e@I;x
4RKV|Npsn c{
@0^N kDY̲ F *"
A q~,A 6EL( G]R5&T""{䌯= }z1I8Q/UmCGU % ZhdN^5Gʓ]qG cSa{ 5nK}OTdvjτdA5D̪@$Q1 % y|KkopRF`=K\lg8+eV ( bu
G} /1}+ӵk-9()
L)F%Ua y/|Eoہ$tE 9Njc5血
UUQ@S'C MָC 'k((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((<-? AZZ "k<
쭀kQB]u Oʧ֩8 OҰ n8
Igw' 3ZV6kUY*I8 WF].$]28z9 'Yc8e9E]$C=!$:qesw =zW*sם +.܌rj6Mn9ݞs罹EIp^)iSOcKΒ}&YfiG'M, <G-FI .~U;U)$67$(،UT܉J]?1]? $ U/| UjOD) AiPR;`@rO 2=b* @ T' ƬBx-Qi%ċA!Fr; M gbr8j['N.o I5* cEh6v}8,ry95R4; 'LK ʲf$ S] >6 ?t
r-H:Ȍ^G+
ij\Zh)BCA'X72G6Q[KI7˺P$X//#yXڋèl yO/?w9:uך6\% +6쑌C
gY(RG`|c:5鵟wֿbZqO¯
(V=uj dz -U[/Oժe : Yt F-k
F,vr> ! N PcV k T'C,n< / pU? G TIszo[{/@|;- { Ցm6<+PJpWoPO ֵͥ& VȤG%ƿ4p̱ES%o˨ˬ5E1V pP$ ?ӌzƉ- $Ww* 93Uจ<k$g~F,[C85cE{PЀ '[:~cXG嫶2O=8*ր8?RҟT-
(;Ks paPҶS-()p.ͷȮxy )vv h:~ -mn0ih֟غ*%aZIX?3sү.`pscҫ_N8p N)xA?ڇrG\ֱiw:d J䁏R;>{ [3Șfp@1ҙcbyv0@ r~M c{QƝۿ8=k +2Fym q 79iE ~Zs@TQE U d /E{'>` * EP+m@[
1ֹ}#Uc-)1 R~k~]nIc )G=FE>g¸df s]
dFK1جrGlֵ jUNu25Ēow/ʙ 皥}& Udm7H@ >6u cn?Y mg =:9Un} !J]^$ˊ1@<SV<A h%s$0'QXaGOuW wqQRH#j퍽BYC+ r# s啥]K-B½Y펞 "3ܳ7pOqbȴ(.忊%͍߁{tEe<z(* 0Z /V{'U dZ
w[B[h TYŲ}ރڽF
r:4X<Sp2pi %"IQO^"'$5 p:wg gwd F00AxR_խe9=5~cI9<ӷ=M' 0zk?_g oz CmnG@ME U[/Oժe : EPT!~ঀ(#(A\g?/:<O 쵵>rQEzgQE QE QE QE QE QE QRIّ0 襧G %,ǰ41Xe$I )L-`( L vQE( ( ( ( ( (vh S=ޠF9?ҹbT]O Vl͉qA [Uhiw 1Mg#OyWUh76^uSUp0=xkU^TnbbxIa~AO3Y!:;3>&֔*NΦ]+
# A5Zz?b &iHҖt$((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( gB Y<L1`)8<\SS3͢_ / yƧ]rfZ_گ Ǘh<G$c6<G6 <? 9%=V6 <? ?_ /.͢_ / yƎIvg.m yƏmWx4rK{9v3k߹ Zs % t}9!c)I- iJ
Jڍ9)]B_W6} C֛ xWYZ? y? f? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? j dz Ώ:x =EO9'ڀ.[/Oժ=R5G8#ڀ.U|
<
EUn<(n<(-Un<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
i{DaO`qP? D TF"F;Tsϵr3*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? K 0Zi]ڣj*Dz~?έU%Yt9 :x -QU|۟
<۟
KU|۟
<
EU<(<(Wι ?ι ? UV=tN6RF"F;PQE B *P
h hb?(A\g?/:<O 쵵>rQEzgQE QE QE QE QE Vv% ڿ&I8 ~EE]:1#&?Lae%jܶHF~OtȞ"dm>Y'&v(x mCjgcg?ҭrAy7f@c8MI#ӿ~P~NŃ!y+yX!N1u)IŦ8)tӎy;<{zgGdYq.k./wȈv`[IcJQnQ;>U*[=4֫sOص
Xt{ڃLn?kR7jTCvK$Q3N*ԏfJxW &(#;zW=C W % m4 Vhϑ?M /B[tQEv aEPEPEPEPEPK=u-
m( HAnO{m P.qǯ_\^4NWFڶ-?zXȮc1lyG$y ӎ#>Xn3zaܬp=8(Frtq+K)8@ROUuؤ{HD.sg<b/KxWyw<5]V]4[%1=;z<K$
D1'$_ʸ*|CIi/4a$YFI Ҹ02jvDɤ(O+OG _/ei 5#GJZAҖ
(
(?IU "GJԌu֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhSrhwLw-ր E3-іhS2ޟoOր E3-іhS2ޟoOր E3-іhSrhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swswLhhS77Z77Z }֍ր E3swsw~ૻR
h hb?(A\g?/:<O 쵵>rQEzgQE QE QE QE QE QE6W_ $IӍߝQei
1T*q["I=ٸ|C0 ҳm.m%i}pAj*qZX e-FObm2
Z|c*ƢN/VT3NW!~A ˝R3ěV}o{<k%Xciȥ.ʛݰ``(%($( ( ( ( ( 7m:SF(/;38ҙޝEGؿO618g>IN\ e?ΐ QE\i;"%VR݅QVd F/k2 MEO#- K^IQ@Q@ ~OUX?IUQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@J $Ԛι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
ë
gs@f+
-QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<(<(Wι ?ι ? TU_:x :x -QU|
<
EU<) ($$(A-MViʱ('$RhZ*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z? y? j\ xQ\ xP*s <Gs <@u Dž u Dž Z>J7\ V( kp[BgpͻhϷ5Kg ? ֪ީ:Z6wW ϟD h "4 ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\& > g ? '=;l ??6 ȟ }ù\,~5RMjU{}~C4w, CQ(J?.5#/(,*?pUE(A\g?/:5 #*oٻ< ڵҚlƺn
# _ / yƽ i Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi Ȣ _ / yƏi ȭ= B1Raj _v[^$ŵ9;j*TԺt䤴;qҖt0B((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /| Uj 0Z+?P=ڤ,M<\ hQ\ 1 % /LLFfE.Xf7VZL˸&~m,QEUKi.dG̸̱<@wl+f(pL}qO5, U(u 43f6'=8Dڎm'qqn9"h5})V㷭*jd#f8 H{ ТYk120\xۚ/ [ ԢtD6PREb{Ҵ( ߇uV=tjYDz?έ[/O(
(
(3)w!UFI< s@?o 4mo ShN<YT7#ȩ@ EU-GCK,AwXz M KEf l _:
w ̋ߑހ4h`<iE20Uۃ ]ShRg14#te "&ih
_쟏_ d /@ ( (- Ussnи ܨ4\]hpk=ٺƀ,QEUX<3@8"y;Qf>u<RA<W0
92J .!kQת# _J hFO ]ۢ'\ِ/'1 4rw'ksGV8@ /| UkV>` *ڀ<)I+ޝMO)-QE1Q@UKU]*CA[̭EO "w uI 2`lez*u'LMr:RG^tI3.r cߥ.e9YJ(&b#Hg
8*n >
9%)QWFm) 7Ufeda&@AOA)'9Z# fj?7Gf >
|JVVF(SJBS? fS m\ x_Q^yP
T!Z((AD ?IRc-QE( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇JZAҖAEPEP?
U` Y'VFQE QE QE &ik<MmVS{
9.1%{\gHȸ??rGR VoTྑvRATZ+ S3 {+3X^%v mbqM=H~?֓*J=2")eXUw73N2~nIuin5`ۅps@ 8# ˬ. uTMeeC;_OZ ?-\DF )~=KZYEoq#K"ؒI<Oaj@Q@Q@Q@W j!]N[=&9cT 4h1GE2 GؠYBA|;+3G MOT]Ynlw`#6ڇ jO\a mh2.eaOy5bИlI@ fj)fi* 'JeXZL~y`rZ'G VHU'8X0 NKNnV>[g +7,,k&zFIhQ@Q@Q@Q@BT[2 *|Kǽ;0Eai^!dаhp i5`"iSA$S~o =
Mp cֱn4ɗSZ)u v v@ m B*;(c-tU1屰g v n7k@U ܧPJz
ri,:%ΦEC1o\8.[\&`^I2,zP{MޞԸD[d{d]<H,A$ u{RC;Ak4` }뤰Ӭ6qր4jI^`^<oQn;oC1TFGQԛV/]|ݕ`cڀ;j+dMJ6RUWg?w] QE QE QE Q\u[6mH7Ơv
aczn]P@#cyޫzcQnGP 6+gXkxgViP3Fp3 *ZI3M<dڤV )<\Uݴ0Jp?%i BsVlԒybEأ(B5pdPpCYzg,e:CC ?JZhtLy$m6GӸ zCp6nqθ(WHK
v:#'B[^=I' V# +}pݖ m vRb]Gn3бvcIat6ok=G%k
qPU,C`" {JfK1I䟔ֶ
vS`j y-0l.Ǡ̵ 6"ԇi<9?7kCSJSqs1
3ܝ(Bp1Zֵe @i_P6ɒf'8bD2%8$$ctW!]H,N\}u QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QEV_U>` *@UK; kvTP:Ε>~SQ ֺx?ڗk8 X6mĥCwRHvZ,QäGQ
p=HhR=zM
y[]CG"C}+S d
!3z mzMe"v_1a6&q5k&e2yw
ǭuz_Y8 fi70^xPu?*W< Pno8k{BUCW7wg%Ʋl>czW[ݘ䲱8un
3cvZGm"_o<F2Y : `+iȖ$-H_{cZ>-"K $ZWq̛ >%.b:m-ЉcF !W ֓]b*9 FXcd>v3@<8-gZnKiS* K[a'ۡϓv3. DIs9X%l+Ubdxz5J!T} timE19h;-qܛUW N! & ]oN{ }/_ m6)cɸZ,1/ rdɯN;US`:4/HZJ *{?U g? Z_쟏UV=tj*! cy}paXynw#4i<o TUWi|;q
ƜOo'9$nGOK<
:(u \d MeiV7),H6
Aa1
u \d M hlir[C?sZy&D}+LHݷi8@YW }I ,2yinsbIB2=]7Loܣ d;Ě51\|ژ<c#Zoc;]s j} -B@ r p:-Έz-ީ{m&[1e0HsֻqS7-l-# 'q ۀOJƲҴ4ӠFўIPw
~r@9=kբ Cu!U`xqJ uh
X2HSXG zסBI"F(0Fy:W)S,%ʰaH9˷ ƶ<?ac}89ZޡhS$]ܶdEbEFx Nk{7ZN 0C 2GzV.i]r#^}sIj%bU /#@%Ƥds
?
\vF)c*' +7yk MTrvQ@l? D Qe :% ?_ʀ-QE6^D6q'L!/Zi4XX$ϻ t~
G7{6y[T,u_p[9[dR k6ԕcDGmL tHhk=n[Ҫk6Wm Ф7P IlO #uz?))Bd\xs9H ey>?rfʲJ|`S<99@OX8Up37J^K@~܂@id/%张@2%SAm5t^ ]P~lr,1JdD/IX=Ÿ%c'G&ѢWAk,b
IԚ F{{vhfs2##
?ͯu[KTT9< ':O+ŷ3IG ]tcZxH-gZʅ}gLz{Yp2kWPgm;K,W ۂqmn:}+j{m F~ l]QZ8_ӚΟjn96N(e2ɥ'8i[-??#}+ax/*#ҳ/z. <E섨
wQE U>` *ګK 0Y@ tSE:x) _Z~؟m S1>m,\!}nGvJ5O읱ht\Ρ76+*54S*{ *m.Ϝ}̌vuukyԡ trzj4kHDN6*Gh>ȏ,̨$o`ӎsךοUK5R@'0eW:ejǩαÆfݻ g=kMخWiHwoҰfXQ'hiӸN[=z۴s0~» *̓E[UuP6$YOao¨ 2*})[-`.hLA,W`J *pA`{3~q<+ڌlg V.Z[YI G˩ `wG?9:<L
Ɍ9 yl8hSזXd$)8[n$}4k&s g<=( <~l v< sIpH kIS@E nJ +C50쮮1|8JEY$y݅zo ڼS m\ X_Q^yP
T!Z((AD $(~TQE
(
(
(
(
(
(
)3Y:EڄK0PRVAO kIREPEPEPEPEPEPEPEPEPKkOeg*2K8N?_\~~A;=kV4Y cvNx V Yfq ssU?1 _ X_) vx߆8_NIo
gn-E_ 9
iW]
=ͻѢLcAg|=~=ŝ4sK?F2 O!loee[ipַ-/-: VYA)|>rZ5_#rDZuW( .ԷzK~ # )iJZQ@Q@ $*UdZQE QE QE4mD;@ZAcX,jW_kksc#=).HK|>B:} İt|# " эQIa;(PK G o CjOaxWwWZ\b7
~$s闺żp\y+[ \g^p8w]hmC8\<:c<XUbUc$(~&69 *[x0$rp۲kԣZã!% G.IMmOH*%lMɎo{fIf%3 p~8M6Ff)ILwf( RGhcu4u lY,2%1wsOmbr '澹ecc.$I68=8t'ҢvH rmPEPEPEPL
IYf8M y uI h_^eɡVzk+%4Ef8ڭ[⪠j`ub]k
;[iʡ
95{'K:b|ԟBsJҬ^؉|ұVvaUH<?jw˩ M(< Q#P /-H8GB>}m@n.h v>w5ݲɧj"Dph:.?O'x/ 2/ g 3YƓi5kNH`qc>FY=OOtjΪ8e QWKkwo{ڸxۡ Um4 uXIUG<Aimj\Ʃ6s@h ( ( ( ZiyY *d/>ƶW ϗG6aUѭey
Z,mfVT֞?Sׁ]LG#(A%ޅ]2͌}=+[%mVI
V7v_ $ /fYG#R2dϲе]09%e
*PEVHIJfMZ=<Yyˁ5R\V +!=F)Pc _ CKY_i=ŹذX``t84 %O]\f`;`F0o7
w(ZHY]ɕ3N $c~t1w!яMw P4<~Ux=`)gPp}Z/$ʓa>mGU~dol p1zM IӮ,>=d#ȡp{c]i K
]t Vn.4ȨuUNxJN 81#K`* ĹVxe'z8Xݏ8?_:V/'Kˠor2N9Wnmumv1KgjNX VLv_*XSJA 2 ?gNN
*+ M4(V p;Zլ[{QX j bȮ85@Q@Q@Q@kEu]*cI;W~J4eƍ"iKlӎ{Z)#'7+RK?}\=jGߤv
I7K<u66(PF x+USoD|leq۶!q\ G4F0L=ww{hN$4+s^=t2FIl'U5dRBxZSHu߯9-=i&9_-+QR2#֬e V@< Cg^Ykb%IJJ?ʄƻ+ `0Hi ڰՠӍ{%y>wb'v;PimF-SR?(ns0kY v/ZiZiDP! ܞ5a _n-CCn P4]X呲e_,tAjJ]ޥ:{zۄ K-rWQ+8 v ~uв#!*FAx?ZZv]jh8$U;lb{xmY 1\@@ Ikϧ %XzdP ]i%W7 Z#bG Am<p k&aIۉ\ {Voa Ƹ,s [ӮRn P1y1,[71 sӚHj5U FIaI%2Pq\W L GOϥ bi݃vr3[0 [o1\LUc05Ph: s̓'F ?^^QX=&>D!ߏJz ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /| Uj 0 Z( KI|6vc } S/t8u=Anu`=C }x[P&|; FRt#4;Sbuuo@BZ3먠wPКK2kt~n9 U ڛkxe$c玙YE ro˻!L4u<T kL_h E[c 19'zbZ(o Vy[vͽ,AぎxoRl
MwF!Ej(sZo5{yV1jܩwd U@ m/b!n0zGNih dz έU[e :Ul? @1KE `i}ap:`Y#;~nOb{Hzˆ[ -%u`>rMoNCOK<݉gs55&k`v>*Qm
6
*dq SuoWN`6K2zb( } K}.͠y|$vn2+5\
: br+1J-$gw;}OUJ+l3!Mǜgگ@ |gk+Le0e:cOl//ځs qIpZ<W]E sZ5͔%.]ܰfu 'N ў[/cI2[F܁3~Q@ <& [Xr+m/m#1}`M}:֝ QEV=tK 0_쟏_Q@ .!OmqlYxm3 iNGһZw>"$İ8b;:q^F)hn^ mCR[y-ؼE2IvҢvo$dI|zgi;ka<?s-KnDBxN=+C[[V%fB1
z(4)[6y[ۜy$f'o4yZPGbtP/qƹ5 F>psU ;ҵyWu1sGvtP+O ꚓ\(D嗦Jj
^dY#
G$:k8En? l<9}\qo~LPȋ* ǥuPEPY= UIE:tSG e<QkGX˙ܿ߾#T')?hw r[~7zN[6ڱX]Ne;U
;(
-VY s*)D 54Al/<jZr,O 1 IӋwcUVFZqkj~Y*wm<@\,gngkrCι):Q{%e4{d&hP a!^ƫ鹻@rqӐ>E
Aԓ:<M m u ˊ#41VC`6G\> -]m4a۸>?ʪElFM+<- + u Cj(L(@*?pUE(AD $(~TQE
(
(
(
(
(
{9uD$}q[.`[y-߁"@ ppwFk
D8P B@ɭ+CXB .okܶ5F p w:"ڙ!`n|ܿ_닉ZOCOq?\ δ
ψ Yqc_ZXcXccݺ^~ߪZ/Lv >7vKX*/ T{+((((((((&g1St@HmALgQh2]Hol\=}ǽbwZ6o(g+}4 uXL!b<)3\kdF@ sJ?Tl1|=sD͛ƒY}LP]`CCs1L.ɂUI e_9/-$c'*yZ4mic)`.T،umPj~IٰƸ>>kM,N"ɍIO5pLv
?[֯[H1 =]k p>D>E T?[u=As@-P((~jOT( JZ&:[|e~m cך ϟD j$FRtWx "4x "4 u.{D TV"> o U` v "4v "47DŽ>~ 8$XP p ȟ ȟ/g Ey'| ' cG'| ' cGaxw= > > K{xw=O OƏO OƏe.:+?<? ??<? ?=s< ϟD h ϟD hR Xs_C"k3e]ݑ +id)D r A(/F 8? OoXZ9b1P ]QE QE QE QE QE QE QE QE R@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@&2/-/SM}0 ~U D<= > UNV34 Nҷ//;sOiE!Q@Q@Q@Q@&)h(Ǎ%C 2iP'u;I\{cp: ֡ T/]R/&/SM[ ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( p^9r\>mժ(m U(m U(m U(m U(m U(m U(m U(m U(m U(m 𨥕.Sɇ- WE*['6Wi888"@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m m Q@~m !FK7`tPTn.+0N@V
mhm Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj β ; Or}*PXϦ
@lpñKzb
) o_ZlQOoxNz`QG`;֍^F [}g_Z7{}my}h`Q>xNz`QG`;֍^F [}g_Z7{}my}h}my#K ɯ]l ($$jVUk9mJEU~B )%)(AD $(~TQE
(
(
(
(
(
(
(
( QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((V7PUW \4?MH_Z73 w4f H]E;tW } <?M gd8E/F<? > T1 ߳Ch9pqa1 Ͽ> Un Cc Ͽ> U x} w w4} g={_x} c [f w4s> c G# } 4?M fg # } ? V١h4?M ϸ{80 Q LJ *~SG١h}DZ LJ *F<? > Uh>SG3 =MH\Q#;&7VHc2:*_Cn$ě֍L4?M f1֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳC0IF} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F fGR8S} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳC) fGR8@w֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zdu#~U7١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?M f_Z73 w4} }hϳCh ~z>SG١h֍L4?MBdu#~Tgzѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} C֙h>S@o_Zg١h4?M ?zѽ}if w4 F} CS
|ƑQ>~ঀ(#(AD ~OHA2>:Rc-M() )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@.Է]Ҡ "lt ҖtQE QE ?jЬ աR0QUpOPUU{W j ?Ɲ*^Ċ < EVkkycg
(@ (un
j 2iyk IpS3hđ$A$lH } UK{k-qn_[+ Rֿ ۱t
*9$H2HB{VFj>z n(# ]'T *
(
(
(
(
(
(
(4 QE QE QE QEcTqo$cvc4ECt 1wlzdf
ztY3 @QE QE QE QE QE QE QE OP[_QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QEUA%˄Rp3P) NC vhhRhdv 3! y\ )8 4QE QE QE QE QE QE QE *t @E QEU'1<jèf : ER /Ƨx'dTj)3Q3#r KERMFYDL+ڭI"D$
} P%4xxR[][0u2=h -Y.pdOY*v/$p8fy
EPEajZ}VV 0v15$fIUQOj MBw@Q_mEP z?O@Q@Q@Q@Q@ 0Nb j-?~b hQ/q Sz պ (EUQe`nIQdVw[w9+hWi <go|U (=jv֡MÄp3(
(["C+y8Pz XBTd
+i1 g;*-?BIE P袰kRi",g;q(vX4ȃ;} ֫W_ w(
(
(
(
?OPGO 袊 ( ( (qp- 5B Y{g r0bA*;+qP*9$HTOVMJ(R_-
E Z ( ( ( K~ ΫX R߇M-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0/Vun6y9BJ+ _ f(S@ ΟL/norvN{=AH`Uh%K_ <{nxpMq44b'4u[kovmD85[_[qFXtՆ60-.㎹ oǯ?iϢ˨3t @m ր5luktPm22[cԬpp,MMjj`qLgmld DijEN FNct5VVգ e d7hhW
uOp喋\~% # mqI
phl'Ӛc% ZSP~nvs eBU]{gh|=
$/p<8 vIҼP' λ-*'Q $3UtFr,co TzmaX'o [\7?/m F@5HUd`*䃟4^9m?Z|?aԢR)SkDf6 =Aq ˏ wTQE A ??ʧ# ]'T QE QE QE QE QE QE W ⫛soy^=秥vx[} e Ʊ43K$ > 3[Z}ů'i Ī= (Ew觐W^qЏ Q] .D0ݲ=: : <Ey_qޫce`H2A Q\<vW銑YUa6?*ͅyH'A> vw1_j j)RxhU`zpkgm\i
yC?z*Q W ʻ
<Y$o
r tQ@ZdPHHWApq\=k&{)`9灑wz|* @>Y ' kb(0I
1rRQE QE QE QE QE QE QE OP[_QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE p4=DC oTSDu*~ o ]ŌJ R0k#Soo)8cX w%ޖ38 v<
.!Pݫ1U;Ic (U<GH*@\@- gs kH +ol\Nt4 vjVv)i3I1`suRdK_W/+2h[uj'j
O*;-^[ɗ;H iC,bbB 6 N:[d.U@8=((((((((((((((((((# ]'T *
(
(
(
(
(
(1n`8yo',E?ɮۼ2)n<FHOc< Gavb&o8 I;hxQ'&
ͨ#+81VDžUyvʳ.'do*o zX_JA8cװY>I{8ʞ#]5e1x d1ڀ,X:f"v OJMwʶm }u QE QE QE QE QE QE T z? OEP^uE'Õ;N0|xx^
:י
W0T$_$ q]'xs'qƄZëw)~ohVڛ# ?>ម8@Ea^WͷV?/_9lV |G g#*[j/>ݓ8 j K{ [82A'ɫ%Ԓ;1i d ul`A)8 Sa qg{O
T/Q[6$,9Or9ǯ`8rJ͆f`qmo b`3l 1lީ8P9DQGr_Ѵ;: Yd.B9 c^բfقX}* o ő\ ҚfD^ ,÷ dXJoj3$C, cu{ u0$
HEKkLWQ<8?m>vQ[ O' xjt摃O֦P?\@.Ag ߨ%& 2 dO mp #}Vّ t$1ah?aԢR)Sk~\k(# ]'T *
(
(
(
(9YD#RH: 5 d 8OZW̅'p,|@<e1 mYUO ~sNέlh</gc]g? C
4D].%'vKMID[6c87)-s}Ze22^~<S-i沷TQpj ص4հyH`=p>Y_]G?ۢ Lb˂v#~UGmn&B ߕq6 ʵ) G pv9n bpG;WMxPE,* G`l-`
H8IJ6>;C'9\:?J Qie-Nd ʲ䑯v
r @=}W4]JK~S KUKCݑ ]m[>[o+&`pjw UR \uy:` -m봹8U0 0U .&4d\;U}BMeZ4YC~.0NG^OztfW<= ]W$w(CP*y6WY.V%Ιre7` 9? 9 "&N h 2+?Ooφ?{ RNIs+c
_C\/?] c20_p8 H ,`H~x V ;>a>-AV PQ@Q@Q@Q@A ??ʧ# ]'PQE QE QE ͬ m#B!ڙJA5S h YJ BO^ ^Koy<2P,p`;%Ŭ:|#WWwǭe `bIR aA9HK)-_g1# M4N^L @kP ;.aZ^$[ ok^U]`,(6=z.RT8.#Dq$0y ktkR>`?^l"NP"'b(((.Է?pU-:E(AD $(~TQE
(
(!xg]:Ƞ*A(xbeI]QC >ֹ 5 V] ]e8QCqEH?ʳ5kɷ u3XDOjO<j9 ه@ 1t$5@u ?_OIӒuCfj
IӮ4fg`rN}M uQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OP\ oc- KT ( ( աY =Ba\iځUQ4:=k8mKW\" aU@ >䚒 }{I+on Wa(9̍ihsYV=]
Ţ]C$
W<'=EtRi֓G S&AQ@ U5Kɬ80pv[ZLi R}>b t=R <d?{ Z>uV<d`:`
([wcY]6od 63֝5ͽu~ 8 B5 wW!\z
vp (ܞ=6i.خ0AMuPEP z?O@Q@Q@Q@Q@Q@Q@bk7_wg8 E P,"-Z^3ʷp}k:C-%ΆNnҧ (;{y lo#9ۃx3N<d(s;kVZw p9+{d#mR}O_{Po
b("T W#}UN kk22 2N\±@ !%l ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( <9ޡ&bns+CUSle;+R 3f >w^Z[4M8 D%WA9 }5,kyϦ2k0M=BE3/qk/s;z$qںj( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((I,/R;4Y^=@ }@ u2n9|xr{m<py8a+~ moΣwN
D qӏƫ/omkx¾3s쨠FݼOm[oTP3
(((((((t S z("NzgↃ$ȶbvN
wTPXjbl|ϟca^ [Z5Y"G_ʧO=k9->f_Jxon}+7LOZڈmP' Ԋh(CϫTɭ?s`ۣ; A`EE sAo)ǘ77^H?+6WyXa>T}2IP&Ks- d="흮
I
1v WcE rKZC8
螟Vl-WMF(4-YT } ] qC2G Ը9k
OK@KG$?]A \Q@ F{{,,R Ǩ ܚE r~ olnf= YE QE *t SEPEPEPEP+麞v/*ݞrr9+ iEEW8@z
ɣJ5E2#~njvwJ,
h>
Q5uŻ-zsIn-dh ':(;IH#J=EaZXkXI
+8Eӵ+ۆ+dėl3>U|yS(2
H5ԕ:_^ΐi:g=M9=sҊ 䆛^4[@dc?5~9 +1ҴenOSX^jV[y)dWcE sF}3VtM:v vN: zֽ\˦FϤ U1N pkCDOH'_$>կE RPky{؊
<WF[2F~@9O= ;7p }j 0#
( ( ( ( ( # ]'T * ((($.||dRy5@ ]x3=ۅ
p~ ֬E^ۭޚ)fFx$?P5;{xVg"L=֦.<q)fdkF ҴQ.oA|UUP0 )PEPEPEP?[u^ *?W
h hb?(AD $(~TQE
(
(9? ʐ$|,!8=QK ޱamh{ kh}l) IeYXdG<<zvV# 7~[UmDz10qgemo4ĘyN\}?
h"nF"(j<Gʼ%Њn O5ulAsܞs xaX Qx ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇JZAҖAEPEP1 =BCo0 {5#'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGah t S41+< bL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=Am Gaj(f"
}hahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4 GOM؞1R ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'# ]'Q&JO T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4 GOM؞1R ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'L?
iߡ >CGahz* 0 {4} ~'# ]'Q&JO T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
OEA>C@P} ~T iߡ0 {4=ahL?
?[u^ )MUNI!Z((AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QEX(i Y"j #""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥+,Q Hc jO"/Oք Z K@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-Qmf?Y T yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@(̎p1'B¥?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?Z<?Z ȋȋh?ZbGVj$ Z D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE EEEԴP^D^ D^KE VX2::ԞD^
""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""j53# cYk yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@5 ƒ *Y 5EE(AI #ږ?IRc,o_Z7:@7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7zѽ}iPw֝E 7z :P\ oc- KT ( ( IUڑQ@Q@ aoߞj ? ZX so { G 1 ǿLi q~ciIG
\FA8 h 1 ǿo { Yvwl>1"i6y @? Q Lde,7"aci Wm[r.@>h 1 ǿo { Y Ǘk88 M1=sZ5h k((k-D_h C>̘l8pF}zio n?PC|͎W t4U;iʻ9{T+mL'WA@U;=Bk&F#8nu}:O&y@~q iQQCq p{u(Iy9pqEV4g\R2rO#: H
8'Ҁ'KYK[ I0' GoJDYX@ fLmӃU / _ .YKڮq8 Z / _ u ϗ7oąl\ y3hZ4ÄAw)~9
K k58u8L yMv @ Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Ej(?- KE]^:mym 7+Y 3PEpp20A $w.no'dR|dGE`X]A6~C|n2=1U`S%kYm0#4\(m3RڝE. $AF _Ҁ:+?Kв[ n
( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
)H!BTd@^ҤF O @ȫ֖s B۞J EfuԾD 2MwYبkn9$&.QT;@u ū#-g'=?
+*#afK1&Yn(z4EPEPEPEPEPEPEPEPI
OT QYiM: ;W>d\EYڛ<eFw @ Uj[Gbw_I6O JXԵ),ؠV+TeGԊfq5֜1w,ܟ lQ\MjAi7,K7z6 S?
)f<Mrϫ [ s_hrY2y\lv098 qU=qlZ 13YESZ+.~ΟdӠڹ@tW)7ޟl/H` olWI R[-v |'K-RYQ 5EahA{ۭ[f}:m$ h\sxO_+GE#Xt4Ec^kG= 0v}~,:彡kΫ1@ UNnll eW=mkq` U滷8})y<z}kRO@]I >\4"nGm_̹!.Iǭ uTV.{srAvCI,: ڠ((((OT%( IW) $]5yU[ SJ:: (bd~ iy;/ f:tAU
OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq,Hʡz;*^AERQ^ek֝)eUu=I <Wuj< }
SfmO;E$זQcP"4l" 6
JVvr8>*FQE E?STPM-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(({_ ?/\tZ Jh[K-+3P >uKr#D~Q4G *)(w q9
|1O4Uq!ID7?QX1j6`e|jNm3}}?T
Mx/*c&i ^cg"l?zlڳsV (Smyoƀ6.meY7m\jrQN&m8 aEo[t4 QE QE¥k- bLOQ B:x G[I-Y Gl m ymaq@hA&>j `L Κg܀ c mQٷ NsHu6wٷ Ns@1n<xE
XA>5ӮSmG~w&szU{i >Lr *@Lz}d,Uemqu eg *_q=6rS729OcߧQT '_m?g1Ǧzu Vwo9q}j)K`{ի"}=t%1 Ϯy^~QFySU:9cvau 1<_*HUN߅jFn`[q@ 5VK{|cv Vi!hd1z ݮcAHE; Q{hmbL c@}:E;KJ,0faƣOԭ_n4uc} ϵ sxC^ 5quxC^ 5 vtQE QE QE QE QE QE QE QE QE QE ꖥ T-U{vb랟ZCK7SGwm)xGqm>M)>|\rjڊ7.d .$S\A⤽ҤS&!N<IX>
*O :?^*杦Id<0=UGy&.|1)p j @ < #]Vn'9Xڽ!>c7gYw֖mܟ }(iǀұ L] Akm[CPc QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-dkrZ ̌@
IZ[}irgU{4$KxWn `Xs r*ƥOs7*Ð{?.{y3u <
Jc>e4<<cq@I QZEs9)QߏNE2bU8r?zt{]JΑ ϩMyI-п>0N2{ zi$ +Hp;S{UH?k??[6z\]ټ `( lKsߞTNM$БZ$& +˰UtdS!A$ Cws" NΎ3B nYF~A?\S袀
(
(
(
(
(
(
("OT¥
SmOr@D+a f<k_UӎnO,N3 c?:j- |
Gm"F_ɀbGeciFj֕XSE9q ת/u Υq?qqS@S _
O䋽3Ωi?֢~su9m'L[[`!-ܚbv7Ze3sߎ3քM=ޛp`i~ Vt0Y4K!iyw?P!64SGynTs;ìI??ʶ:- n1JrS]2 [Fv [yeM gU{XӉ,7rC S~m ^pI[e H:c kY
Aqׂ}뫵-j s4Ho؊ p[L~|
nn$[++ d#Zw[]ݙ-Џ. @O EPF NuncE8|yzWn@>4wd{6Ѡ
:n?*M nDօ?i;|+Gej,Զ3P)ijI-Lm@HǟҴ<4Ug<tkFu.c.}3ZZn|l7$w=I ,tg} Kaj:E5u'8 ?Rh˧nɓyvc෯=i Xz 8
*%u 2Jߎ9/Z.mqR,QGn)!cC+yf Rێ|˞D SBG#<u-qy.3t ջI'Xh&( d GfK5䷐^S3a:t6y _{e\i-tgY'ig(W c^;uD;
4 [Kq:[;gֺjt$zҠ((((OT%( G_uA t{ d+7VխSqpy: DbͤxP\yGn#SksrrO
@+߆Ư ;
?w-uam + q \U]
=Y5ݽ qjngՊ# (~륬٢
(kڛ{XuS+g=Ouhhi`$?o N#\|Oz k:gKKT+ ,c7w ZDBy{ ku/ I$ߕe=pk״VV6ٔSiEQYQ@O(~g T?pS@KES(AD $(~TQE
(
(9-S^"3[EPyzۆ#T ?Cޱ4J6[;Q2y,9+VRRԑb)si\ZG ,
AI.ieԭcўGMR-Z0 , q֢uPjݜe xꚤzt
|$8E =e9O?ʇ9%l>E*;dnF.98t=Z[ (1|u4 QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T?[u=As@-P((
?Ү% WjFQE QE cj^W uǭcd _ʊ u /?yƻ*(?<GV < 쨠7& y4d _ʊ o <GN < 쨠 m"n (((k-D_h ( ( ( ( ( <zs2 < q*# Ǘkih ?<G# ǗkӨ1 {X u. y9?oPEPEPEPEPEPEPEPEPEPEPQAjZK@E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@C%2Ȓȁ?OlPEPEPEPEPEPEPEPEPEPEPEPI
OT QE QE QE QE QE QE QE QE QE QE Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@D_j$ Z KEP\ wJ^V"p IT1mH YZa |5,<^ ,o/ؼ_ ?~_jvʨ m?/ Q˦h).*cRhG@P t ٚ|ve sZtAER<W{^#J ?" k9ȴ,9? J,̠\K˭WJխMVڼ8 @' "WToR:$r3BpWJ1 <qRQEH( T?pT j )%)(AD $(~TQE
(
(0|?gscd]&2A vVPgso*mIX9=i Mp᱐:}kn Դ ]C ֠ O(&>5Q@zF-sv&9b;{VPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? F:RB
(
(+| JT>ϥ]QE QE QE QE QE QE QE QE QE QE¥lh ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( T-E =Z(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
("OTU- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥l h ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRIOT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
O~ ʀ%( (h( ( ( ( ( ( () 5E, Z((AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@U6?W>SUc {VH~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch du#Tft S?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ 2y /١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55M!GSI ??ʧ~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP1 Hcrt @ h>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@p1 w4 z w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w5
CԎ1W* I T f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME S"0xCX R߇M-QLG(AI&GJZ Y'IQSvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{k{Q@
()PvJ6Ju ݭҍҝE 7k{.'=?Y.Է1ҖtQE QE ?jЬ աR0( (7P>߿=co$? Q a I 0 ǿC L?Ql_ pQyWPN=? 0 ǿC L?cYڛeݰ"$T4Ig<t i C L? { XK
ȶrGpzU}܋cP8 ϧZ 0 ǿC L?f dj _
;]?P~ fwsaZU{[ t QE QE *t SE`iL;#oQ85u}kd> rI4rFC6.|3V6Ab?. c>QU`On O,Lb?<PR{KxVi ANOwJ<n: g~EVκpdZkiײy6@Ads@QUHm (U/-y-$@\ USZdh9w4
>9
J+Ai3;9Y
Ĝ8 ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袹Fk).2BQހ::+2Xӯ%- g3Yk(6_ _j b\R.bl~St]8F 9 lQU: 2?%f[Wޠ$g@h .y.eɇ~SޠgK5)YID\U8:KEsZ6u}s炊vZ (mWSJC6SNLiػƀ5袸kZy6I V Z (ӬtrBzd\EZ<eF1ߟ테W-嬀u
*+է7Vv2m1bN j[[=Z9/ @yE <Ld ֬Xj[]۹e94ErVIumqxU6z Yk}@ WA(ƽ=)*]b0W z5 $ pЎ(B((((((((((((((((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袙$$!UFI=V2kLp 8#vё.d_%sך Ee:mD 2OyY(7RrI ]5BRd GQ?nn Z29r~_ȰHno$ 3 iޙu(s@
Z(
(
(
(
(
(
(
( t S z (b&\5qejo{ ~:+ծ$'
2I- xZqq]I}5-JK+y%bFT}Hh7i5r˴چ}4s}dwaԣk[ *cd@TQ\~]<h+ O vU;eg%2?Z v{1 Wzc @ڀ:+3ImB.\aCcE7X:uN.HTO [4ErS niPK"*0?cKedc4bl[iG)n `]@hfkCQeȊ 8$ilu3H& F:\\\qhU8W[{;[vXw oQXWI=݁Z n?jͻMsO{!\B qE uW7j"Y$ۂyې?ɩ@\)_k)P@ mVkky#gҝ9?G^alrz* yA@sW?ic&0@z5٠Gڀ($ n{ H oEPEPEPEPPGO I T=Q@! )k.TI*Wu>t__Ώ:/\x7J*w!W =ի=
P[=&mN }c2~ug&LaYXZ5oo 108{
ztRUt QZUc÷:,q m *@kh(C_;[V+ Nz+uk]^\ OU>ęIQM<V4DAMyU5+V1#F'|n
*(ZFZU
˜f0( -:bK~ Ϋ4QE1 (AD $(~TQE
(
(
(
(
(
(
(h]\T3 KE %`:8 IEEXX:r*Z ( ()1:ӃqREPEPEPEPEPEPEr%{]'Il}'9PsEr6fǸ ?ʰu-->Av$ 2IM-3G":H<Ub/*F1d= ߎޟ vTW
6&<7*V۵V zKˑ?( R߇ -: t )jQE QE C }ڴ+>? hT( ( C ,?_ҹ<C ,?_ҹ nV>Rf==+yffT4ϧ]Aܴ(_u
c"ʲJJ s}(5S6
! g5\HRDQ.OV Z<"Y_ ڟSkdp _O U C$^%ʸ| '6qZG5ޛ'Ķ啻~?sJ/AlA ['
{Yn&DyDMWxڹzܸmӼ C0CXtx{[ t{[ t QE QE *t S; ֳtu(hA =GXiZm_q #es6p2Gn gQU-onlb$v"ә5#+ _noةW }M V6֒>E vFj̺})㵱X;`N1縭tH#ع-UD/ZgsznU@$v Nh' իg]Du5QݼtF[Mt9>7lߏ=8 #7"-UK}NK ɁǑ[7z;m綛ʞBA cUЮtl
Q:O\։ ! Kը,x7 P.;s PG]\ |m >]S<1io Fs1^ӴoM,qʸ;9s ւNq4W_Һ:Ӵ wd/n ( ( ( ( ( ( ( ( ( ( ( -ԯzJ?'[U;r)F!9gB C
(#Y8 :H)2$ q/$?V߳A^:T7dm7B " np8ۏʠʹ
졜W'1 54cP}&7 u{E,L-0*0G^o_[CCi\~|`ҴɞDc n454|YsԚ4Yn` NI`6NJ t}-~P#OZm`[kxפjV k ُ{ Ҵh?9 -t_\^1|Oknv#3? M{ s6F|9 x~ ך?:8ޥsu}Zo߳?61ԓӚ \ϊ v_խmg43O$"rsr];N`pz1zU䀉?ޟqMĎcfR&GNKJ6摗%ր(0ԵۏY< mZ-$4hbF eWn,.KUdH&U}
oǾi0b\n#ׯ Vv}9 Gֽ3Gym1x7c qQԧCЪiUycY2ʧN3OR麛p<3B̪;Nyo1n2imm;]Jg7_,JPC0?`N 7nG.L )&joifgL x4 'ipO!S . *"6Q^lJ5[k[00?Ͻ X( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((t S z$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ= [Dx_
'֨jVS)%q( PV\ġ%E
T`' i֨>!y&P =eѮ]JΑ qSRKt/f0O
WȐxH V0p8?TN ճgIѿ>6aDzFĽO7?l,~}@D oБ?iF eG{
6
o%Q?֠ƻuG(PO?7,#?* ⥢ ( ( ( ( ( ( ( ?OPGO[@$Ny0ԵۏY< WN:ۉ<q;wg㨪#IRo
GkX"F_0 T)~L0;5zI7E4C9j:=Gu\y `g $ t *Su"FLp#Zeu߂Nq4Z
rNB6),zWZKc0== Ϥ\-i CKԨe'ךiŤY ~w<~Ҁ#Y}x FxA eM]5ewc qL@E9\\ژlȵ?)p?ַuF{U/~>lgLɏEԢE=ET` P!-"bm| WaRb+p8S x'8'Gq1N1sEWm7n=
ӪWlbEWZ5R$pUy2ْ1 q؟ ]tʪF @ )-WY8X۷zWvYϧR#ٳ ҴT.>arܐ:/ ӴmCPIp tQ*p^͓gwjmKK|ҮS$pz
5fS/L|n]e;O5o^ڡIw ZԹ71gp!G| cV6\I [;pze% 1ɪͣjwk @? qmaf 䏹 QyЉ&xrk~Fc/ooUyu" RΎ3Aܖ
fBz䧿G[1*A`yc+x%vbṃ8qpy @ nDobry4Axyzօ9neH_6<ueA^)[{@qu>z4t3
Jd AZcgyl7Mpp
: ( ( ( ( * I U=A ??ʀ'( ?vA t{ l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆R qr s*ރ߱5֥C~GC»-OA Ϳ\Ւ]@.m_|mjs ?/]=fQEt]^\uaO# ?ouֽyⷉ" k5j^#P9b{DZׯ<E:ZZ,doqi Xr?ƼWSȀ8 U`zװZj.m={4#QYQE AsU\ ox~ঀ(#(AD $(~TQE
(
(
(
(
(
k2cIU
Q]녏PRJkk72R?A]Cqw)ڋ31-Ű}V%!G\ :<9;D>Qq? PArqny߸g qj.{8D(ZXIpO n <אF1ׯj}EY1uaw?6 Q]:%H^ypQjp`Owq}>Ԥo - ?OYWIb<@yր:xu7ROُ%Cn\zc֔jΛ{g?eZn Ƹ|[ &CnG#4 E13 hޮBytє
+ k@tWAt|s
Ԣ( ( ( ( ( (敦X&K=u-
m( 5t c]nv|3n@ }p
mbى+G<CHrGNxZ Qg DF|&ݽgTϵKc,
ùX ǯ6VSLq֪7I|7\+=xM_-֖[k"y[UM pdeC )%1D`I<cZdk%cXфgsu8_F{L|C9 QE ?OP\ oc- KT ( ( աY =BaEPEP iqwy n\z/F < '#P _ Ǘk8Cy4dj? _ڊ 5 //yƻj(?<GF < = n (((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
J?Χ-ԯz(
(
h- z= QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE *t SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGO I T=Q@A%2ȓH?OlPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ??ʧ# ]'PQE A t°*MZ8GVȦ5 b[(.2:+6E
|5,<` .=ԿaEW;: :7g>1 ȿ/2]3FIwW ; 揄?տt z|VE sZ ) _^ڐ҄l \u~ HO8rak0,̀+c*)ks3Uҭu{Smr=ՇU>8 k JKݑO+۪') du$r3B į"b*yh( -:bK~ Ϋ4QE1 (AD $(~TQE
(
(
(
(
(
(1@Ҟo<sH\*6<nIe䃞_W( 1$Iy]ҹbMʌFH TP 6PU[ݷ~"J'9N9+f ̻4ҭq YF I`r E S4JIpI9-IgX+%ry'( ( ( ( ( ( (ݝ^M^ޣ%%
(eWeE q?mmݜg麙 w=?ʻj( uRx@=@N
ln' A }WiE r=ˎ:`I/&/SM[
(
K~ Χ.Է1ҖtQE QE ?jЬ գR0( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((((( R o+ : ((((((((((((((((((((((((((((((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袊 ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * ((((((((((.Է?pU-:E(AD $(IE7zѽ}i )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h )֍@}h K~ Υ)>:RB
(
(+
>OY"j #""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,Q Hb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw5 QFц#Vj(?- D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴPe3# TD_M
""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""j53# U?ֿ@SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@(̎p1Ryw4'*Z ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋ(̎p1Vj$ Z D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴPibc," *Y 5EE(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(( 7|tǵg o { F ,_ҹ 迷 = ֣ j4 14ᤣ#rz~4k j? = ֬;Sv컶RğjF[4<玀w
c ? Zgl0屴-˹ ƠpANg j? = ֬ Cy5ART Pca &͘m EPEPI
OT QH̨܀O@+.=sKQN7@ jXZGX$nʮ0FW:Nł\ I@誖Z6)Ie88@V%k %3 g |vʞERl1rO)֗Z@z~-A I5Ho<q mXE4xnԐ]Ģ#?
Z*bKS%mÒ F/Ul G֘H! [[]Ҕ3g{N[y}# PFy ,`gq<{U+}cMC #?L Ңj6V7ms*;MVCstEsvsj@e"O,q=sַ+hyj(<ԕzR[5y i< hm;dr@Ys@;zƝu/#?L@TU[Ku @z jw@94r(((RԵ ꖀ%o
oR - 2(um>O*P_Ђ3rF˵6A Nz@V?$G [*j0O۫΄S: P%szVu{\,EPV3<:I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E6I$2HBhVBkT` vѕ.d_;s y@}cNȂP\@ ;
u M$d*g#XPbds{@ ]%eX]$zL77r`lf=:mԢe@Af5( ( ( ( ( ( ( ( ?ֿRI
+3Wm>ɧA'j;S~{ gێ ZK{H@Yy~&Դ7s [k0TYZ%Jr
LЮ&Ӗ[.囓
+k s$6ss+7nPp PME#0U,ǁɮZ}\=x"5qM uTW;k<*<cU rk1}kޱP3Vvz)p r 2=*gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF
z (=_T ( o>U|uLOC4rOր4(VMSY.a4!z5=
-cp?Ƞ
+YOՄm:͐kvQ{a" <b:+ UY۵3=.]9ct ${{{PMEWH9[S 8 fC/^I@4Vf<dSeYϪ>e7 f1A' QX="kkk ( ( ( ( *$ Z KQ'(Z(
dEr0EQUq4Cb: +Ol?ӿ /i SWG PK=&]8 u'V;.+Ig d%b]}3[Pc tz4RUϴl}EhW \-ā¥4QE!ZiҖ_.(uWSԟwZVkZs)8Q&iQO<V4DQMymV1#F' <P`ݏXi%iWk7.s隒aEPS j *Y 5EE(AD $(~TQE
(
(
(
(
(
(9x _R/&*v9l}?ϽZ;.Nc̣p+х oQXv5弁B۾9#$sNoӬRۀt עWvc&/^JD'4QU/o"{ I+^(?Ҁ:+NեB?&r =:m2Oo@V&fZ(fSSֶxA[ hQE QE QE QE QE TιpXqx[qahҬc$u7| T ÿֻ]lL a%F7n;PoHŖa85S u ȟue!gcM4d;vhZaӝ vuA0ۿi||(t1x?) SYjk3G4Xc .OQ J H[FX =kr/:ïQE`ki4AYGszW%_>~G!\{ Z z(
K~ Χ.Է1ҖtQE QE]Uڤ}*H(({_ ?/\tZ Jh[K-+3P >uKr#D~Q4G *)(w q9
|1O4Uq!ID7?QX1j6`e|jNm3}}?T
Mx/*c&i ^cg"l?zlڳsV (Smyoƀ6.meY7m\jrQN&m8 aEo[t4 QE QE¥k- s'w]=Q:<ObmN"q;8onk mBtW( @? p%h67ML ;ip3 3[1&H[S9 `uTHK>\
Ϩ PҼ\V&1ʝݨ!x/-ܓ$t_ih[^/H8z*8F4{!$
F}
g\ fR N c*,CKm5\s9?g+dޠt Z cr74XT =R+[''gO0F18PRIu87S4k$SeQ G =*RBy
G1"n
ild囨鎤Y~ێgҀ142啷 x[K=01@tHLOy 1V@0A$@=,(s(tF7[+،ܖjQ\ 8
M$w6&aX zLҤjm
?
7B؆ՈsC$Wf(m̻rFz榵%ȟ tc F;Ku-rqz|4X Ɍ8wm i f~~4 v?\f9kזK=* `nv0 Z
@P$Anյ. Yd`; Uyt5;:(B۟()s UPAdn.E
[p8 Oߩ#ٷ ^sJ.>yowoIی>3l"p=2#5dS:Hs qYyvelIPlZM 1s ~UC a g7|g?jl4W[a m>dwn! H# ~R.&*}S% $r(R ֓]70n(Xu= .rgHUB3&{<A)p
vy' {eC w zZ[rr'i8a),c}yPQ@Q@Q@Ej(?- K\ƣ SqL.pz dQ
w+1\ 4O^8Q2 T -M;]%֣pg1}۴R&( ay^ sJ ɾ۪] eتhs4zv uEm
EmJ[_1vGq)'q(F+
:
?fߟ8 1 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
5-RfF ^zԭʹ[3iY+,99cR'⛕a= [E}x_@N: jg1NR_ b 1}8 ~$("BI Z1*p9 L= .rgHUB⦼Ҥ_L`' = RD_ 8 ǩ = 굟 f=.H|0{ބ6%Yc~sZ *'M&_MAH?ϭjxWO eG*̺2Kc
?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Z y?5S[q'n'1U Pp5 {lF#X/1Rx沊145vJ]QK)e8 xtRϩ
IU'rEތGT Qm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4Χq!/39=8,M
skJa_"Vçj2&l2rFI9銯 ċ z*: /
inwn {稫_K6pԖpoyL͓5f9%+7QVL sIiƣqHq GeciFktRϩ 64OAuz Iob\g⢳6Ih@l~ ;F1Sz
^ѧ̖S5oڧo|Ȥ; Uciwl\ܛWOZ
j-A0bNV֨4ˆ'~J?af 9dfaI\^R>P$$34zTAeǷF*$ë !2t6^G D:ɞ8B @/9@̟2 Mq<;D6U dpy b [vW=qn Fm!4+V-~ *>f8rId ٤]:ʊCs ^ t-N+:}Z}2XcԟZ@Q@Q@Q@Q@D_j$ Z KEP\ wJ뫑 U : կVn[iTucZ(@IyŇ'I݅ j
FjFGE Wm
$_V
7*w7oAZRØj9яWa :"zkK{շxG@P[KYDQE 3u]*W6#ʰW z^<[DI=ǵf%F; uΖV2@XVoz<9ȴ,9? ל*^ԒI*zׯiZj.m)ӞAG}M*(4
("STPR(~ঀ(#(AD $(~TQE
(
(
(
(
(
iXh'?C@ Z~n\4 OVu#--7[Nr9z*4d6o%[瞿m/5$B "ztegy~o3>bm}?nVw6NVi7!9oC:K&wq8 CH* nO),%-g<Gqcsw[4nG-Zwv\IԀp8=@^#g $b8 8
nQ߯$g9#6+~1֢rVO j
oOh< ]Zl[q}=ΧrG z~y%uL 1so-F2( Pwec ?]EehZi[.]fh ( ( ( ( (扡T(b-4s`qk R!#O_qX]֫g
|c wVXO#o ?f,党%Q ҹ3dg9\.qsfqFB9_X)S r`Rr 9`Kk , ʞF7[m>Xy v#=* [Tvl1O vSKHc`2sy14$)ƫvuĖ'$ Lc'OlC2Z/oF ==Ͻ uQE ?OP\ oc- KT ( ( IUڑQ@Q@ڽו. qX: Ǘk8Cy 4ej _ʊ u /?yƻ*(ɿ _ : Ǘk8 /?yƻ*(H|ۻn9}+f( ( ($ Z KQ'*Z ( ( ( ( ( )i((((((((JrS˷@
Kxe&<t
(
(
(
(
KRPZ ((((((((((((((((((((((((((((((((((((((((k-D_h ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ h *-DD {f
(
(
(
(
(
(
(
(
(
(
("OT¥((((((((((((((((((((OT%( G_uՋioYy8GVȪ[jĶQ$\duv-I?c / w Z^/ ȿ/;
eTu?\6U ֨|[4mqpA)Xw4|# (_κZ >;2ۊO:Oq) +/u u ZDByk khbifP]Ag
IT奉fZ֦{wS^Q zuu KݑO+ڪ7) du ʒ9JqB+ȥJp}8(aEPS j *Y 5EE(AD $(~TQE
(
(
(
(
(
(
( QE QE QE QE b((((((((((( R߇ -: t )jQE QE W_ >v/| JR0( ( ( ( ( ( ( ( ( ($ Z KQ'?REPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQAjZK{QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE D_j$ ['Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'?@E QE QE QE QE QE QE QE QE QE QE QE QE¥lh ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-Dd? KEPEPIE -%PEPEPEPEPEPEPS j *Y 7QC4QE1 (AD ~OHA2>:Rc-M() )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@QPo~mo~ )[ߥ[ߥ :nF@.Է]Ҡ "lt ҖtQE QE]U^k s w5V? hT w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f
i FGR8MhH I U= Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١ja 'P[_ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@p1 w4 z w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w5
CԎ1W* I T f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55M!GSI ??ʧ~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP1 Hcrt @ h>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP9",d?pU-:E(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0( (7P>߿=co$? Q a I 0 ǿC L?Ql_ pQyWPN=? 0 ǿC L?cYڛeݰ"$T4Ig<t i C L? { XK
ȶrGpzU}܋cP8 ϧZ 0 ǿC L?f dj _
;]?P~ fwsaZU{[ t QE QE *t SE1cRB$eǮR!Ip2
z+զ=COHݕ^B@?wh^j6 @F@' hQT// ?T]Ҡ$r @?P(^Y-lV[Y/12gۥ$זO و 7xʞTo5++ > R$RZ@z}A.HH y^xq ~x@4Ve9bT fHm (Y.{Tl14 1
+5yÌk
F 0Np#C ]-u:O&PF~4[ Y )
A
Ѣh"Y9W|ޗbc@U[[kgǦ5BM{IC88
٢I}k Aqz5SsJD>z?\~x kQY#[ gCq֮E\E@hMViC0A8 ( ( ( ( * o+ : R 被\[G\E?Ҁ,Y֚v҆aqIyXXs&<O Ң[^ڸuo<@6A)$
>l^BIeO PEEVvن]pz}zPvrlؕ<NfɸYLM 8TաNM? nY6 t@ 6=~5.Q S(Zqik"q F`Xg='ڟkyo{lۓ$gt(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * I U=A ??ʀ'd$HdU$Xɯ2H#Y$̌UۋKFD!|Ϸ^hosyL 3=g`HwA'v =J ?e1 G Fa1jg~OO:+""a`,s[kzeԢf F~5h ( ( ( ( ( ( ( ?OPGO ӬtrBzd=Z합k3Tc
hbV;{ v4'Դyk%v'Ե),Fح䕊Q"Ou, ]7'@TW8:ITZ ڕ̲M?n@@ޣQMf
IR\=0FA=P[Esv̟ٳtϵ;\z=jCf5wXc{P[Efi7Xˌ1ltȫ}c>v ZTN B3`֥4W"W9>EqwMAuwIehP0 @5Rk4xFm >sIIg3)$ i\][\}m =k=lr;6;f/K:qk:hu{C5UѕR?Ƞo5+Y˖ENr_z; idV226Gq@UY)kJvssa/ #2>2r{@ 5X^^68 c# MoY7c!e# ױ"Z$cԨ&((((t S z(
B@<R#)$]1US
4 |迾 t__ιDnT1i 4C4M }z SWG zzM. 9$
e#i,L³d k"ߥbaq(g麥-pA>LJntY@U ЁeIQE%-yvZvWˊ?U$ W{ֺ< }
7k3Rxi`$jWڬcJFO(tTP9KHaEP?[u^ *?W
h hb?(AD $(~TQE
(
(
(
(
(
(9Z =l ht uuSW_]ig;Ʒ,k݃٤\2O>ݿ^#2Ḟ K,uEb kҮmu-G2,{qpZWW )@ p9T)qo#QȬHl忁2>~uX$eݝH><CO<1poZoBzgu?hXC$GRt9-
ß`Oζ֓{a ?ʵn4 2xLKq/ l\f[[fO<E@Q@Q@Q@Q@Q@ Ik!8p>w WI~j% {~M+M3 yرMw
{pZ2r>P=G4 3bc|`z pX:o} S\$|f$'ޱ 2+ F[! d Q k99G Ah7V^uSUp08状 ]LEH,'{3ZYNF%1Z%ZB#p<Vm M7Jy nUޭjh:R +ӗ#_cGdUȒ"Rv$1W
2}`4QE ?OP\ oc- KT ( ( աY =BaEPEP7 a I a Cr g7E1Q[Ϧ[34VgR;)}:FBh URP s@tbɷi#=?ɮB"vo
~bm juK[%ۇg%&,^U#0Mi98(ύD ٮ~>%g,, Qx bq? l\q2#Ȳ"nڸ ƣn&M( $q: zàkok((# ]'T *9맪'I$
} Taڝ9"U +y5_YClt<:;mP1kwz^S9
Q&'ML ;i֭q8df`q~sZIykhr玕NM ;.#P
'Ubc,}֢PKg$B2GOmIk{/J dzڣGԭd$4tRiJ[p'c* #Jm5\qr9ݜ 1HDl@@Qnug,* =R+K7h Cy%g0LF8{OͬO)Q dxqjHS o(U ?wdRA{ɚHNYqONt+քYIzM 8 Ҁ"t=WL#T`r 8qSԿmWJCwkql[e*9"K ր+[mZWvc URMkiRz
,䝞S(va?x=hFl > z ԚOjB #d~ug]R!*xsZShplnWi HiLv,Bw,`>@zϕ'pU-<u F~Qk<r>zr(ϩ_O٪IoϘ6cNsoJ
Q:\m :q3($g&㳙5 /vhvڧG8ޛ a3 3۩ M?ȵC|. 7JK-> r畇>q[ }v0F1|Kr^6*H=ր2rO{?WKx46@'jhR:]52pr{ҿc->͌l&io4Qf<}IWD.6 FH ] o~lgdT7P) ,1@qjS\5۴n>o1>aQ "K;<r(ߠ(((( R o+ : a\"r IO?AWaY:/Z9<GqGz »Rݣqy :ՉﭵIR; x2]Guy#P@>Q>vr^i I( Z 8ft [
yīe ݺ
;MkI$<c
tY* gjttWU"U%Ϯ}2[x4lc[n$db(* U4X6B2[ VFyb{p;BjK=_`WnqEEiI\d @Ci3[ 1bF{i2xzq·̬rU =Et{Gu.Q;n3MYE4lY4s[ z K eV];w zvug6V3K}c!R n P6u B
v =O )ACLn- \u'u q.Ȕ*`V|p_h r1<b ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧ((((((((((((((((t S z$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ= [Dx_
'֨jVS)%q( PV\ġ%E
T`' i֨>!y&P =eѮ]JΑ qSRKt/f0O
WȐxH V0p8?TN ճgIѿ>6aDzFĽO7?l,~}@D oБ?iF eG{
6
o%Q?֠ƻuG(PO?7,#?* ⥢ ( ( ( ( ( ( ( ?OPGO[@$Ny0ԵۏY< WN:ۉ<q;wg㨪#IRo
GkX"F_0 T)~L0;5zI7E4C9j:=Gu\y `g $ t *Su"FLp#Zeu߂Nq4C_;Umyk _HAd5As{MG>F &:snթ@ [)H*A9 6T븚ݮhV nJrSnq4ѭΧq!/79=8,M
skja_"Vá ?Z wNA<dzbǢQ" ʪ0 N̐i[i1 v6zrKbf"XwNF09jK8'Gq1N1sV WC, m,
>Ú O- f?\Tyi% nx<du
68b]%W)ȍBq67zRУUc`?ZԺ6[osX;]Ҁ2|2t 3TZ7ͪj2/ rnG.L )&kONӭ%;ROz VK 6jz~ukmԟ I\KnɓyvRN1yo^z4P @ Zζ"q^:^`Gi2pr>sͼ!o@r^?֡5ıɪ\3B}* ڒ 9e@ܤSE`h &}Ox%vblA NI[c1|a24REvBKSAO :imi,wnjAV5; Ck8Ol t*EN@ >
(
(
(
(
?OPGO 袊 + ]q3 |?*[
յkm \ jBJO7ذ i"Q۰ =H8OTծxU z
5ᔂ?}\`(ܨG@9
7wMumQ S usoW)tD(dv Wt< Z\DŽ? OYDQE 2]*W6#XuS+ g-O ujxi`${ZWkhƭX; ֵN#lc7wZDBy{ 6U- X 5:VkڋcF^}
9h빩EVEQ@\ ox~?[u^ )%)(AD $(~TQE
(
(
(
(
(
Vt1hrʹv<He! m Z#ӜnL [Lf9%I:U=6 ?{KԵ Ʋm8j_XY[ie( ],V4 ;䜞}~-՝^ML#4k_e 8iPjzVLgYR(@tz]8"'B
Ud E+pʻkjtHAerBT5WnO$- x~$*L_&IXϹ}=U$^@#Wnc:Ȭ撏- P
!kF
ą&ZaŧBPo QE QE QE QE QE̓_:crYtM{m>eH\^nP: 1/!-nG."4 :bM{8ک7kX r!?_N*"r~O[fsgn O_ eioB*8nLյYtoH\81UDŽ]TP=CxE)T/ui-%ƌ$;ݑr5"cBϰxP;yqL }I5ZYX E}ɠ tQE ?OP\ oc- KT ( ( աY =BaEPEP iqwy n\z/F < '#P _ Ǘk8Cy4dj? _ڊ 5 //yƻj(?<GF < = n (((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
J?Χ-ԯz(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * I U=A ??ʀ'( $Yi3I횞 ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * ( > V IY}'ԞfKo@eG^EfxHwof ^EǷ Z>1 ȿ/;ygTu?\&U? ֦Kxh).*cQa}?/OȶkRQE!KVRP0" kxoÑi \r?tE\lr3%S%-nfjUjmGW abIbp ) ?{uD#rF}(R8!wx]@%O8>-TQE AsU\ ox~ঀ(#(AD $('IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ C
Ώ>Z5#
(
(
(
(
(
(
(
(
(
( t S z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( # ]'T * (((((((((((((# ]'T *
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGO 袊 ( ( ( ( ( ( ( ( ( K~ ΫX R߇M-QLG(AMJ݊u57Z\<EѢG(4Vw(EFE HhYHX
+;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFE HhYHX
+;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFE HhYHX
+;y"U vy}WE=c -SQE QEX(izϑSU>ϥ]SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-YbG'SB¥< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋ61 QAh "h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,Q Hb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SQQ HbI
<< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< ȋȋh< Fdu#ȋ?ֿR^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_M D_MKE EEEԴP^D_MFFdu#Q'( "h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+Kk`9R(~ঀ(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPu Wj #
(
(3ó߿= ՟ L Jh ? Z c `#>ӆʸʂp9 c ? Z,M۲K}ceEo$l:ހ4 = ֣ jɞXnEÖ;Ү.\ }: c ? Z 5 /qISq@ ۷6czڴk?C@Q@Q@'*Z?ֿRE#2rI= .YDI8NA#EajM `*^W5; s V<' _Z__)kWPGj& jXZƬK%̗2gڒk/#;2c*z~PJQڤ
OA?Z__)kY: E <X Wy9pq
+
yFe nDn Xn$([sDp(].{TlI! dG lRW?ͤ9 8)j
Bڋ0OF9 8 \um>O*P_Ђ3td Ah 2<K4G*pT QE QE QE QE QE QE QE QE TPZRQXZغM!$(
+]KH\}kd`]M W3j:Zx`;I Nq=jm65 t.p1AEV\N=Oj硇\c0,n4Vf|څ *PڤPZcθmOoP^ _HE{&
㯧}m;3s+ԤȎ 2I=W7]0O tW/ 꺻4bzn?v3Y PCEr ۚ#nɎ0Mݴyۼvs hRo>_p% >خ >~<TS-<j 5(+r! ? u4QY;c_SEbh]immd W+jC["C& ?=]<D@QK$J[n5BV݃l ":*vGϵ8A'Oa=Kgg/ d?IEsWj߸L۾1\} "8?TZ3 ŏUVڝE. $AF _Ҁ:+mp c Q擰ۿ\ya-2DTc{b:*(&[t(aREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPI
OT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
OPQMD $ u$5xE]eK^zP+6XӮ =g*kBC]HwA'4rg# 77-X l9?/PWIYVI
ܘ2Y_4Λu(FF~
J(
(
(
(
(
(
(
("OT¥Oieڹ="-rߵ@*6? ꨮnV;k^v 2I-"xM hVČ' tVVId6\*>S4+ዹfhb\"@ pCMMۦT GQHK1rk}_Wy0Hvz @ ]%sٓ:{c늬ex`a1}ƀ:*rזQ\u{55gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF
z (=_T ( o>U|uzLOC4d
+ڄouG 6no98 ]vmzsZ;_G+H?P]IXͿkg5mV=Y.Deu*_J [@G+isk?VG$vِ|ג}M-ƛ6m'+*3W?fBZ (60^@/&x8 ^((((OT%( IW) $]5yU[ SJ:: (bd~ iy;/ f:tAU
OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq,Hʡz;*^AERQ^ek֝)eUu=I <Wuj< }
SfmO;E$זQcP"4l" 6
JVvr8>*FQE E?STPM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPu Wj #
(
(9X sk +l>ln.6cޢLfh Υ@ wSLu-HG_ <2,$8Ҁ*\?oFz]Uą$E dE`Ũۣq%]>:ꖶJ!(K1 P7M5XG͌`sgqyQ=\|KjYY[ 4M عdGdDݵp=ˍFM;Q>H t>@ -?ֺm EPEPI
OTxtD?LҪ^C=:zD>Vzlῷki #vѵ Z^c1 hI=63/ڛ
8ҵn4ĚkI#o-mO qRM";.#9pT7>4CJsX *t v L[trN<~5mImz."P5PX]섒@* 4rRqJnH;yj8ާر
-s;8 [IX{[ ;zuhks]8aP HlbԞx >h CwI%f0LFQOͬO)yF ~T HRvabt*cgvMIV%k!9f IֳzЋ'&ќ?@E EF
G6 ! K}UmmLg#뚭>r.仰0(Y5EKm 'Ӏ *I}Z5ulAy >lXi$D뵃yst58#6כ` $ נ I$ {0Db@ nH՝smF822B>$/.w<qIum97c;6 p"iv?fIJ8H yGJEϜ
3qWjrj;6mN>Q:KE QE QE QE QE QE QE QE QE TPZRi^WzZUyx\y-\.q'9 ^ uRc9HW t~Մfڃ0ZI/<n}z
"g#+?Tf%yw'q(`=S]9 6вqvӮ19hFFDFyH
I=0=k{`4men?W9Ks1w'hmF(UQTcgE^>k~qw'ګ kWc#6D` Pi% wn9P?jӬȶp
%W=c ej 6s2\4~Qc??N -)n @/_P{8BJ!W}k^K
L0SiaK q( njPy237mklhyq+`hז9.9(T0 JaGfyfoC)ʞӭq#Ac6%kkK J?:Uӿpvc|@ p[L~|
~tpvY_w[]ݙ-Џ. @O .hdx
3 ] E`;ۨ Jk5n>P
Fzq]gGzf:c >ޔ\M^ɨ_G)E{m&xgc]W;A㞸* rkn8qZxWs{ғL͵6 19:dӴIh%14slC+p g'-(_J5+/ F߳q8CSdE) uЏ@ }XOH2J >E"{6
F$U @jEǔvs>e5$:_0 de uwi5K eÌW:UOy z ȷg+5Pv E ZܙKr~dgigIs4?Uѯm MsCc ƌ<vo_iٖr~Jc?o5y mioxVJҀ9R4R ƻ]et
cSKm<i>Xzk/UKk%8 tpvךФPB
Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
5-RfF ^zԭʹ[3iY+,99cR'⛕a= [E}x_@N: jg1NR_ b 1}8 ~$("BI Z1*p9 L= .rgHUB⦼Ҥ_L`' = RD_ 8 ǩ = 굟 f=.H|0{ބ6%Yc~sZ *'M&_MAH?ϭjxWO eG*̺2Kc
?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Z y?5S[q'n'1U Pp5 {lF#X/1Rx沊145vJ]QK)e8 xtRϩ
IU'rEތGT Qm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4WLQf8$g-V}6{hYSn|8n- =9K+ܷP1yǦz \ieYs1+^Kbf"8n+;t 1_| li/_YҌ
" g6m JMKMMF5rFw#o>k( J0?]%`C\w:ǟ}Mo SA ͿAL N S^6[os8EZ`c? `xzhI'3bC! 5>,-֟+z?JF,uي'9 BkKNӣӢ(]&(j[ (v;k[khQزqzO[;9I n~}Tg8ր!VoVH:Vp5mHmXGS_5 a'9+zT Z_ f[h&tT ќ=C >?iVs\Mш[,8~ Vn!Egos fD#Y 4ñ`PA=zg>f͌g$5壸nPfDy]̉ j;Ncӑc$ ֍ QE QE QE QE ¥k-Q@r>2 |?+G_Tw# VAYmZEQՍh%'_ m'S[;v%6qu]xU z]4F5}X`(ܨG@9U ckKcoݨ F?] ʮRQɭ.[Vt#?֬W5 Co]-fQEt]^G*êQ^K ? k{DEmO;D$ CxֈLjqb{DYׯ<C:ZZXc Y""ܰ wS^px_RI$@ )^jڵ>̧CNz- 4( MQCK?Z((AM3lNIQ?
LbOҏ"OU)[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~{ʂK~ E KT ( ( IUڑQ@Q@ڽו. qX: Ǘk8Cy 4ej _ʊ u /?yƻ*(ɿ _ : Ǘk8 /?yƻ*(H|ۻn9}+f( ( ($ Z KQ'*Z ( ( ( ( ( )i((((((((((((((RԵ ꖀ%( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (i(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
("OT¥((((((((((((((((OT%( dYY3I횚 ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
( > V.eD X:"n'cDqבڳl
&p&kXx X j_x"+Q q \W7/_ ZMlѴR]Ua :k3G 4n(9>=Ƃ(xTF#d@~D xsÑi Xr?YAu#5%S'[kZ{OyDq(.N vE?j(u3'*Hg҅+
į"b*y⤢Q@O(~g T?pS@KES(AD $(~TQE
(.Ŵ[ݟEsڝ3Dʬ3 23Z˾6I3ȿu|Χ8(!QN)0%#~57dǮ@@[OS ]ȹ 1@W;5iU0{[ /<
P
A#A`=+Ӛy]pG1Iz"e1 VT? (?
_¶#fh՝v1 p}3@S!9.}ƨ(Qr;uȩmBjyjz@ h\-HmpA9]
QE QE QE QE QE QE WjtxLQHc˱"m }vΪ.5a> PƫQk/ 6|B=Gp? +y{,J (3]-&(+NJ 7yXn֚Wv=(0( .ԷzK~ # )iJZQ@Q@>ϥ]K ?ҮԌ( ( ( ( ( ( ( ( ( ( ?ֿRIOT QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TPZR -Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?*
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRIOPQE QE QE QE QE QE QE QE QE QE QE QE QE D_j$ ['Z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'?@E QE RQ@ IE QE QE QE QE QE QE ꚢ
M{PM-QLG(AD $(~TQE
oOU%e$2L)A@x@} B5hŢxaGr =Pp19=B)t{E (tĈq%Tn _V5ɎbͥBx'l Ǭ7oJV}>nڏ 4 ֬+H}>Y:o = )\ 'Tn.Ҵ &NKMnxQ.rz:?hHǐoz֤͟kᴸ ^ TYhu R@mngCֺ:ݪMw$m#Uy]FXZ *' sDW`
Z`Z~F <?&
t0_`kU Iv1֡{ BVUՔWOQnkGYWSYa D_wlW3e=J] #w0?t秷M@Q@Q@Q@Q@Q@Q@ J 4.*'O_-wYio!?D#ȕS\ ~n|s)Ӷ 5gKKI~ _k*x~P Ȅ}vzv:i
I_[~q[o sH}YnF} T טx-YHV$pOz> qᡪ>~:CKú跑) dn8
z6J)_sm<yp$w9uP \ Zk eI-=53]ЬXR6;O@+kMCn2
QPXT?[u=As@-P((
Xd f =Bd?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME SHb2:*oCGO Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SP of<ʂJ? w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch du#Tft S?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?fRp1PGO4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} !4?M f
i FGR8MhH I U= Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch>SSQ@ CP?f w55١h4?MME Ch!G * _Ch w4} !4?M f~SG١jj( Ch w4} !4?M f~SG١jj( Ch w4} ) ie<S!\ ox~ঀ(#(AD $(~TQE
((ޭFXKp=F;jC=6죵k@چgqyfUtnՠ,c{! 2G4P5k&XDraGӊu ?չE aRY_q4s=Zw4@"24P-Ɵ<(Ӕ#E<eq@7ӂcoQ@ ѮEռ iyOZӺ[& mv?hQ@v7|2"?Fsڡ]6C U9()wWMrJa0+IWj8~( ( ( ( ( ( (z
4%ɗqx\6OZg" Aꨓ (ڣ tax@7QY ?nc@J9 U-[ΏK mrO*EI I |* 8jFQE xέ<S%ݲ ^؋F:z ^cy|}6+m4}:gVI1=?
ӫO/stNy|S
yRH r9#oCj̻4٣4ear:5JNJET* -: R߇JZAҖAEPEP1 =B {VH(( CPϓ~1cY { G W7@ '$? Q 0 ǿDi q~ciIG
\FA8 h$? Q 0 ǿՍgjnݗvXS(+y&g 0 ǿC L?ce,7"aci Wm[r.@>h$? Q 0 ǿ՛/yƳ*J tCM19}iW7o PEPEP z?O@V15lRq G mQT5 ;
ԁ7t MԬYrhw2yWp$}qҟ.M+r8 EaiatX$<n,rxb:֊_=/0*?\P+.Yn0.z Uk(ۧ{ *c|J H
C.B]d {b5hљ-\8 }AkZe P8PU-ǔwF?
NA wۻ mM;EMgAw2bnc#?EUO2 ?uu{b,g%L8RFzc# ꨬNłJ `e tR2 'ns@ %֘$[jszqm>B\ Ip(Jս^uOQY_D_3g 1@4U[[HDC ja|]^EPEPEPEPEPP[_ OEB"$ų>~ ۛ䜉no7Ӭ%cfGNOa}h 5ҵ dz`~?zh WZWHm dqv QUg4
>Ɠn>Tcsvu{F#ȍ=G&:X:ssjq. }kJ hwP5 ,<6 +0$ h>
Iw#z( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ??ʧwyme)8 g C u6W@I?VW,94~̻<@~ >OdVrOi& q Т,wW 7w9<1 kE/ (mr`=g*~mӄS=rhBS%meG$rZ!.LFFr=@UKK[̖ b>Un52S è }p(Vזm;# Ccs?٠;݀OhBxb`Xb:eZB<t_G"՞Id chp3 F{TͪC.geeWal{5Y^=X̃w# t
o> ;ۇv隔 N к&Ǒnϛg8J"EŦy*9sӶ>v ṈMFG5s> M6 gHK q]5 QE QE QE QE *t @E2I$2HB{Pd$p F*"\Jۯ4r˷t۹&@Ad
PPn
Fje#X0rds3{@ mavi0If9ӭ2Q 3#?L@QE QE QE QE QE QE QE QE A ??ʧ# ]'T QYZiM: !W=2k -vߵ@*1 uW1y\Ioi =O;}_dZ< [kJUEdjZ#lVJr
Ln'Ӗk.囓
+k w$*-mJY&ͷLmnoQj (Rp$)jƮ ob#] (}joA;z =g]K/&y2qǷ@ }GN7Q]0uס~d G`OҀ5Fu2v%F*1&;I|T##<WWݛ] t QXƩ5<PA#6|j$l3ۙOր4J]WYi.>
s_V5rt ݶ9 C@TUk[{̶AG\Ƨ[ٱXUGqLOO;
+ WH,lH\ n?z<$S]\} cpW=@ ]Vk{y#gҝ9?a\riR
OtQ\ͥ4D"nGzFU|˨.>bBN=@ m_\\0gmGCV QE QE QE QE *t @E R ▹ I"鈈D pipgSEu'tMzoZZ?
OUmv'V3.IgVrd%^^/\Pc G=M,X>hۇBQ\o<;s<^*O}(1)k˵Zӵb\Qꮧ''VEͱSi\ImO;D$ו^RcP"4l"xFݏ[h]@ܹjZC
( R߇V.Է?pS@KES(AD $(#g&2֍ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono ) >fF@ѹnono K~ Υj &O@
)iJZQ@Q@ C
Ϗ>Z#
(
(9 nO n:=.ُOz}2ٙ2: M3PD-"4J CDȲp J sMH@9MuWK l-n-W=vTZ(<9, @4b 61kI͜V1F|n_ s-9g9enߏ \ҋ6[Ghb[ Ev^ ^.5q4niF# t ]%s~ ]% QE QE A ??ʧ# ]'T@48q{+Q^hKh"L]gV_S`YL@6OבTHA zUQc? WO8 aU`@_"A 9 ZP# vI[}e1pX!ҤLgTG
D./&yX1=@8j`5 c0*: WGK. 33Vlm& [E\ z]lm@GZՋHt[xI$ gBtO3OK),(+: N-F
b*DEKE"2 : +DחNS PCK7S%ݴ 0z@Ũ˩ݵ|1!,3ҥ`MSP3, i3ou#@_±ll/泸0H0IҀ&o-f 3 1}
ޥ0,!%Anq>iPi'4}S]tZuي$*}
eGŶw62FFAWG@ 3cXdQ.zdtns/-!$sIc!Ӗ)l$QЎ
Zo w(ҳ8)na`R_mZ+[88 t^-wk~q[lI#'Zq]x]a@Q@
Ģ;brП*nozWwczDC `^*.$$l60; t:Dqw$W<d `4
đw:D kk:!pT0>XizNewRc$} k@ FH CGCUi ٖ-cMPGI JrT0Ϩ g\o9?(umF; :~a`m/,{`#= VM e{zR>/q6`݃?z omgʟ'%"v?*]jVT6ln'?=j"-C q{lZMܷQ]jw wr tQE QE QE QE QE OP[_QE s^ y ]7G5mE}2Vg> 53۩L qޙ
7-[ NY.%3O/ ZYo<;JS 8'ڀ2M 5=;F(< 8qۨwP ncf :~bh-a{{tI SvQ-ޛ6cs@[ȲH7YqX_w긎8z5wQ\LKwsOQQ,qg e@ `jӢO'g3j x'a;I瞸Y_ws533`ߏ@t2[yO2AGE +"o2\?z ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO "i.q㻑rVZњ0ќDq Vέl3"Ă8 ~4%ψpª Dr@G =,"cvCqKgIѿ>6a@<82\^LLbzq"jA`,Tt
&u
ė]ϐ%9d*gf+k2M8;#=i3)Q9''2Dgȏ # n_rc H8jfSY9P0Wu?@Z
1UĈ1ڋ]A De=O<u <Vѯ.uE@snKiL`2"1QSkU*b$BYIgK 3fYH 7_gZ3F0
bO_gp`&a0 LZg*: c9KaYBK;:}+hOq!i
5.IT1\ ʎ m)"T0ldG gY 'tX$ӣsyi'#~m-s8 O\}Y[^ZܐYeeLtv j<Y#CǽSGV`Fr s8DuPBH [lyׯĂ1$'V˩ZGg6&y Z:wp"@pĖP, 2fe6W5SR" vfҰk%LNO`}63\_
wp Pڶ2qP[8tu6hDʙ<u QE QE QE QE T z? OX䖱0 ' ln&mwbބ{P1aY),9ǥXK*)V sh |T
Jc>e4Ŀ<#ۊ Xb+$ȡJ :7/8ª q9 L5˩\#Pr}N*{*In qJY
҆ ֿl"78Q(Hؗ텏Ͽ=} ="_Mz:g?ӼlaV#C!Y-0Ag w2!.;
P%$gA?\TQ@Q@Q@Q@Q@Q@Q@Q@GO I U= V h䀉?ҹqk6矼uS[q'n'n<uDi:jM |TZ(uQ2?5Q/i~]&(yY>WG{+< ۟DX Jηd]ɜn~uKLδ[]I1&(k2Gjpo-~ XX,3F(<noӾѨ||Rssڵ(ks4WH'857ʝ" :w[ mт)NJm>*wPZjWs،
yzg֮keo47,>_ ոkXI,7rP<cc=Z -/ t$ӭјxdħXUMxW-bKh~ nm%H;PGz 4ۂ_yD_;qGc?ڬ۷zJ}RAo{z^P k451@ P;CS ի ;W3m^z֝ g
M(zֵ.M)\F)6bv ,c8y )B yUj|? =[%˓Jrɷ8Ӵ! bNcԓހ3gzt[ 29<wEmkmm ";\n=^]:k(LS [;9Ig ~;uzPB_Yծ ^D@y?u)a;8?
s%]w y(P ^(^Kh&tdќ=A2 T K8:v5nk)%3Ym{-& wP~p'QԜI; >oHu]=^ 0EsnJoyiNz P3Ǯ4kVtۯ*) %J4[ñ/of ۀb:'U
:-:A,Iz{ ( ( ( ( * I U=A ??ʀ'( ?vA t{ l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆R qr s*ރ߱5֥C~GC»-OA Ϳ\Ւ]@.m_|mjs ?/]=fQEt]^\uaO# ?ouֽyⷉ" k5j^#P9b{DZׯ<E:ZZ,doqi Xr?ƼWSȀ8 U`zװZj.m={4#QYQE AsU\ ox~ঀ(#(AD ~O Y'IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ C
Ϗ>Z#
(
(0K+]wg:ֱ5 /mE q? Ǘh<] dj _#Q _ vP/yƏCy5Q@ OF < ?5 /mE aowm ϥnQE QE QE A ??ʧ# ]'T QE QE QE QE QE T[A;āLs ( ( ( ( ( ( ( ( ( ( ( ( ( * o+ : R 袊 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO ( ( ( ( ( "w#5= QE QE QE QE QE QE QE QE QE QE T z? OEPPIm $ g5= QE QE QE QE QE QE QE QE QE QE QE *t SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGO I T=Q@q3 |?+={JV<NՃ=2)C$ˌͲao 1b o/|c ?~_jvΨ M/ LLtѴR]UùCo]=e^m'֥&(C<ŗ4$aD k߇""ܸ wZ143 .
g*J-,JZt]^\uaO%=_dS
GY AdI P`qB+ȻJp}*Z((( K~ ΫX R߇M-QLG(AD $(~TQE
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Է1ҖtQE QE ?jЬ աR0( ( ( ( ( ( ( ( ( ( I U=A ?SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP[_ OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?~ ʧ((((((((((((((((t S T=Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GO I*
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?OPGOPQE QE QE QE QE QE QE QE QE QE AsU\ oxՊh hb?(AD $(~TQE
(
(
(Zв/ Shyi$Ls#I^*y5d q$W_ߋ;E
@2
+>*hJ/l?j6Υ
nd'979e2Luf8 r-♊ &1I}2OEx}azq@ <r2 !`z9I,pf1 3i P[
VN{3[4k.6?8@ r2 "`z9%smxr;R3[:}tP6x>z* y-]f>]%ܻdg;ғ؋#yG};V%嶐Ue%G +{R*ps\~g$Po "jk5 Pq8 Ҁ:T Jk:&73q\P [ؑor*Np?Ecisq{}\k Pcat 5\-byn , o==3cy k@}8bs'.` [ 8.yj 0B13Cuss1 X}kku{dgU ր;ʿxxuƳU
Fz8 9*ޓm5HI<t4<̌{S 29첹.ZmN"Wb<v\ uw
R6=}(( ( ( ( ( .ԷzK~ # )iJZQ@Q@4AM7ZA JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE A JP JOE AJ`S(G(AD $(~TQE
(
(
Wtva s~g5|]+y,{\Ğ68 [[y 6F܌M^i- T?@ ۺ,QU5]p12l8aM R,":=Ild@<;r/C#`~cUvcњ0W
ڀ3m
=<8 eq8k6uöpҌ~A5hZ}͌\D~nJV6} P2:sڀ8s uZ@~?m[PCY T3l,"0a9=N{֨' <n; V&S]`D@g= 5<`c u w'w\篽Mmm" uڋ @( h Q[d'<v jnۻ'ӥ-ͬ.P: Ҁ9:\Goa̒ʤu%rz K=O?$}3SzMz AP--ax<:o>C#q[VZmZIƢ/n@ {["ؤw# =~m vK[K{(d~?M1'$@? swZ+\<śezu5?HⵊhbRE=@y#HG
0 Cqiow `#7ݞ(Gh~xPM_nxd*g<kgnIx˙PmV ހ2jҕ rryTo />h_3VetbK%Ē3@ om]Qʪ1?*zҦҕ-;6&&g 7 ?+ZEӯ=YIj՝P =OR~(
(
(
(
(
K~ Χ.Է1ҖtQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE(AD $(~TQE
(
(
(
(
(
(
(
(
+1.G{=؞b<4'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ T4#ǵ ة .ԷzK~ # )iJZQ@Q@kGJt W$m1}k#u 4%tZ1vlh+u ȟ ӯD jh+u ?0 _ '=;a N cG& 4{ okEq_ӯ? kQ(J?plVE֩i /vs F}*c rzfN͛V1 ǿm { GOE` m { G1 ǿ{)voQX? Q L A}+o j? = ֣K}fsz ? Zc RoQX? Q L ]4V1 ǿսS(i
QEIQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE(AD $(~TQE
(^[->[q6<X
Ң֓w{G*g9pFsmxRŃ}y vVVګo:lW+bV}E wWX!m?7$d|ҴY.WV[DLI#u-~ B͟8:-uf-博\-u;+5-RPky$0w3N/mKov,䓌Z (= IMٸTJ9 ITڞ*Kfcb{mERk8v^v
(
(
(
)2)h ( -Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R( ( |[ a߿ e>: <G}3HRbWreN*K}yl<~W
I,}1ӚV-T=mH-995}9W OV+3XҋKҗPiIs~zo
/GtFd_NڭhjώSA$g+nc1"0G xʅz)֗6p QimgeԌw͓ *ʮz*ҶWq9\
tQnzQWWVFj'PI!LE4qOC5qv)]@K. ҢK{'xØ܌㓃Q>b^4!̭= 9 ~U)ki I%{}(AgќF73d! ?7~?NzT0nƲ`cua+{3aYX&(mPt {y :Y-z<i pLVFkp}5^P$lΈt钢ō{aP9b~oh>}>m,զ@I{pGaHB96zcTjg*1fUwyYtzQ\ǠQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE yYXJ!$3
O ;Vs7_3 &MWM.ow8i[f g #݁d ama_ݷ9W<<G'vsSctFihsJhu1>5v/{o ^' 8`8>c-Z
0@A @9<g+7LXinHNH}pjEjh65u$pJ횖VE9mw 8 2k@}HB~Gۉ'w^qT?-5 U1X uX>(\hNMYc
|%=r3vnc>>Lzs]
) L{g ]Ҍ
qMZU%{jk
X$FW`~ TW_i 9 N} 퉫ʯ7 od2g>PGA|+H@ =*%k* o؈E,˂q> <I4gp}r/#"w ^ /A?Гn̽EVF(AD $(~TQE
Go+r<kjI@8oĚ ηy nTz~ wãjKCN7>&ڥB#{qYFE,km+ ؝N~& PD/ NýEMW5-)/ ,NO7~Oֶ<?_훏g\=Wލ5$Ԯncܑ:(8056u]^ad J }C4eaP30s\ _3]ֿ Q/*m$?8YzC" (]+V!1ְʛ2rOrsT<T-<8.<(qӚ${ji?AZz1Z^_(Ot@6urhL: d }3jtlS2dRCc 1?\VEⰿv@ 鱦>}}": H[[7ج =}2K+4矩zϊT$xݜ|tȭ
7?d hU+-ĀGRO Unn-ՠb+*=Vn"0ywJkKKV8?0Q\\إ4 ̖BJAZz|M<
G Տ\62^J&ҢOh#6 + S2ck/vE'^/x#o2I]Iu& /~ 躱o -24, <rI* o33;GtkI%вr
wguK¨'̙uw;V.2 dՇ(&%e#
ZȖwFQ.GpFvǽYP[ .Be"/RqYɫ[.l"DgjE o$ikgr89o%د 6A`A<A46l;p cӎx-Mk,>P$\c>R)믤ʀ,0E6-X vSx~g
=ɬ{ 8L.$%¡G jj"H3Dpyz{ӮsK?l.(YUO] QE QE QE QE QE ?OP\ oc- KT ( (o߃ ]tٻw c8R=+ wX zg<i-
'KfFI WQkQYgذa ?OW wX Oq^bq:اcBI 1?Jۗ^wvN`U!C
ϰg9 <? ? ?<JPljUj6?l?Om;yƏGu '֑#3g-ы^^_ <?
;XE?BM ؾ H*qT̾ ( %QƭΥ ̛!N7Ŭ%ql'eG{ < Q4!U[ؖPD1Pr=ͽ]07 ?
} < Q4f?0}B26($RCץVRXn̾ ?/?ƅXnuo{ǩk,`У~᳐c;2yh̾ Cb?{{VAo%QWmÞ?jDxȣȪٗ GeGJUWBXu\ Yq*;PUNM'eG{ < Q4҂w%rP/$cQ\pQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE W'ζ̡,G$z 23296m$,c# <T_6% L }+>{(:mad;T o t-w7fc*.maas%w/9n lz鲍szҢ'(#}3P1QH /Z "L9$&W<7Bj*'# xCLr}}0h舎&dȗ_p=Qt8}?AY7`(+u=DI;w
((AD $(~TQE
iPxg<ӨQE &( Җ LQ8R@Ob2)UB0
uE8K/BG#J)W#"E 3bl6#H(( ( ## n=+6繖Bg}z}sZPb")%@u R斊 j:(Wv ґ
- UA juPMeV`Q@ :RE QE QE QE QE QE ?OP\ oc- KT ( ($ X KD }
J*VUQEEZVEjZEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEj.Z*\
U(hTQp*VUQEEZVEjCZ((AD $(~TQE
(
(
(
(
*嵚 n"OL$hdp?: }OGO {-b3\8D OEA-f2(GRNeOP)e9 K]Ea s6?n<wM,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*JX/ 6o_}Q,yw7@vc>*$4nFp9jz( R߇ -: t )jQE QE UV~jaEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPHN9m=2fC?2&);+iG'ou¸ ▹}8#ҿ:G =
۰̎I O [+n2;+{o_ o=H? Qou¸:(>#ҿ:G =
۰̎I O [+n2=T. C7
Pᔂ
z[S6j9C%1 >gm $&$պܫo(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o++r
:@4k> ̨ 1_
$4܂I#8tWQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WS㸆S'') ƀ-\CRO@ o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o(m Cj o)Eݻ 4Eu*܃@*pAhK[nƛ8
41 H(~m o*WQo*WQo*WQo*WQo*WQo*WQo* r(g5%Tp2o 9tv`t϶?IfILI'tWQo*WQo*WQo*WQo*X]۱~LdWR5
-n EPT!~ঀ(#(AD $(~TQE
(
(
(
(8
LȤplr*qﶾu!spNKm fQ}uV+SҭKyþz9G J6ϧ@y<$kԧyu(t pw }X)5>I?c[|Id?5 ZAIgx`Yz3`v鶚tFC;u " B a<V<QcLq
Bh: j͵E|h8v[عNz Un"Λ;sdժ^\;n ZT q%&GS
u b 7 z5Nm q $ϱ=VK,k Qesߕ h g% OCҳ5<>lq nك#ֺ%h$kۃtk{{x^X7s02H
SR-%ɇ!r1CWmԡRU^2.ކ"Nh^Yq Ǔұ6gPI (u5/dx,pfSKPԵ%7,|省ڛh|]Q/pO뚧3b<_J ?3 TŎj_ AN_\E pA9|| -i}l_j 5]NK7Dn,ia1'
lG,nBM o l0LzV \ oQU%3Z3utV?X(((((( R߇ -: t )jQE QE UV~jaEP5Kۛ("kW(Y8ǥs4PG Ǵ YZgWN[S }SJ oĢ]3j~uiׇdI'Qӵki"]BmD%7s=}i ٴ
P0 84Quq o+ D+v&'w˜<g}?].=:`^[7 iQEs^"QX$!]I82:PKEy-彘'Uk_j/}qu 1+gfk5 =FާSoXԴWIО8T4\dh ?{1wZOu{yg'=6o,Bgr+CDܠYOqZ-ex]NCn# _7_>v?{ ʛ۫7R*W|
" uc'ҐyOx%T*).u D$ > +;KвKa ? kF
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
7 BX f B " 8*(
(
*ͽbO ۛ vW+r[8 z ִ.t(ƪ4W4&Z[Nʸ b FG# %Xxd Lb ihX[4cv=OY-QpGStSn=ٽz61 pW tva? V{'taEV1k_^HAH=rJvjX5}:e Q`4K77:4Ko Ub AHgQ\D+oq* ݎFI U ypj7/$vm !v䜌c@ e&k2]\QEDxon (ˆ:_~X H[݁=@<\߆漶ygk݂0t UXUV/ >` *Ue ?_ʭPEBQC+|2qP+2c!-Q$1ږ j5KO Νs$$VwwK: 7dF眊C:+zT%k۟'28Oӵ+ Qy,l$- RWs J+R\Bzy
fFsӌbKvw; do\.7uP<44W1xV_ԟQI0\In
(sT@ ]}Ɨh.R."q_ܫԼ89qX{bmbHK|gh=դ/:ڇimő@ Erik K6.PUo V{?U dZ_쟏 TQE UK,a3N3 $ U}f)g[yݤj7 }4QU/.%ia"c''ӭ [@DY)d$Y<<Ixk35[a:}qzP\7<i Jc#|2;NK>[\4 $ۖuD KTUY#pp<2\h\_9ydz(~(
_쟏_ d /@ ( VYcWyo3 /1M+_Efi761Md v9:C
+4e ex g=+oh%afavK~uɠF~z}l[M{<gҳ|EZjv֩|,a6fs ^F/Ou{IB; 5k3]_"2:wJ (* 0Z /V{'U dZB@5 +cc0!F;ݎ4'M]ZH=UFn?Vg
=-n%$:(( _쟏UV=tj(C_M-QLG(AD $(~TQE
(
(
(
(8ƶSXBT_=E0Q |;58!W1 ~5jw.ƈA`8 z*( w^К#eiBq]kOﱶ"pWU6>mwO͌u9W)F| Z tU o-VMDEpTfEA g)iw4F׆ݷـ:A5o ksu dZꨠ. [hv`mo9 . )?,(+|".Os} sqpQ\qK;ף ilZ1F A Wh nRm t@'otP=iM1pq HZSl, s8b<U),c; &%!'"BDPKE QE QE QE QE QE QE T?[u=As@-P((~jOT( <] K )ĒhQسr ZzGy{ 9ۻ<}EOX gZ-I9:ɠ bĐúI I0/ϥt]xe.{l 5 r_w ٿ>+Χ>)C_Oʺ? ^ݛ}W3mᇴ[.Q>Nއ7&մiq{\+eK(+'$gӊϷ_=石y_nz :zUcET .D2@ Vq.g̠ t=j?I8(Q'?+SH JO+ێGC =q
9
A⫨;e`\68 Zn\ WCO
@z(䏩@OF8k0Gc9Z-ɴy[vm\DŽrf¸ \Es ݱ=rN?ZH+"~(=70L.. e@ Zi ګ|/?û9Ǹ G ?:]:$}J]ҳeyoYIi?K"gAq#ወY_1
<sZ]?e0._v= sԺa-f唌}}ʎ4/Gnl>] G ikcj% QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE &o+b ЅLDpTQEyM\H#dh _6cv˂A85~y $;3 EiV!d# ttϽquvp+dkFN On+''5Y4Րy]ce
g,m(b$d: ս/0 ڹ֭Ֆ49c ZPCd{
v 0ɖCĜ5PM*'aSua{ n XrNRvwDVwGZis
Uc ^1\ϊ&AI=\Q 3y1fGfюzt/_vdQErkA^P phu;0J_쟏UV=ujN9#IQV u s# }=+V.~T c_ | m[WM ~_Й^YE,Z4 )o4fN]ź~
Gh7q+9~Xve{?!Wږdd2\nb"d#QZSՁp ݰ
FխP<ށbs4F++siqx$ w0G) AZj[J<-mutI{8$O
|3Ǫ3HFߜ1 @PhNh5;xb! IJ (? inhrY%G5 K;q9jzh:]ңBp uUb ?ʭUX_U>` *@` 횋 5 -Oiԣx^62buԼQVl9(aE rrsYT os NYl
~sL tA9TtW*} >{hg:r0+pdbYڦ{6H)ixo@?ϴZtb xn0WxzS\Xp gqU5o glr L SxATXGȀh?Cs
4* k
J/
uY ""FA"SنFq{fu}2r=2B gc.O?L;[/Qq26Y `'vlɣj_]]/!v1MVPƪ"-pَ[{POccm.ndvb_i6fZK4 Iv~ˮje(V(#^ {bEjs dWgf w(_C
H~(tq
Hu5\C^l0ji. ebA0y=574T`˓<\95e 37O;E';B jáj \U1*}yS]Er V >+uhe 4 V=uj dz -U[/Oժe : EP9ʖe`q^r*gkenJd,hi-ڝD A*@'5oU1A(5B5Ķ<Ìc'' Ze#%9A gv#<0BR3ltWV # 7fe=]f2鍫
.B0#]&$p٬, # r2{'uImNYKH%0>AaI zS>Ϫ4Zđ۠?)|*/Kԭka,^xo"p~MQTX #ҲcTկ-mǙ0`apy(ZM>h&PHC Z`B/FrxR;y_ν2#O@?Zѿ'ՂDRe? HGCrEP[/O/| TYDz~?Ή TQE Aqqq1ڈ2Ms]qkO-}Zij"YylAbkY#cUGGn"[;w+M áMMVy802#ryS8Rk k]GS=s>zV=z4W kBczp<zWkx&M,\>_ }'ڪ/w:phqy$&c,|KY}TDVH-B.]kø FRn C+(''-@ &[iEkwڷ<)qjnnwI-9Fx|c8>]_&J21vs\"4H7 `o vtQE U>` *Ue ?_ʭP[/Oժe :@7V۫˩]ök}.+di(*~O{
-%,WR Fk[DmCg gj֛љst4.Sx< 5{2eKau=bO<Pq]G4 nثz;U=#fJ N5ɟȝyU!q$ k~<nW6k~ݛ=+b
֟ϝ8U}3Z(Dz~?έU[/O(
~C4QE1 (AD $(~TQE
(
(
(
(
(
(
(
(
+14}:8d"KsswU4}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zw KMy?ooNcڀ.T&ϟ~1D}wv=[ NO;FO@AsS?[tKH:R( ( Y'V $*H((((((M"n~Ғp@ k ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( +_ T Vdh* je& 8
)Z(( ( ( ( ( ( c^:
+ez]T:nk/Oժf@GJH#uuQ@Ϡ9vGOd iӥQYݱ1 +Zwb
(((( 3 ZM" _T Gn
wY^=̣*q @_ R`i}r= ~v+j.a@T`
}P0( ( ( ( ( ( UR @ꭗ{'T B#%$(Q@Q@Q@Q@Q@Sp Ae :% ?_ʖ@6rhdn $ P(JZ(0)h
(
(
(
(* 0ZC]Fn*Dz~?έUK2"?RA [ah'] =GSQ@:M8v>1xIzZ(Q@Q@U dNΨ*@Vq 4f(C_M-QLG(AD $(~TQE
(
(
[}.5y~fcAЗ gkV V}Yx{\@ v8J SM9
WWPrd c^tW84| κfKU0P`: }wLB © iF2c#&L 1準x@F@ltX.]p1ߝ wk\Ҭ1K; )x6kn_&l {^@j̅+N\%#r~@Z렙.!I@QTK܁i4-VTl}(S$"C$*' >MIA' ~db_ZZ2%́ }@(}gMȂ`\@5 ;@I? fYVW,95
W&G>S>Oz~Yi
fc :[.0.x 3EPEPEPEPEPEPEPEPEPP\ o? F:RB
(
(?IU?
R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( #<R@/r1vd
3J ?lSȻ 7 < ?4 7r.cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9`cI ? O Ǜkf9aGm?A[ԒOkB)a2[) } E1~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~mՅU@F Q@
eWXd+o~Q@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m bƭQ@~m >;xb;p: * -uz(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حrƬ@5\aiP_[s4} E U?S4} E U?S4} E U?S4} E U?S4} E U?S4} E U?S4} E G Q1IEw:Tϱ[s?V
bƏ[s?V
bƏ[s?V
bƏ[s?V
bƏ[s?V
NBs՚((C_M-QLG(AD $(~TQE
(
(hAK~X =:'zHqu&NPrx ?@[TF._1Ixu ZH
.A#Zi:tЭ»a}@=j˧]፹g~# ƫe (
یdphRB10 : *ݼѯ/\v< ?]MM[Qhbܠ$ cio\kD6ֺk,7
GOK}
[ S]i b?~Pfhڥ$}G~&ѯ 9 ȮQQB V~ps|uPڀ,]oon]Dݑ 9E,֘qU[}5} 6I @ *嵴p-j.p2O_ XmrKX^db UҶk7TӓS;BeoB=^M0,ۂX cҬjq%ΕܫsչKLw>P b}je1Nb_ b` [,1EiJXPFBqfjsaU8 ަ]kԮLʨP>=$Bc8a?j |,iCS{UH?_?[6zT]j`(GlKsߞTO i/= 3{֟`ip^6]pGSha
rU 3jk^tq(z3⠟*Z((((((((( R߇ -: t )jQE QE $* j}* $*H_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J6/: nbS_J~C4QE1 (AD $(~TQE
(
(
(
(
(
(
(
(
+15:Hd%EkqvU4>w6 7t}A%2ȓH?Ol2cpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B ;|y|v>v.i><g;sj%-!Ǒns@h&lX0x2*z * -: R߇JZAҖAEPEP?
U` Y'VFQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE V<p䎸j 0 bh?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j +o~h?S5j N; b=*U>` *@".SΛ- R ,? VحVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVO՜CgnR[e]S[/O(
~C4QE1 (AD $(~TQE
(
(
(
(
+ռA Q4V2bt}+pzUH-^I-̖( EEqKd p@Nz۟qWZkGoHw 4\ 'y%p Rė.-)t` hW۬Dacu?AV ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ # )iJZQ@Q@ $*UdZQE QE QE QY7ޗ6a,q 0 7 iي騮hx]uG -t1ȒFr=
1ܒ{zv> #aPF+9-*)ޣO |Oj@utV W *Wp@XF)oA F!Yv>!n.6FcԖ uU;Ŀ%dY@q=zj@Q@Q@Q@U =:CQk&/Yz7 hѿESE<bX:7! Uyu y SEΠD\IdJYIG =Oη ?p ТktE@ʒ{nCoa4FdD%Fyf6hj;O J~a5n9cwDǨ9%Q@Q@Q@Q@Q ( (KVc/?)y
>5R;+m҆ xzR Z6} Jм%Τgr&4-T<5gYgfYo%foN(Qj6J 3Vd:q
O mC :4\z)aM'v?-iO6 [8| _&{ye!8`)o&I"gβlutr OhEPEPEPEN{[km}\#'%z {+" ]鼶a6qT/ 7 iيKEfiƝ`eRç'Y`Pen^nvY]; BHϽK5lnn# t4U u ( T \ƛXIogf!ʹTc\ZV&+qXnGˀy_.-ZL29l* ٢WVFsw# q֮EwgHUf%dx@4Vƨ g[RWuvB[M> \@W'} |*ẍ~`s\7= W
)K(8GCH$HdU$ >.Yi| STxؚݕ}U~QU-/-: U ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * U/| Tj(+"]{JCs/]ϏPi5T0Źcd(-ᶌCnz☈o/̴d:*r]8ǫFrgz miI]
3%OQҋ
OX]]7ʱ²\o [oU?Ңo 綗 }Iq 2.I nMbڛ"-<M/@mCj6vv]$m\8[R˂93|3o8Cҹ8~h33%*ωD^]jF+tux+ r $<PcXu{HR9fH/ ( ֎Bf[wn=y쵓&fB" A^n{k-$*-
Xt'E 1 H23 qړLIY U&LqV&imɭ%H$
?br߆v*M ;2Cobz ƀ;|Amik3aHڤ )w[ƒyUQ.K;D[,vE Ql/IM2EN苐yӰ FK'hd~\z[F{{-D)k1Jvnڅ@7NI
xqFw8YhѐVFFݓp8 wQE U>` *Ue ?_ʭP[/Oժe :@a:V$<en>kleqyDyFpzSBf>"eAZ';D*ȡ8#^uVCU¬Ho·<8(.^;ivG jmufq%su7@$T|saoq&7I9ǫ(&k &}Qiguv@H6c :vTjh7\Yf8SSj:e4y#1
'' t=jӵgDFڇq 淧K f BB'-4OG,{&]a;[F<Or9k3e TWVW(DFBߊ9-՝N9@#{Ne?:ԯn>զF8i^9~5xҤ12#.\ y<7o ֓lO r1 U#W#}cmoيFN\g z4.ѭE2g ZTՊmە8{Vb "&;_* \1~3֖<: ]Ԍ4.T$9OKu=4e?7[ଶOK3߇54^Eqn
~vqH99%kD̥,Es8xh,{8.% 4 Vꭥ G$F.j V=ujDz~?-QE U~B )%)(AD $(~TQE
(
(
(
(<hT>T-Cq-jP1r
7ۭ;p)l+f;M 3QӅ<By_If壵% nidaL|#K -82t6m/!;s\babL8gqni)3\X<a;zsiNu"08 Lcf~6sw⪛aGw~ȣ8 kMгK7gz u
i3EOjuaKEIb$UU$$v ھy `z'3MYmْi `yX}
|<:W4꺁 7y ^7#I"}}*J `\@F}Sv9v[" D " Kۥԣ ьvqi_HrX'YR \ZJI%s~?TZjVWċY9냊uy<K
43<֫݅ qj2? e<o^2 vIO*<~dcc z[}][LI4r2ǵcO6b { ?b0E%w۶hkS,8?21՛BC]HwNs\T2"!Lh-# ZF|=j[5 HptJu-1 =x {kV d>1ZVAmL{ ljc;( qiB=~` z qYZ:/i3D-go7
GII 2U.;
ԁ7t ж[ ddXd/^p QBK?Xϧր6 1VzUִ˙ 2+UYSWB. 2< ޔq4Wd#ӷ?D4I@ Q[WHd0} 8x $?t<@ $r4k,D2#IX~ 9 ܠ( R߇ -: t )jQE QE UV~jaEPEPEPz"^ y,dg9@}k;LZ5Џq?.ck
KSvqgy*|2,Sܜw +[hgɏ!?m_u~$z'?|~NՀ[8/ ?^ 1d݊VcX;@m}7WoF R%'@y`;sxuyf6*ǀLw ߊ& EΥ".YY#@ AExd &Q61SߑVުwQ1(o<(ǩ5O
z&rڧ0|BxU]Xw=.l`@ }.xWQ@HQ\N:#0E\6k ySMI»^O wZQ2G;#ʜ >bL䵊In$Ȥ$}hoOL1
S)OJѮJJS;,]qں
( ( ( +ՆK}~<UT1rx<{M5Y&it)-ь',qG^@ O[_Uz"ԫ :+"ۼ@>$f_*Iy.<ͣp8PMqf[5 ~g?ŦY`Qr{;t ٮu&#lJ lN75}
ֻpz<L#(.~ ǏҺM7UM`~c X\"<
A #YGؠ"(#S]f-l$̘Tz(>jVEۭͬs=Oht?Mνe'mojUkg8P \u"`X ?#^kgN[YѶf#
(
(
(
(8gYեT0 ?~?:c m<AӶ?ƪ
丞i`QMg - ֈk],q{=]y?{M6! 3vN8?ʽ>Ck$[t;%܄?wnlj e۩ea n+״弅nA<eOQ#5`j[_Bm
&y!tԔlnk;ț[Q š(LNUA gZhUwk Aٸ=qEPnt\"鰎(6 jKׂ(A,@mv Kφ6GدpfmspSjIb~
yǽrj\htcHio\ Pc M8 D K;} 5&pECF?xqiol㶋Dp: cD]00{ 9 )
oW_E+\ GV$?I:~f9n~xx,^Vk\ PX@%ӯ/VKKV2ZMV]0yeڸxjtٝlIo4v?A-c&yZGILgd`q@%n j<I\IH< QE QE QE Wdti] j|QoWJiFҜw4K h"u:U-ŴRظ$^4ҵfIo^8Vcolw;dϥkϩK/stD)AݫfR H8W'$o1y3#WWyh/#e9 Gj[GcW{474ReNǎ21 -(9_5}U 5 /[Ɠ{[;hAyi#- Nܼd5#:ˈN22Uzg?Jam ]N'bO`:lm $>OjtPUJ$0z~V.-<سc +RC=?:i
l[b1AW= esikxYbtm8
ڭi.P y<w* ,i
K<r 8L\iie > 0,r@m .WC fjcpUJ -lt{i~wǨR
i_6$
H"Q=<
vǽ pۣPa$JNQ:n kjR)R`!v#5cMJEW$U{&R} SU/#ѵ{ U@ 2,Y7 q Q3.
3]yhgv"cP:Mryx *ϽjD+tZuu aha|W ǿֽ^^iGk( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( /V P(9}nuVY$1@@x-^q
BkwЃk ]JC!k7]ɟH"-Nto+ , I'Umlm,S˴c:j!7w1*?7"u+{Ac
Rtͫ~ON;kh^? F Ls־t[mZ+ffXrr :=p)8كá# .6K tIlo$ӏƺ]I\R<gmJ+j =C_~v͈L$- ?'{ U'hv9=%z I<{.?1;Z ND9}
l];dr9@< &xgUԯ4"3
G w~ ʽ. ( /| Uj 0Z
_쟏UV=uj+L:NQ $dZaеk_1l/*7o=I47 ^`xP r9֗ Q (t-f#֩2FWQ xH OR_sMc+NC$ .8}+Z{KK[=>MƎ` H-QRQ՞Ŗ$U-A ֆ hAr3.FIv W]E y yjד7ٮ$+^*ڍ 5hrU( k ;} pkq-|hiY }+Չs1rC^QOh*0"8M?ZӴkJRv(*`ֆtu=VVH\B N88 +TL~#
4q 9h'@F n$ E^E R-5LO ;s9 P=jPUl? V{'Q@P
T!Z((AD $(~TQE
(
(
(
(*gm;Ls SPϥY*f q(-Kh<A\@0=^jz(-W]4ק<\Ugޒ? sV1,1$)QB( V.Wz8*4 ,&+qݑ4hn&LdץuP4,c<<Um]:Q4q$ZPCcj4>ilF1 ei$`ƟtdcP}gbY$55͝@ b9TPW5ǘ @:v`?jA Bm,q=*j(4
)A_+vF9$ Nx,'8d"!99ִ ҬѬ "~XdNsV&Wwӓ f IpN0B3J}M$d3}P+Z .g5Ђ қyߐnS,E_)Cnm#s\X4M6U8r!~ֽ]-`KUĒ N:RCiĻ|.Iy4P{khm!8'zE QE T?[u=As@-P((~jOT( (њ 5;=RnP26n1 okjt&N:15UqXZSHU$`2>V`f
:ecS) @Q0k6E0mUaGoZ4WtD=fkh Kh2I<}MX
鶱X6,g>IEg* |њ gg F>j4 QFh Rf
(
S/ >h>4
{[x_GsV<jɈ 6br>VѴ~lYGOE! ^Zl>: >r* 0$*I O nm{iAッV("PFO ( ( ( ( ռ=G-`84
h`H)݊}p$e uEcɡiNn.bű#3(ϢVK$h
X0OKE/8amP!fzE Qӭ/6O0DIU$ V(3 ((F
=1RQ@Qh (dRȥ
=*h8nH }!$vAPee?tp אm-ZĻ# ؎jei}@91_իK[Y`>f ƃ@g[h&S3٢ ( ( ( +X?gx qVN6?·6
̨uDT)?Iխ-2N'{y^Us2yN?uvj" cvqQ]%.7lHV+cqW(Hicic iƿ쎿S5<*PXd*J)JNQvI>*Ѭ6$N9PnlkV c6ppy"YV24І28
Yرɭ*(ifKoW;u$] ȋDnI]=',k4mk pjJ(2G4XX3Va0]$Cه=
Y ;`d^ Bʜ=>ڶ TqzTj:%3/ GEzh: чOOs]}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPUe _ʭTRIJ GPhZ*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E $ U v.2X
_쿏uTۺh\y#y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otP*s =Gs =@M E M E Z7? y7? j otQ otPYDz~?ΐ3
LJ *ʨE
@( W?pS@KES(AD $(~TQE
(
(
(
(
(
(
(
(3Qhdw덉)ݓ=SK=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE R{}68~K=y]|
ǿZE @3M"<{Qqx튞( .ԷzK~ # )iJZQ@Q@ ~OVz2MKTETg(g(>jwmkw(< A\" Wywg+UQcXxݞM >T-Ϸ>Uzϛ?QG?QO2~ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ɿ O*E Yg(g(>ƕin w) ϨywlEg'wsxAEY語l E l EIe*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [y wy wnQP*?QG?Q@語l E l E [O2^CS@KES(AD ~OlNV
br(EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ oZԧ9&:RB
(
(+/|JU>?ϥ[QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE 94 QUM'hXzD P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [}_ D P*% _ ZK <_ [p:'X( Vzd?>ofM-QLG(AMe
֝E A Hd H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE A<S@y"$TP H=(EOE Az (QE QE V_ >n/|JR0( 8C#0 )[RhOο@TW? gW[wn^N2ш##O
*(dgK*R?gv )&nv(V=gq:U=?RK>fH1ڻv>E 2AJlH 7| U Jڙw6@U$ќ
{P\}#)5"Ml=3 ߢ6i>yϿFH@䒘 6E"̹èaB3X+I ̊H, {O~??:VeeF# @=;Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AtHy{TEU
~ `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QE `QEV@x?ZbEPs4Պ|2 bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPe V u#
(
RqVL$x%H$\q,{R?.s$
L@#^1%OjQi%M7 8/?=H5JQcGw21ĖQ A 4r/A \$ &]'<W-,ɨC8? Uq ꭥgyo n 80k< zg8 G
@}6_ ێ bΛ,6u06Ryk
hF7OzʖQA3 Zݽ34 ofBI+ mPI(Ry>5/$Jڹ`aHQޢ+ iƎ/ h# o3A r=u 2y_ v \ CavrNP7xۜz4t뻹 hJqsRff]yQF3|Yٜ~ G 7$htdT2|sEVHTbIUd=k88U 8 TGS1@9vQvaXr?1ڮ5zȸLqӊgm:
:8-H
Dr3| X2TQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PY\5mpg1ZM%_6OU}]$I&#P6U ʸ$8IR*pAfG ˷qg7F/F ƟXaՕ(] ;{
g<sJ ݢ./fK3 q?ƴ-Vs e0[0* `C Sk:khyU
+; b + ի;% U/.Zce uN}-4|KJK O@zQj$ 5)VR7Lr)'w;v ע%q`Rh.LF` $S1; ˕e?ϵ iYI$Vѱ
{>֝ QE QE QE QE QE QE QE QE QE W P߅X QE 2 b7LX(#(AEYbuhRȓz~1($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?G'( E/'($ ($ D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI =?J.QKI =?J<?EJ)|?L` 3EuQLAEPEPe V u#
(+[%
o)![pz Qg>\{<qMP3͎7{
~?Mz5A>vq[[4OTO(ePцh֑[
,5}> nYY~Vc]\qE
P;( ~ -? c =zt5ŤɕMv>Q@0nw!F >Ol mꨠ
*e ~+/RԴ.# eڽKzVB-5
? cFx #ߌDqirNHV $C OPFAP :PV?j6!;ps]Atx 9UF̪@B/(H,>Xv-GαUe T*Wl@#fP!Z[/j(n! bą 5yq t~Tyq t~T .!́L cK@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PYpZ(
\ ʪ[t& (]b-Єb7Z7bRyϧJ
@ J6w`gր0nUN|kQ3ߢ SjoGrLn<pF=EmRV@8@Z~'*UdL k>%M>>镁%FOaY\tonV 4B(QYz$n*ֵud[e¨"T7~Bݥ$68(y,%tv<(5{T1ӿֈU^伜} 89<ye_8 tp+V kktQSW14 ;>Q
s$Hb89b w" 9Պ((((((((
^C~b
(#YCS Vi E(AK))` Y'IER ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԟ§.ԷQEP((
ҭE VFQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ^=ub*yUUTfʰ
wڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ EWUCGڭ K
U$`I?ҭEPs4Պ|2 bZ((AK?
JX?IRc,E5*n W8|Y #ѯ'[kyH(? Sb7(0 d\[ֵ|1?{ JlGaE((((((((((((((((((( R߇ -: eQT ( ( uO!g ֩Hh t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : Ώ֓ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ( t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G hi< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEG|hJ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G hi< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEGt- ΏT^t~Ώ:?_@Qy :< KEEG|hJ*/:?_G h t~%ty : ΏGZ*/:?_G h t~%ty : ΏGZ*/:?_G h t~ofI,@<S@KES(AK?
JX?IRc,7?'jU/Rڶ9 !_ 3g
+YjP]Nc d=>䭹dT{I '
j Wk ?$ j/W
ژc{/֦V v oZ+,"YO{ q]WB *`ٲVAERQEF
_ʆnך, ypbK(XvMVPW1
XWۜ'O&ُq pKY11VKd3m8 4"}y۷kf2D +H+]&8)9r0XP Kj9g/HK+psPԗO^L{W#?K EED13ɼvހgڲ'KxѭI|@#O5h8U OKI t(2[ӿF8 AHsZ:/Z djYb$QH'lVdڄjQ"@ ʘlV%݄r U YR'@xn P ǧ u)5A hU\
߇k
wJWHHp84O)5\y }] GS<>^1p`19'E QE QE QE QE QE QE QE QE QE T?[u=As@ *QE QE A }JѬ գR0( ( ( ( ( ( ( ( ( ( ?G *t/SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOT * ((((((((((((((((((((((((((((((((((((((((# ]'z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ?S z(
(
(
(
(
(
(
(
(
(
(
(
( t I U= QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OPGO 袊 ( ( ( ( ( ( ( ( ( K~ ΫU-:M-QLG(AK?
JX?IRc,S1H]RGR7 'RψOjZq[=:;a+# ݮ?
uJ*:n]WP;9jI ! ?Ot ;(%aɻ˩txn.[| Vs^h6 I\; ERQE/_W>P|>o*HbB35LhZHƀ96Xl
6;1]}E$O1'S 6ґʰ9R{v5@ o@genl n*کIxT<]Ŵ7q.r7Q:sڳ ?<@ MIno#9 8j\8cMѹ9' Ȋ " 8d!G>@ ݪ٥[%tGT'oنE O~ܽ܉; 1 A5)G=
RX,!\H=2=%|5Gǡ6X'8jo+)d,ų"<:PO_X "[oH6 _i-+@[q z(((((((((( R߇ -: eQT ( ( գY =FaEPTo }:!5vmy9mX?1={v4vmQ!,.{~-FKp=kI FaIrx>7wi,~L2 s$DAej:ݭK"1fan-F֘f!`p3ӌWhL,a uNK NF~G[R 7*UԺH/R>ѱ_]=MM 1 dthڤQ^Ah2)u
I4d/уҸEWV1Yc7~xn}Q#*œig?1Si )ϩ2XpGjaԆ/#CR!x-ǾG_6m|֤W>n8 &Sq s ןi{g!Ѳb<eGnkoMAτZFz1` @ Q@Q@I? ?G U= QE QE QE QE QE QE
&`:8 +
dB*r?:/lɎh?p J\UDfu>LoOa@W#/y],-dsׁitE8PGEbG6\l+;Si:hsz ԬRimt\uYZn?yq{bf} mKaHO{ot<+ ]
<q{nB;ce{ G cP}*J ( ( ( ( ( ( * I U=A ??ʀ'( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (̙X~-Qԭ~c-Rr?Z LHX:NAEF.gwNxZ 9;#T4GSqw0O</ƀ;Y]ƹX3' =ϴ-A~xw$7Qp(ၠ]]C dЊ}rkJӬ@"_0}kOWΗL#76g h^¾"vML U?
B q@ ]Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GO I U= QE QE QE QE QE QE PiaU#s `zZW$P; c8'yy./qx͐QI_=ʀ;& K6 j\w
[l ήd-=q-tGIR¦>'%$Ccw?Ҥ2
q=a #~˫[I12䂽{?ʪjYIr.$r (GYdC`>Ɵ\~$]}@YUǮ+((((((t S z(
øm+uؠ IJ1 *+5 -ԦH Y{J ?!}_(5(H!C k?ܕj{hZU2JU\{ .k WRlb7:v AMvõ]ʄNW< [U> hZ )0 kb--乓c?_A=π?0]9x8
'ר =Nӿil63 jm]:hKgNOr-o\K7 bEpN8,';"SA@ 6conRɈj52Uw;қJKOh\ /N~fQWRU%ܞqP_ku{=) OJү4fF @ zO4@H,5%BCm$?h)w8U'W1Yq@ Q@ ^0[ɵ )az v8=Kğ u#] (lz x1_RC} # %u EP z?O@Q@Q@Q@Q@:mhGP ?[Y[5Df
=\m!
zkG :ոm=N;W=:7/$hyc] r
q&:JO[*أC k.]A-l\>і5M<@ AP8a=WX"a k=km>[<lkHFgH2Ȟu Y {h6P_5*jеo7M[0?^pˑӣiۆ2uGymWCr `v z G Iuo*)n zXYT x pqX 47YϹaDdo zEf\:moq.\dmcg^Iϲ,dq{5^eh\jgkwoylۓ8zvPZ3:q\vnX|ֻ瓞Ki@O#Js hC M RA;GS±&kDg 8 gk 50 YAo5Muo\iV3 ;H SҀ/ S | bI x~ylo6cs:/OIPd
+~\hO\>hA=B ǩÆfO{*]<8P2qCZ:$Q6 9 s@QE QE QE QE *t @E QE QE VcHi g]۳~߅iם\MM|7y͐Ts]kMhA3RX6
mH qǹ=~zeurJ5&y^%َG7C
ԏs@ YIs'Dǩ?Y3l°Kjd"_ (ڡU)oi NO@ &Y1R9֑xyK"ˏ W}a Y &=RzhQ@Q@Q@\ oxՊsU V)%)(AK?
JX?IRc,E !NXaCQA - >o <= UQ S
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.ԷQEP((# {VgG CQ@bzևa mV443j-JŎ<#?6M4F B14RrAR{u
TkhPAW9b{ɭ8<:dpà buY>Fr6?PEBWeX$ahVo}E$H (`-?A]]rEG+eP 繨mmexA
;n|9
&+Ir Kt'Vx,|<.K-l
[߁/ F2 mƽo^ڄեd9E*[^[F@#oO *"_,"oKӣmD+˞]OzPPa wkֶ^X ѱ
G~նJŪh@0AщO4hViqhr?#@m/<{ev2.;t,.uXc(䉎_ ; gF8
FW-?g f]dy# qz ߢ( ( ?G U=A' _ʧ((((((G y
ܪ6mr622GC~3e5jmi9 HHk]=N{H}:E2NC7~g pB}2c =+k@o3cz?Z۹д˩LņcT*p[̶T 5iH Ҏ ́^cl," ָdյè<&(9Q:( w7g%ʿ)Z誝yA{( p8* j.
. gs, UmWEӞ9/ ݢ( ( ( ( ( ( ( # ]'T * ((((((((((((((((((5/Q!B?.rҼ7l #.x.K8R4da3_h \=zUo]Bx{I0wnN>jl,
.Ӯs@ ~v{y_*տVo r[qz w溹t9XD000s<?Fs[?s@ $#c [-d[Ljo~]k4aP RCm%E\t,I4UBZ}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Ks̡5&+xu+: ~^\hW{Vٜ"9iU\=`<F?]/6f`(×0ț[>]OM6bXW8
ww j M23 UqZMv& b1
طњ3RxrT1˨Hz PiZ ^U&p# WY\v"j UPEPEPEPEPEPEPPGO I T=Q@ eWRJR_^*nP%`B}H^4fX^ Q\bng dh)SL[ڲ1 iof,1
~) Bg\zԲѤӮg9s}@1nG_]Z 2d i Avw{~cwIo
]x< ɽ[weH MY\QiT܀t:75əc9;ÓZ:֟.hR-pZ rѾ2HS0r+5eڗ<s#(=~w;)| Tl?ko'.Y&w?LԚ 3<~ImosӭtXam+)
ujP&fP7TCգ s) Iտ>>x
[W
^0# ڻ%-"[b0) ǭgYh6Vr9vn ONj]{H-q O [\Li <}C>koyc̶ hu't LMAZ
:~n'KO5xz
hQ[K}i!9, oZޣn@`ww_Ca83n }kicP ;
<) Z I_71>h ( I U=A ??ʧ((((/:UC
ck
/>Q]{G}tne@8ڠVlqt&Qr#1P9\H<aƿ.; ֺ:æ-`
C Ӫyܿl ?5q'=sǩ44ꩦEs$*' **K/Pj6eyW;DG?@w L:7.&A}#}Kke p8+b ^anq[9\:U NM{yXg,
Ҁ8ۿ2[!&[%#L d]e݇#_ GOB~-(; ] D!B"86m: /x~]ճzeފ1m18,`{gW7c~] KfE?#(9Eďwo=q?SeZ Ww+ޥL{
^:]]z]L` sx|<cQvd>8ݭ^iIy4?;L1ٽrӒpǿ9xtKּNTct %g ]kR ۞Hj;WVӥ<-|sG+TƄ'@ };`5/equQ9
P{Tmjv2I2ICaps>x~ ; P$סJ 2c;!.Z /t_kKE Ul-x`zgGY vyc3P(
(
(
(
?OPGO 袊 ( ( +[Mqn !nI }2+ЫD=d\p@# }>R8܌ͷu~Tbq#,p!M\n{ThVl%%eQw DQ1H<q NkcWDM*` $6]JJ>?z[ݜ@g\zPavƃJ3ߎ]t<;?O«geAGJ@Q@Q@Q@\ oxՊsU V)%)(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
( >Z5 }ڴjFQE QE QE QE QE QE QE QE QE QE A' _ʧ$ ] T QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A ??ʧ# ]'PQE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEP?[u^ b\ oxՊh hb?(AL4G3S` Y'Iw١h4?MOE 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(CSCDYF
\.ԷQEP((
HʌO ?UT WjF3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)PvC"gK < QM?ʥy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(l NN23ҬTIOP(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)PuA#dgK < QMO~ ʥy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?TK$G!98JQ'?@e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE WY$9 FzTl ['Z g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/E l(ly ?Sy ?Q < QO < QG/E> g/EDH$rT 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @ e ͗yE 3͗y6_} 6_<)P<(e @FL\a V*Y ޢX(#(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+| JT>ϥ]QE QE Q\ ,_ҹ :+(C g tC 8&=Μ(7I _ ʀ
(
("Ե Oƥ((()h( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *$ Z KQ'(Z(8#i`hJ+?iRH#= U;KtwpRPۿk@TQYWZޝg)Y2PN>EWζp}ٕT @ EbE{im++t 2(h6l/Vq2n3P( U;=B1#8'W( e8QI <)<ygЌQT5 [koLp{s@h ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
?ֿRI
(((+55[w[
$?g>EAmpP%`qZ
(
(
(
(
(
(
(
("OT¥d$HdUX )*@
*ݽ>}ÅO__*IA'H#? iHX(, uAiw
"JG# (|C)*e9 UM^_&63}hJ+&\mf0K'88P w FFr=++-'z6訠;VxNQA"DIUQOA@״$?ֶ( ,0'k}O PE2YRi$
ewP'*#<PTS-<j 4[ [s'o sSր.QO<V4ӰD^e G!nyH"}F`:v
+:Vl.0G ִ֣9 3I B@UkKkؼg@Q@Q@Q@Q@D_j$ Z KEPEj}KU ɣp58xY##K~}ֿ W(v_^٭c^}wwLD>)X.utWjPY-. sk
;QHǹ״[Ӧ?~{{f)QEcuvWbI?%7bdtQ@O(ՊMQCS@KES(AK?
JX?IRc,ELW (66Bf>ނ ie>Mi"[ا%\ܴ32
zGym8u>J4OA1G\{lSoWv=6(((dJ]Wy'Tj^UΥ"_q~n \2 ˞O . ڦ;X 0,b>+k+2ۃ8qҀ6W ndRawP7p@^':t[\ӵ zAK\NCg9Ԛfl̬r'GF9 d2+UH# y#$V5nL-6GqO r>ojͶkV+
"<by? wusE(&'Wpps;ϻ7nt@w60?&g}ol+ڬA#= MEa&26lJ[ha0e*IiҊ(((((((((( R߇ -: eQT ( (I?UڑQ@Q@ ,_ҹ c Cc Ē!$ck" #V
tUݝ͝>S~ M#@ d`MEv
Xkmڪ o7v~f ehwDlԒ[a
} ]PZȋ0L#w^b7[2V~ӛ VZm6[v0poa : usYq*X}}띔ks끺k؊`#8\{]M _! A5W B?k((j~5-D Sh)`lgbǮky (z o]T*@
pp+M
{f ~T 0ۥ owV# upv='*Ϋ.b, #U {4+iDDO)
Rv|qd s obX7I?6~u+-F KD2p ݞ9eP#P0 Ъ@f. Yn? :k˙5-^zvWzKg:r-5ȟSaX죎Vfd֣+*1>{co
]No"hV;qTZmƯsB+|
πyz (66LMX ?ʵt"4Csb98 [[Q\dӱϯj[d{#_CҸ%nm[6#9T
N:WOnn բ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ k?SPn p3;Vd3[ş! { }f .8UfUp{ Һuiv> kԵ
,*m9V.ck
ff
.>-̈́fj1a g ְ
O]Kuw³{c;F};R蟲HQYW0%< qӽ uϬv /,iFzt<DE] Jdz{me vPὲ&D`_=r7c=ӊсR
A'
S}j̚\zXetl`I t4GTN",0ѷ$}&3ezt|A`i]6xӭIc)ѴXVGQ0H
=Nl-Wc^ǧ\ݭ$m$4KLQ XS Aln,HV<S
fVw Z[]CfE V{hn.%HX E/aO A+$ Ik%/!?ζ>zznCǩ szϫE=" m ?]F o
s<zlnh~L֎?Js_oF:
սٮf裁{
㤷olon&T1]ͬzeg=KO I `3u^G";z*+xV's!QԴ QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-SW{T2KGW+ OrvmpW(>m_N]Ky#tE@wZ{kb@7 dquz4cdɥIY( I Uiˀ{`ۋ[Ix/&Yv(~7WwZtt +?SYX<3 ֦iHf8 @)߸eI q} 굟 fe%l .A'?U U 5 NivVրAi3j@KEu©:ogJUSRUt8^V ":`t=)i5tPN(((((((k-D_h;U}F^XqVf-OP 5cj}%xNvy$V%c̼ ZF\ǥ 9y.6됑e> n*a E( uJ\Mi۩x!B3 r[{ ,#`q@]TO~EWu? t *tz,^H 09'ꎏh-mB , 3U= c/Q?5M s20G@HȎȌ A;mo3NX<htgR<0kM!ҭO$;9 @Ym5[e",vW
uffN?tS0fFz zTxK"L|g3@q^ٽw "owbx&+w %)*At 4`#Iw}QLqitKIhֱgD* "]X`:n$HPICp1f_kp_3O6f:g?]- fQ@?\s@ ![{@7 CR ի
oMK%ydQVOA5> ʪ)EȠ AWi3jI =Ej t9m,]Q` 9LJ-KfW?upǥ \{+'K!'kyZTIP Y<Jw$[N[RKUQO ~#5b]ulceɊ NKh-~֤-&[;-qg&Byb
U"O̲;ЍȠoFQo+~D1[X pk~m 9ؤcFMd_Io(.8Rr=&s;Z FJ}zQeg ʥ4cOYO["05 j /uwyA 3O쯉# 1iEPEPEPEPQ'*Z?ֿ@E W#/ ]Һ|e UGq=?ki _Sķ:lHp6+8_ ^|S~ $
j MNZgVn]jBqQ^
$vC [qXvJ+M8--w}5yF2jbxv JH: A[u4AERU, 2 Їx[٦Mӈ?ȟk:^G
>d`I;{}+Hjڣ "`!\p?p uo'v]V>tm
J8 I>>C+
`MHcXU EdXQE ꚢXg T?4QE1 (AK?
JX?IRc,Ee4ZQdV9?(ϷJ{]: ̎A` GA}x0/DYF@נ; BOrrqG]'YS
BOּugаhQPOR6 # t*N( (M]jh Aی=~&M e_ ?/?
[WYoIDѾمS qں8NjN['OIZkЦ?\PD^D"ɞK/M,s ,&̝v'Ǖ$iRwd+O&
:.$u9,qϯZG 3?wZ ꠳#'X"hXmA1 y{*̈́ 'i<vsjƵi
h2ܫ>4I̓ ±5 W8 ˫,pR+XgV5֚l\.e#ok:Uхe<aAs
;HWxc ]NfB`S4aFmxY`Ic.גWrA J 9'$Y[aYwJz⤷-(V үlRQL/J6D| uTQE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@>ϥ]I ?ҮԌ( ( c wqiou]sH: Ǜh GK =O]'N < ?t 7'>gZtw7 ,j꿲t 7 ?yƀ9Vx|?Pnlm d o'O rs\M9V (T5d o'O sO# &*gX : \((j~5-D Sh --iPMTDE=p)PEPMdG 4( ((o* zgE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@ XV,=H( 0 CH6
=Q@5CcfE QE 7ˏvw9 cwP7 GRVh QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@6 z
ɽkI $%~8+^ @ g(eVX=
- UF jZ( S((((((((k-D_h ( "p>( ( ( #z )PMq: ( hD \( {ΝE QE QE QE QE SU3@ϠQ@#"ÀG4P ( ( ( ( ( ( *$ Z KQ'(Z(
|e W]\c~2}TwvE@ O Mp_A%lȮs4VAdӿ+п~F͵ FḿZ?* B }k)pY=Hf;DŽտtxMYt87 g'QEr# ZDf =e
=_7w=X
uC{!Xz z`+h" %6QbC}&G?;)7Rodƽ&Kz\۰79Guf+[TvTqDDǝ IYQE E? V*Y 5EM-QLG(AK?
JX?IRc,EZ]lmy@V-Aa:N,b6{-hYXjq`zckV7o{m C "(U5VFEPEPrG RU #( J 8>ԔQ@Q@F E #<ԔPEPEPj !?hA ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+| JT>ϥ]QE QE QE QE QE QE QE QE QE QE Oƥj~5- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E QE QE QE QE QE QE QE QE QE QE QE QE¥k- QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-Q@2H re=AS
:gE |?t~w "N >"3} E_ KE( ( )i((( T?K??EM-QLG(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+9u?'?ZX>keO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`Pi lO$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@Uͳc?̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Z<?V(
d̓yo
I < Zbٶ}w`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF T$ dx`PO2OI < ZF QV;6Ͻ 2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('h$ [*y?֏2Oռ
0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@t)U*?pS@KES(ALDGqS` Y'IwahL?
OE L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz( 0 {4} ~ L?
iߡ>CGajz(SMUNM\.?ԷQEP((~jOT( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( *?pUE(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(?IU 8CR2z* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&D?
hߡ ~CG!hj* C {4} ~&V>CUZ((AK?
JX?IRc,E*&v2IK\ s_SJoBݦL-gWs^Fq^+_}_ @5US++*
(
(
*
6@` ziu2)%!*F8
z+ '{ µ&f\U(ockE48=* QT# :}(qY9; \߶ x 4j56[ÞN =O@tUu" *~Z#K,P1h37n{}y QE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@U}*H((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ijߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? UA jߡ
EWT Q? SX4 ( b|Պ|2 bZ((AK?
JX?IRc,3OM<d
uI`w_ 2A$ N ?#ookE=p06 Eu ?Aubi=N;B=\'mOU tR A |WZ{:[. 8[?k 71[ giW}p#8Z> gwu aK)tקVI=
ZQRPQEgw}JH0 ok3RՊ^[ Rd֫3([0>=ڱB q{# Z_\SxE{IxCw=[VK!ˊ<XwvZpIѤr|e>4vΛ*Ҁ9q #/1 cjӋL sѰ:U4Wdf _ZGT~8֠7ʎ;p=DdnT [Zd 2[e(xL's8o{ 8 A enb%2!p=s*ۢ K ;p Z3;BpofcJLg%t]Zˢd 85%2K`dyP1A(jT[WUUTv=zSK[Ff]eϥC͢D%b+2p1ޣFȺo 62;mEPEPEPEPEPEPEPEPEPEPP\ o? 2(QE QEYU}*H(*)&vڋ4-Mg' <s!9Y9W$uu+˜;4f*WjpPP(tl>`]1u TW1Z@"8Lw S$(W|}X?3Ul?/ƀ.QUEpNߧzoE })2"KOq#@h?zwG }
Q.#.E QKI@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@C;u{cUEI8tykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO ZykG(Z> gykO) &N
U 7 QE G7LX! V)%)(AK?
JX?IRc,EJS B-&ҧ x?ҚOc<+ !o hn Ie=T0Ozu]Gw4ՐQYQE QE `ms.q{*؞\; ^?55ՕK=Kȃ uQ@ in3JSc}!N+*?
^TUtxA- 5eqiB5@ 6z^0UoQ8< vfy `D?;(VI WC:~f=rO[K$9h?OJߢ3RN%WVݴ \v] BUr?#vx1ůJm E\c)t{a=Fֽ QE QE QE QE QE QE QE QE QE QE T?[u=As@ *QE QE V_ >n/|JR0(
E/bң& j[Yyz xߚ.I3ny\ i# Ҝ\I~- ?ħ~ O^KSINE>b=J@$C)@NYQWq =}ooe!-FA,HWAd'@c j}1,2+2 O"4u/eWE(ѤV$#J [+/ItxeYZgaz o\ên}q W:W}*+ O
{.mQy >-֢tY?'z@gQCK"? t>ƭqGHÅ[; #G[$U ZOu
ޙ%'*ѱpr(#u H: ?5=hlϦ]ȱ ldKhU@c8hNiXFt 8RӬ#HYPBAjkْ=BtN^,npr
j˦jsa<icNY*$+P -,w1%o|We [B:\κ$ER6$9@owZc [Ϯ1}§`Ks-);_|~tVflbLRٜJЈ;s@ DR<bXX:t)UF T)yӆT$}iv&60u :tzӭĻ Tu?ΗI[F;?V EsviZJmk[?S~5ΖzD qPn{(1 ` rj>}\* 4ecu.. Y|A '${
Q/-6gM==*^i.,$ JP Ν mBڧw+<W8]\߮i'<$ m Ex^D
`F:aJzhu Zui6 OR;c.moBo ӯiwЎ Adxs7) Ewm23 AST%1K z )C_7-qWd3Rm"垧ܭñ% `z}Y#k[xD}a~5 #լ&_?Ə6op~һ1(0| B#p UX_9ᵂK,OSU ̱ى՝1 :,O&W&w_Bfᕸ*GPk?m_s[M4HpdP0qYm! d
v; (bNP■ނ{m=QǕI=?JЖ4=w:z9AamͨX8>Q8 } :tF8m*|}( j<W0 Y5=<|Hy}"숭 QGC}XYkVbog BCr6.U&qqo{9GR@ƺ
p5MP٤Rw]S)_tl3{wǞ]% i> %]_l ]ZM _t+F3N)1JN'YEVF&=kih\p
{1G w*æz5KX+t
.YpOjƽ{3̝2Qֺa94ԍF T'/VJ n9/+kuc% D Úo3YA
p=~n:T8ٚFMs5M@)優sW" t0r9+
KH،<C&S1ZM
Y H jR˺=+32GA[Uq (dYLd0:ⱒCx7mKuK@m?cE$x ,NzTv5#ma\ n]^\\RO<oH$U5-4\ӖePʸݴ 4 vW^M& ,T㧥i7,v8
`zO֜- jo+dR9E\QEEs]S* Zܸ2 ϰTc8 jY.bhݷ[
,ӱgg?I0*֧m#{gtd1{q߾kNE3u ո6א* * ZLZ%SIŤShߘkKw,QEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PU%)k;?(LX}RL{@ q?4 hS SMPu9 "?;[qݜ@ !`rLRT7ZkU]z3n#qwc@V]ƥ/! `b%UQOQ4fYW2
Xdd^ 5[P )5i.5fcTU
7-x
+.;饶 <?yO#WmYd =C=vZL(ǩ,nd`!>5_p eEgO{!Z٨y?뫹btP8< =M _嬉C<뚰O純 6B;hF{Kmb 6s ^(((((((((
^C~b
(#YCS Vi E(AK?
JX?IRc,E( JZ((((((((((((((((((((( R߇ -: eQT ( ( uQUQ@sڥȼi6f| GE$xAg%%hQwİѪObiڃH N cy+q4:?o :.tk26l`S 0zRHUg?~\
=m][Gw[HV[Ai(mFH/ֱ#N[jȥ' ` ~SM r
R.f0c'ƓTFM0& |wϥt yhA NH> SbEc 1 ?Tmm,/$*%Vb300=k(D * : zVL%&i -ϵ Uvh <T * "PH1c㿭tW۵Q>\qKӕB32T rSm5҉x0sw7 M&hY:1U
?N=7P=VByqfl Ak#kW _~D R@=;&kafk$t !i{o . Jd]f {vk bX }N U: 4T5XZ}:$bX/*,<SSNjMk%r';D[6dbI {kNKf0;oAI>VmQ/sgm]_Z&ټFI s,u֘ya ;xך6X ˗d^
)jKeZս2$R dp>QϽ2YkgRb rvӀaFg%V{ PsIIo`ՑtL
խCC:w En Rr_s7Vl e<f:pdʢD.|203MuԁUFM+6+Oy
ɝӒ jTaz& 7H7c
ttW7r94ReuHfAj0>+t`Hp H@a }N~ i2ߨ"BxݓFj-;PL[ʒ@$ 2 +*Q f jo&벥<55ioj1hFBI q Ht#Zs.}*VyU1\UH4d< mv&G2{kfdpKeRGg y !e kn\ڶ>M,E<^c+3A/12,zUE+as[ Ԓr~鴐3Ԟ#omXWN>t2p &iUxPҩI-lKz\-0j6 |'5jl%)" ؒ1ūڃO4|n95324U
ǭuaI1)<8J}ŬW>Y?q"t26r 3l%o`,ÙNd .ߥh7 Ί?Έ %ڋRs54_9nXNi
6Ҷ\9<g8hc f6!=zۋx{ys*MnJbZk t&9⺆L#Gj ▲o[4B
6;Qo*HI .rkN|&F .>tU֖jG#\-bҬZK=V$YGuԞkSI65G .{ڷ 0KM, F67K si&p@ܬ/`cHA, G8{3 tK(' '",Ӆ
" 1tz@v}hsOt
l-?U? 6Yc,.&;cV=Wޤ 0 G #]"i<x\wurꈠ@Vr]C DGy OVKzXQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@W v?X߇ PYp ZŭJ`ei| '@- )s*[fVF MKh#*2~~g zc`r9:~Ur 8-ѣe[cÚa;:' fʑ
*!QS]%C%3""T#Ҧ
yMT:X岈@RFAaTJr`c$g AdmBxS\$k>I.4F=8ᵋlK?5@] +Hj Ղ%z(f*Z5STֵ)apQ}GJ X.ZOfh:Ge8 bhREE%,^IǿZ ʽ5TgO*Φ F+ an
XN5,:9PjW Fhp8 6"{-? 5PZ-#sSC1E`J >,Ī%zz}iQIǞqI P9c H#*p@=) PC ;Ƹ2 'SPEPEPEPEPEPEPEP{
Uw
@Q@! V)4Պh hb?(AK?
Jdl#];v̛y 2o
@OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OEAM < G7 Dž OP\ oM < QLd :(QE QEYU}*H((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((( ǻ~ άT3xYGZ tEASRPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP{
:UnHp!^YZ( Vi ՚d?4QE1 (AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
(+/|JU>?ϥ\R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- R@ E- ̼~o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(m >o՚(48OZ()՚d?>ofM-QLG(AK?
JX?IRc,E(ɧY{(,u98zAޥљ3?Mn$QEQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ?OP\ o(Q@Q@e Xj ?R_*FR ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רsnZ5 * z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רоڴj -: z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ woZz?O@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ רsnZ5 * z> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^BjѨ.Է ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@ ףzE R ^ Kz> P/ ^@sCc楇X ƒ bZ((AK?
JX?IRc,ER/SO@Yc{Rs)
!\' >g55->[!lSͿ8=Er Ռ
~joE|S8A >O? ބBI-OC#űjd`1iݻ3±iSO`) ( Ƹ䳽]EI<jZ1!??@J%EpmW= _jKG{$)c =v-ST5; AۉVv1 p{sޟ4HW ,Ak[[y. PN1[ >YFd;v3] | 댃JK!'ǵ$Ji+8w9c 4nDz'\k{DHZ o[-*c,֮#Eq܀Ps$m+sP]{ %NG<tm@j<6W O?WҮ@S
qK`~Q\}~sz{՛bHuzcu@O?Җ][Y @o< J ([b;{w<lOr?QQ\#pNQEaj:AP]cfP Z(ѣ x> (fWS}:$s9@'< ia kX NӦt\ޡ|NQK"v~?,~4F5Weܬ4Q\ڝzR)p3:URUHWy#4ErZi A?.j_6u4EPEPEPEPP\ o? 2(QE QEF_+ _*FQE QE QE QE QE QE QUo&{kI#јg@ Z3Y7tPF~\ܞynj$%Y' TLgDr{vF3@ E z Zcc')^=e q EgZ_6f3 ~T7vh$pN>xC]Q=ʷ7F%QGր;A ҝX ݵ 2r ( ( ( ( ( ( # ]'T * (((((((((((((((((((((NLXTdrA Џz{]<ߏ~/XZ wC$*GIF`H4 +ukMV5B l sҺ <IfPnr 4 ) PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPEPEPEPEPEPEk:t9 0:* 6-T {r~uZ e_ X : ߢY/MOc\2>e' ÚYU%1]' u4W[Z wI1/-g769Bv,QE QE QE QE QE QE QE QE *t SEPEp&"
lW? W1c;_ ֙j Ecg:²G,3H>Q\H1. G ZR29n (-~Zi?b Z{}5tKI Nsx J (1u ;T*^78>_9XyaJ\` {Ǭ͞mk{p,'h >FU($B QXN&#@bUNCu8 +b
+[H23閮
sYZL\IeF N;
\/?/m F;:A sڠ`0ZH"-cڸMK{I4C'9!z (
?OPGO 袊 ( ( ( (#^UHbDS%Qw>Vy = G
\up mzUz[Xl 9h'W~$ =1Ŗ}Q
ޟV?ʀ:+;QK; :|ǥr6&RYH >6pq;+ Hd;Vf\^A vv :JGr`{z{P]ͯCuTzK]
vib{l9=@ 2rs('~r3 5ͮߋ ?ր= &r+2HsYVzڍ^kY r# wW5 HzR :qwkB;iP]NBpzYEp˨Yȵ2 k-lܒʀqq-<j/S}Smnb6' > "H]@3^[[ȑM VAVk̵KUnI6F@ ^a
܂F^}Q@Q@Q@AsS?[t=Q@Q@Q@Q@Q@GTf-"AsN[m7 >Vs{@ _ Vty;O j<ÑG:73\[Xgd#֕-J>QT4 P qO_((((
7CRIM-QLG(AK?
JX?IRc, Fu)l3 @[ ?Ti'˳^\ s_Vnn
ǒv'S?gqON=+ ߿ʹ
~ i&)N3G<8Py# Z(mRERQEO4ڄd T8-) ?c), {DQJ3w+~
8ܯT
s71
9b`wē ~MdlBm 9 Ooikg bJ^@6˴1j]!O:},[KK^ g 뚡j1liEm!R>i.t8>#> %VɿjF{?TVw[ڪAVֵV.W͓N9]^4 VG_F#[aĖT2O?uuA:F*,?I=yy@ ݨ]8_<*RǠFj+ ]: n'Ğ)[yyFmn=GN $?!L lB'o:: knde[B: &O~1bU x^ C-Ρ40ݻ VY 0ϋ\Ry29 ~ @1i]m:j_mu0 [uǰq]Mݕ~Un v Tmt-:Q2!fSXҀ2x`Db:SN./a;vΚm 7)|}99V՞c`Kt(9ɶ@ lqhE(|)sm=룻Ѭ/eCi ,g }sϯ@:$W<dzf;XڦH ?hi67O p8?*{K[1ڠ@z'hl͈/&w"ִtķ2$` 9$
2yLRNHS
ӂ X6@(z(
(
(
(
K~ Χ.ԷQEP((
2 5X 5R0( ( ( ( ( ( n #Wo=2( q@ T P|a54Fm"QQ4`ӥ#ǘ+r}+;Ou]'Qo!<v8'rcG#h
[{BI9$'8 UA4[[̌wc}[JME9{ qyحm& _{MB1{s@ |}k ( k[_*xy/Z4zH:܅8 :F* U _U-.-Od(Tt`z OxD T<9e~ҴUqq ƯD 7< kZ?s_* QE QE QE QE QE QE *t @E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QEM (U q\k9g6 G͟ 8;t,& tr3ngP6%̰/W9f<㎸'W5;[K [Jzszm-1:gNk/Pu4&B1rrh}k yUCOl#G,.$u QjTHN 68 T F+5y` NHkItj}V)ma@=1嚱yjV:Zb,߮G ݭkWf8^\ޙ-ѹˌtc1>
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.Էz(
(
(
(
(
(
(
(
5n r>wx=V NZ?9=:P1ȓudZZe=ɴRvrD2>/y} ->z~5Y5[Ww?'<S}HNNFqw }ִ᷒uH~% @c5bOH֞T%8 / sҀ0MRKy#Kg3C]2bIJ. +5}6Hس@=EvWi}lQn P(
(
(
(
(
(
(
( t S z *ĭ , MQM(S(.&K쐉cqUI!2H ǞAW5tg.<G~uZm3쬌%B?Oj =בc.꩷#\z⟪
ScHI`x@˿/Ë >=UFA dy=!ՋT[G# BHr Y2ǿ 7s |6Ƌ'Ui<Ĺ% $:cַY ZMy.
ۂPH$,*02۩'<$]i<2μ Y\96([\K UkM
l-U($q
GGյ{$W@aӀ=j4
]i xB:dUxIAm }
j9 {Uy/"1oOր: n?9&zr\1ݏAYvm)˙ ^}gA߈nV|Xȟ =(f.mnxHϧ< CP4u Sm'?t+ُHs [\/?/m F2^qi"4帉Ҁ="_
YaŽKL YOq(t S z(
(
(
Cq֖<P,E) (ᕝ*A1i-֧5WH n <qTญ--!ẰO @yjCi4J\FF@5P~C1%s3GԒMUd*DYO kUD%.T\sz~d>vC
*ppGoƕr:!$wjm+WM{t@?֍SWR"dGL :DFol=wQ/Y㙠ifPI۵u" < V\VqZ Vi, * ڀ9шB1ə WR+ny7-;lg qwϭrv˛y</ ~ $f,{n eEa6MrsA gQDf|,ѶH7G鮦#')%}Ĭ 7:~T 0; V/p?qi%e\lku
&6I ?=eA>I=>l(u+h1YcU} d s amgoJc8`=ѦKnLl17'JԷkre?:n8f \Goj6cؤ{t, _ WǼ/PH9rIA'
@ j`RP ʀ35 \}*?E;K̶1@?y ZKՌO+C Ҁ*xBkğ u#] QE QE QE ?OP\ oQE QE QE QE QE pZ' [4fB0Â }Ee1i/1"T{w5ƹiIc~gK-ʹ1,rIf` F[stMFH̎eU8 +wsH(@_b
Yé?i $##o=+װt2B)9 ayjڔy9ڳtkmf[= {G[S=Bl;ȭ) q;K4ĒáVvVk%SnsV ( ( ( (4 CS@KES(AK?
JX?IRc,E*bND r*i ]2/c&ޣ *Z)JQHaEPEPEPF(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
K~ Χ.ԷQEP((
2 5X 5R0( ( ( ( ( ( ( ( (^F$5QE b( ( ( ( ( ( ( ( ( # ]'T * ((((((((((((((((((((((QE QE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ '( ( ( ( ( ( ( ( QYAe}
IE 5s* XOԔP` Z((((((((((# ]'T *
(
[ŏ*5\g@Z f, pq]N#(](E'q#^GԔPRC˶dWd~r`pFy(-PYUԫAҗP6&Iu֜ - SvA#Ө(((t S z(
(
(
(
[[,%uP
+XTg.ђQ@1E)rrp1$)q梶ӑgRE #"G䲂8Ǧ*J(B0:(1
"
:Nwo1E 1$\ fDm@{qO#<틿݁}jJ(h\HT g u%PEPEPEPEPEPP\ o? OEPEPEPEPEPh P8ҕ
<iP4BF$G*C f lzRGPUQ} ?J ( ( ( ( ( y?$?-4 E(AK?
JX?IRc,E( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( * -: R߇QEB
(
((cՏ TТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4* I*_Jjsqր4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B R߇e k=-ڀ4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ,OTv\v}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4* I*_Jjsqր4 Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
K~ Ϋ}Ҙsj ӢG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(B/_ e k
+?~}Ҁ4( Q_J ТG(ןCT2c榇X(#(ALÆ,Scs7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AFf )Ps7 AMa# aRQ@Q@((
2 5Y 5R0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ h ( ((((((((((((((((((((((((((((((((((((((((((((ST Ꚁ%( ( ( ( ( ( ( ( ( ( Z J)i( ( Z J(
(
(
(
(
("OT¥((((((((((((OT%( ( ( ( ( ( ( ( ( ( ( ( ( ( Z J(
(
(
(
MRS j (((((*)<Q}X%A{guLc@Rn]r3@ EPEPEPEPEPKia V).X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөVU7WpJ-g_ʵkb5KNP $g e:,cm3Ym:6& Szi 9+5H%: ݀=j &NF|-\ ,E\ g +AypY 2NFQ$֙YnRA9(YQ /bߞwg>/#k')r 0{yW03a#8G4ׂNhQ-SK Еu;}
( ( ( ( ( ( ( ( ( ( ( ( ( ( k-D_ jV6s7E:
U/m-!QNhFőX9
E_ᵶxQo+RKp
&>YܱDy h
s vڕ#g⦿Z,bqީxb' xJ1[!WB L
c<-cyp7 ơWkmbpu ]u0?NᑺV1hKMԒ]JkJOķj @I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@E?j) 5 KEP/ꐭpNG\z)5-I0b)zԲ_D͵ab
MwkE"NHcր2W7ZWI%8yJ>ͧ; [t5ՍvEvwuڤ$WL B< lm`tܪv^ynNNkB;.!u xPm ⱧQPULqd ''֟a}80壕b4m(e1sQ꺄$1
*燿 B5OH`4# cϨ2Ié; ;l#hIq3zJJ=5m+ma-, q4^C}u[Et`H6\T `Կ$ ɺںSogӿ Ȕtnf3Jb =*k?u?AX~{/9o^>.D]ie*Oj Yjo/Xc uG_^ ^Ւv%nWS\Ǥũ`>k# A,?ʀ:}Jll' ǥcBuK hbGLwn<נ<Aa/ټ搘PK UUn*6Uwӊ g{ oݽ5A-YI-ɏ~Mu"y)]e(ʏr{ aw/~\86+E{Bg
? }id_9}:PIq,W1M+Hѫ k9#f drpǠ ֬ ݥ+ ccΚecȻR7|z Pv7hS V
YyRXy0 9LmtMrXt<!5h \ @(Ccn w'UϽ.ל#'=}?T͞Vg勏q
h@OIu|Zm|Cd(bտmn4KF e
PٓH{rܾe!؈bس '*?ttqҰ.$)LAqS1
dZLVRI `zek0A;߷=r6=Ic !}C &6h ?ֿRI
Lp"j&X29swWvtx!0|O=ҹ ]eӑ\JXpFqқXGzeep `}h dt^X5ymc{e (8 _֚ cClHPpG@#n 5*襂uϵi\=՜W ' +V ֒Yl2'(.G]sҖ OMHu
8o
ܒI:0E QE QE QE QE QE QE TI
OPV+f IZאwC(w\t4֣ bȬ "E<jeisYԕ) y?GU[}XӬX< _W;mJN3qZWwJZ@ cxb' xJ1ؽ6yGeC;4-(BI ƳS i Z'֯|l,D X*}Ou
vq{v~X <VdY %! {aZ4VÈ@ $S<Q?Vowfo>w$ Ub } Ds;m]S(_kP&n ?ugu \\t= ֹ]z\BѤk+2JuHneB]8 :
$$2JTu$VDWZح%Ǩ*ͥݮnZ<!Nk aĞ\|F@ ڈ:Ѭ^jVTrUuǟV P(M?TZ9u&p OVuka |2<ۏZ5Z[Ig<m g@.Mw,K}qYrjs\Io 3?u>thuOkVЋHP90flPMjCP!HkkJk.{{TÕךc;>231ٻ}8 ?QV+8;
qpw16<$N+vjj%\p #jBs@MifՆ
^C?@g[Ķ6ZͤpH4}lKub[+6r? ڕ1 qiu_YGtx ĊTy&20 5q} B4ڵԷRZqbp3ս3RzȯXk uiN.Yd8zZ%inV#e:f7h ( ( *) 5KQOZ(
(
(
(
(#TBGӼgqh@=T]] iz!_WiI&`YjVG_qު+,[-,L[FeԬC!8q5h:4\b@J oe${-ӧN=+ CСu%1Ύ~oQ-[fV Lc}
{IoL/ L# ca=ڨ/OHǩ ޮVET( ( ( ( u?,?%4 E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөW*j: b WUE svWSjwC hv=>=_NRێ%,[E rm6ztVL1a2=:H~Lcb<N+9^m ?g9 :LqlYKaٸwiq&ktV r88lE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ¥k-c^\}wa>^[P5o&k
=WuyoR u%20sg KW^AA n`NKM{k{m jX'v pN;(F #]ry3Pu3Y&;Rk14+4Qڶ袀
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
(
MRS j (
V(k1vqܓɫW=;ҴcN?F-D4a5ZlQ.HI#QO VF(:$^Fh- d۩#nj mfO/GT\pr1Ҷ@8MdG 4ihpE%`2q :o~'rYP͒y8^)UZ ,n]. C Vn%YzU"d77Ά+HqM~qP,_eϑ$8Eݏu > b@fqǭ>9_:_-cX`QVH[lq'ZIe @N_O,V)=YǩMof%JL20=pkpH O Ѕgk6yO"Fc`@I]CH$P{@0ǩ? ruXjIBrUCRm.G>i# a[x4Վ4" >^[ZE( 9-&FKðe $@ "Wl
<8Jnt4L+ ] :P>.-
-! ?ҪsksXGdb uG
5Q;.}(&(ZS{ss[@d 7 Fe[씃-~ u*m# 4\ulP cO6[ڸwtتҺN%mʠ P ` $Z$68ĒypU}$w:Cnw vf#s@ rw,`fxTj7ѱ [b(
✪0(h ?ֿRI
1)fflv8}Yj6F-V -v:(/PkIG:W=@jzmK;
ڹK.0@ j s6Zj6Q*89 SPH<5@ Z}ǩ&
c #qߎ9tcg, _$` &(MSX k-٢ lºp)h(((((((OT%}r ˛/.7r b ֭b5-[.Fz Q@ éj0<!m b?U-JO2tKYvf8=OCgqwZÖ- u+r )CF`Z(M_HWFI1@}G՛M f?%pzh^95-ŰfUز }+gLϲKbAa'__\no::Y\NY`nra}ZcnrXq~Q@U沚Yр U(|PN]WuXjz93nB3QE ci670&l x'ۭ@:c x'߽kQ@ ΥB 8oߩV4UFHA(Bꐴp;.qs[-}eDBr:r;f@cyl1x@#[GN kr8=XեE sChK
hr*O UR}{4(((ST Ꚁ%( ( ( ( ( GCuB ?tu;[ ֵuKZ)n;jKڢxrID͘
=2**ܶvM)7w 5 z|֥φ> WZ#si]E63JtXywq >L {Wtmbfw BzH=ECEtQEH((((
_R]KM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TI
OPQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE ꚥ T-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE TS jSPQE QE QE QE QE VI)#mkD6=DZP; ;Ktaml=ٻ5E#9gE|CY$ZfYmHaX(Q@Q@Q@Q@.X Ɩ bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬ )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >O~ ʝK =?AQ,r c' h*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( S ?;ʗz~92Y=1@(yR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPSlj!~F2q֥ L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( IOS*%C#d XK =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OPyR OQK =?A@K =?AG/ >g/ T )TyR OP) ޝK =?AQM , S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<( L ʗz~ E3ʗz~*_
}*_
<(S<(
_S.n) E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE A ??ʧ# ]'T QE QE QE QE QE QE QE QE QE QE QE QE T z? OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEPEPEPEPEPEPEPEPEPEPEPEPEPi! V)o?X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةSI:;
Vs$ $gh_ =@ &Fq\S;GN,M9kN֞d7|g z5&GJ/ns )oR`ՍKE[ #{n#; vf]bv vQsh/dh- 8 <PoJ \>uioE#526p3Kg_-ð9SO'($O}uiN~ ҷ448 |;:s@QE QE QE QE QE QE QE QE QE QE QE QE QE *t @rI HdI%G$Q̆9T2@WZح%Ǩ+rX`p"9ʺ sykfdX\i:mT}0Wg#Y6~pp tՋV|m3Ҷ\K hC,))ޡ
1 zTs_S)V`@[
YD`x -o]e fjZztJL!ڈ:k4W'nyof g; ?W=y<!eB-0TV ,w`0npkl t$n= GcI5ٰ89 =m3*f8kQW3 Q9'5KD uS4ήu]>
= tF-Jό e=gKY1`iFBƹ8$SY[\ Z}\͒ ޣnȤ }Gm-n v2wp;/WFt2 <9}@ Dr$ %W[[Gn| \
@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[t=Q@ @@E:3 qIjO'5s) U5fmj27?mf7CmëNJ :ڵ+o_ǎpq/>˧; [:&SlЈw^zT#hUUcgsmeShnNNqW㹻Ig[0
FN:4s3]j1
vĞZ~M87Wg G H УJKd˒19mF䑢!K;^E] Fh8' yI"Hu7ucmm 9Hq4"_5ҨR@'YvTq V Ե ?i
֭sm
с"@ ? Y7_?w_ڽ0~]?vJ %7Wv3X:OJ}ZvA7Z~} 9o^>.D]iy,A%A@::5a} ~ _w%nO}+xtoÒF`>k# Cؑ@ FxR\ ǥcBu[ XbI qy sUK_9&x"IbOҬjȦY%*.BSwE$Xno-YI5ɏ~߾k6&u)`V<FxMHt)FX!
qܾ\93Ln^ж~^; V~|58w♦ }dx@ &%ı]E4!f\?ֳ=JmE젽vH2> U,OovĬm3#\ ucN]crJ^AD=XPX_-9T
|I&98#v`:S=+>[]9-/'fܾV@Ks$ձ !
'@ EQ@Sݮ'8O`*fXK iڝ͞VgˏqV >f,i/&_!
]}OoʛiQYe?B?ƀ4M `z+!܈bس .<J.sw\߄f1 63{ mO[e3 N~^[&s
I!|LrB& i1w\sk Σ l@tQE A ??ʧ# ]'T Rdڳ]@3v;}+:46Ɣ&7שO="\~\iQ,F@? u;EQ)W
w? vD 29VX5mnG VkAjHP@#?Z p1T D,8^}OO{($ 3H +N ƒYlt2'(.G]tچ)ktPKF0$W]#YF t (
(
(
(
(
(
(
?OPGO Vs7EROAW*>])Ԏ1Zԡ]Y +BX)S+O-GVfj) W _5[}YӬX< 4!.cS0F
kNPRnd
qV/x ~Fom-g$vU8,"#үQ[P09Yjy8? S3 y[/HOP]7W{Ym,|vp}:VcYA %%#O\'<``q:mb e]*O\fiPOҹoZZfE+, ִFXi\ B)voE6 ] U#cqm
+TNk3]=hHC$GRN {}f+KVt vjWvE- 8 =9x`p"9ʀ5MA"y \UP՞TIlJ+0 ?7[(>[,aO$wU'#Dm@
T PWYia |2<ۏzӬ}^K+$i6208,]݂]:zV_ @ } u-ἴz@ͩI*I"[/"F!T N qZ9>ltlГ2;; VZS[lHI.qURTO199
Aoh5IyݭѶJ M0H=
#ufU
p~~;gHd. bϦ rCnz7C@/5ic&ysSE$fd 05%L_v7^r[ 51O8Ьj~ugz{ngӟf+X[k kOm'؝"]䳰f8 ηt{f{[UF7Z ( ( ( * -: R߇ 袊 ( ( ( ( ( ( ( ( ( ( ( ( y?$?-4 E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةW4jw#@o!0G9 4Y
7DE.ӑޞ ̊]n v u
:m2<":gKME ʸ*~ ]&z>XTG I$_Zwk}iR10vș WGE ` Z\),8iVWLViK!9<[P7#wS$A)|m<Sk&1Fؔ WCE QE QE QE QE QE QE QE QE QE QE QE QE QE *t @E;וvG__Ү_I ϻb(+K8&KZRÐx zVj
Feې ŻӯC[Mwv+:{ֵ^^;XЏP=4ڌk P ڭkZY=Ū2rwt~ A rL 絛mB-D0<('9 ԉsF#EP0 u ~Q@ɨȒ(ۑ=Aڰn-u_i/G \ ;ƺ(Xu[E3pqǦ}i&v$WnER2q~E qt:ΝXUYˮSi+n̿p!?ֵkTUb k2'ޛݴK z"(_ Fv9r8>5PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\ o? OEP=E -f"P;qZc +QG
Z} qz.mwb&s +85ƱiĤF<8#HljzCƒ
(af9ڥEt\s{CCuq'壪.89+h :wh }Ccf9.m
(&6Kdsq3;HS. rO# WOk"7 pr3'ekurqnKԳ ZL9v4~_nk]3g(kk^Xwc j>D \( N985K_˱cX`jgO r DV,H i<ǫ2FrzieַdIV -(ԃuҠӥ cx@ ?!Y͞Sȑ8#{ 5<i"C)FE 0@1q rzuăVHw2ە6# 4|~ƀP98ր+[ kHD qaiv~ b0y=9E.y#z]iƚlFY}Tu vأΡK.!ђ` zfsisXGdb mk
5cD>}{ym[E)f
Ods[U\2 ߝX+K)noc,FNM*az kλ`x2c~Ե9$p(=%mʊ $Z 8T?CsVM\
b$tl J5cE'' r`^>$큚 ( *4w:'tlb )Q(m=9QPa ڀ EP z?O@B;|GF?Z˼MgR6j $lv_E qZM3l~]Wr-SX;{`۱bl b |օ sw6ZV1*H~_{kI5 q'' >Q "=QY0n|9~:K 9` \#g]U\F, 8+
PEPEPEPEPEPEPEPPGO I T=bk^K30 /G|VɭZ!{_u ;!@PS#=] ʼ:sB?YhWT g # >
ޫh3oY#u {
ޢ
(0Ags}fZ# p֍Ij3zQ@ :evsr}Iv 1Xcny[wduu+r Ԅ^i[݀5qIWP}sea𮮊 *O=2Ό{W( * m`v T]Krۯҷ5 fcX^p9{( 9,[^/-:ۯN!Ku1-;-V\ŪF;y%' ں{^2ؔ Gl֍\Z_ A:= w?kZNwjs z[4P+:$ۋyza*Oc\,NG?ջE QE QE QE ?OP\ oQE QE QE QE QE QE QE QE QE QE QE QE QE Q ƒ bHՊh hb?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE QE T z?~ ʀ'( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( .ԷzK~ '( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( I U=A ?SEPEPEPEPEPEPEPEPEPEPEPEPPGO I* ((((((((((((((((((( R߇ -: (((((((((((((
7CS?S@KES(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeU{2UϳCX գR2Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} 4?M f>SG١jz(Ch w4} ) ie"V.Է?4QE1 (AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP =F {VH((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((.Է?X R߇ E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP =FYdY7Z_2 J4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX
+;̹Q\(4Vws̹Q`4h2 GshYeϯ?2 EѢ˟_ eϯ?Egy>
<˟_F.}Ay>
,\(.}AX W?[u^ b;x5$k 4 $)(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP0( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (QE QE | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/img/add.png | PNG
IHDR X
"IDATx^MnWEGdeQ A rdiQ"f yV Y cK
,D3+gE'j?Ph\_;%U) K fqZ[wcez3R ͜ZGKGżIʿ>y W;iYu0cur/EXw9N"botC A[n}ItN^ˇX>R"sT D9ClB{)[8yLK TR]dƳHprL7G? BFtD|4:oV:fӈԬ`T#N^|ƳXd~vv+9>> .fOE/6Wsz*YX<G0:[|0:w6R4 cG
-hADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G K ںnL>7?4 %sqZ-;~|ن+Hskw +7k؉Hrb?w
mE{u4 9 = N؝ p pAZtwR#ݻ;! ȑF WϤɄ!$r;H}"m,49??L KI O Nx(/ __A:Z #yu#W .=Jn@& 4*֑ Աu\ F:@:ΞK@ҨXXGRsiR H A:{.M AJba H [gϥ HiT,#c4)u$ ul=& Q4*֑ Աu\6lw)Br Eȏg|mƐr({nv$R R5@>kz7oç Hdi F;o6vg/\.+ _\a K!4
9&)o<y HI2H)[] s6i䝿x $;iw ˒M #o};ț;}\ge). wwz_ :i>;ƛGTҌmulh<rs=?B!D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G ڝ^`BFi5OB`(TPr{{)}^G'd TPt{;nW09~|_vh!H}
FU=AC4A*j.s6:oVڎA
om)kTc sBǫ7)
^ir\ ץRDW_"b7E|zSHN At=wOV?ډ_w<N9y2
<Yvj;cu}*" IENDB` | PNG
IHDR X
"IDATx^MnWEGdeQ A rdiQ"f yV Y cK
,D3+gE'j?Ph\_;%U) K fqZ[wcez3R ͜ZGKGżIʿ>y W;iYu0cur/EXw9N"botC A[n}ItN^ˇX>R"sT D9ClB{)[8yLK TR]dƳHprL7G? BFtD|4:oV:fӈԬ`T#N^|ƳXd~vv+9>> .fOE/6Wsz*YX<G0:[|0:w6R4 cG
-hADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G K ںnL>7?4 %sqZ-;~|ن+Hskw +7k؉Hrb?w
mE{u4 9 = N؝ p pAZtwR#ݻ;! ȑF WϤɄ!$r;H}"m,49??L KI O Nx(/ __A:Z #yu#W .=Jn@& 4*֑ Աu\ F:@:ΞK@ҨXXGRsiR H A:{.M AJba H [gϥ HiT,#c4)u$ ul=& Q4*֑ Աu\6lw)Br Eȏg|mƐr({nv$R R5@>kz7oç Hdi F;o6vg/\.+ _\a K!4
9&)o<y HI2H)[] s6i䝿x $;iw ˒M #o};ț;}\ge). wwz_ :i>;ƛGTҌmulh<rs=?B!D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G D,ADq By AĂDh G ڝ^`BFi5OB`(TPr{{)}^G'd TPt{;nW09~|_vh!H}
FU=AC4A*j.s6:oVڎA
om)kTc sBǫ7)
^ir\ ץRDW_"b7E|zSHN At=wOV?ډ_w<N9y2
<Yvj;cu}*" IENDB` | -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo;
import com.google.common.base.Strings;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean;
import com.google.common.base.Charsets;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class XmlApplication {
public static void main(String[] args) throws IOException {
ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
XmlBean xmlBean = context.getBean(XmlBean.class);
System.out.println("XmlApplication Demo. Input any key except quit to print the values. Input quit to exit.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (!Strings.isNullOrEmpty(input) && input.trim().equalsIgnoreCase("quit")) {
System.exit(0);
}
System.out.println(xmlBean.toString());
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo;
import com.google.common.base.Strings;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean;
import com.google.common.base.Charsets;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class XmlApplication {
public static void main(String[] args) throws IOException {
ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
XmlBean xmlBean = context.getBean(XmlBean.class);
System.out.println("XmlApplication Demo. Input any key except quit to print the values. Input quit to exit.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (!Strings.isNullOrEmpty(input) && input.trim().equalsIgnoreCase("quit")) {
System.exit(0);
}
System.out.println(xmlBean.toString());
}
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/application.yml | #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring:
application:
name: apollo-portal
profiles:
active: ${apollo_profile}
jpa:
properties:
hibernate:
query:
plan_cache_max_size: 192 # limit query plan cache max size
session:
store-type: jdbc
jdbc:
initialize-schema: never
server:
port: 8070
compression:
enabled: true
tomcat:
use-relative-redirects: true
logging:
file:
name: /opt/logs/100003173/apollo-portal.log
management:
health:
status:
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP
ldap:
enabled: false # disable ldap health check by default
| #
# Copyright 2021 Apollo Authors
#
# 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.
#
spring:
application:
name: apollo-portal
profiles:
active: ${apollo_profile}
jpa:
properties:
hibernate:
query:
plan_cache_max_size: 192 # limit query plan cache max size
session:
store-type: jdbc
jdbc:
initialize-schema: never
server:
port: 8070
compression:
enabled: true
tomcat:
use-relative-redirects: true
logging:
file:
name: /opt/logs/100003173/apollo-portal.log
management:
health:
status:
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP
ldap:
enabled: false # disable ldap health check by default
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/Role.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "Role")
@SQLDelete(sql = "Update Role set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Role extends BaseEntity {
@Column(name = "RoleName", nullable = false)
private String roleName;
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "Role")
@SQLDelete(sql = "Update Role set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Role extends BaseEntity {
@Column(name = "RoleName", nullable = false)
private String roleName;
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/README.md | # 使用方法
> Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的[Helm Chart部署模式](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_241-%e5%9f%ba%e4%ba%8ekubernetes%e5%8e%9f%e7%94%9f%e6%9c%8d%e5%8a%a1%e5%8f%91%e7%8e%b0)，由于不再使用内置的Eureka，所以在整体部署上有很大简化，如无特殊需求，建议使用该模式部署。
## 1. 创建数据库
具体步骤请参考 [2.1 创建数据库](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_21-%e5%88%9b%e5%bb%ba%e6%95%b0%e6%8d%ae%e5%ba%93)，需要注意的是 ApolloPortalDB 只需要在生产环境部署一个即可，而 ApolloConfigDB 需要在每个环境部署一套，示例假设你的 apollo 开启了 4 个环境, 即 dev、fat、uat、prod，那么就需要创建 4 个 ApolloConfigDB。
## 2. 调整部署配置
### 2.1 ApolloConfigDB 数据库连接信息
以 dev 环境为例，需要修改：
1. `apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`spring.datasource.url`，`spring.datasource.username`和`spring.datasource.password`配置
2. `apollo-env-dev/service-mysql-for-apollo-dev-env.yaml`中 mysql endpoint 地址信息
### 2.2 eureka.service.url
以 dev 环境为例，默认是以 replica 为 3 做的样例配置，如果 replica 数量改变了，那么也要对应修改`apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`eureka.service.url`配置。
如果该配置希望以数据库中为准，那么在 yaml 中直接删除该配置项即可。
### 2.3 ApolloPortalDB 数据库连接信息
1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`spring.datasource.url`，`spring.datasource.username`和`spring.datasource.password`配置
2. 修改`service-apollo-portal-server.yaml`中 mysql endpoint 地址信息
### 2.4 ApolloPortal 的环境信息
1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`apollo.portal.envs`配置
* 如果该配置希望以数据库中为准，那么在 yaml 中直接删除该配置项即可。
2. 修改`service-apollo-portal-server.yaml`中`apollo-env.properties`的各环境 meta server 地址信息
## 3. Deploy apollo on kubernetes
示例假设 apollo 开启了 4 个环境, 即 dev、fat、uat、pro
按照 scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh 文件的内容部署 apollo 即可。
```bash
scripts/apollo-on-kubernetes/kubernetes$ cat kubectl-apply.sh
# create namespace
kubectl create namespace sre
# dev-env
kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \
kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \
kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record
# fat-env
kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \
kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \
kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record
# uat-env
kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \
kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \
kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record
# prod-env
kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \
kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \
kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record
# portal
kubectl apply -f service-apollo-portal-server.yaml --record
```
## 4. 验证所有 pod 处于 Running 并且 READY 状态
```bash
kubectl get pod -n sre -o wide
# 示例结果
NAME READY STATUS RESTARTS AGE IP NODE
deployment-apollo-admin-server-dev-b7bbd657-4d5jx 1/1 Running 0 2d 10.247.4.79 k8s-apollo-node-2
deployment-apollo-admin-server-dev-b7bbd657-lwz5x 1/1 Running 0 2d 10.247.8.7 k8s-apollo-node-3
deployment-apollo-admin-server-dev-b7bbd657-xs4wt 1/1 Running 0 2d 10.247.1.23 k8s-apollo-node-1
deployment-apollo-admin-server-prod-699bbd894f-j977p 1/1 Running 0 2d 10.247.4.83 k8s-apollo-node-2
deployment-apollo-admin-server-prod-699bbd894f-n9m54 1/1 Running 0 2d 10.247.8.11 k8s-apollo-node-3
deployment-apollo-admin-server-prod-699bbd894f-vs56w 1/1 Running 0 2d 10.247.1.27 k8s-apollo-node-1
deployment-apollo-admin-server-uat-7c855cd4f5-9br65 1/1 Running 0 2d 10.247.1.25 k8s-apollo-node-1
deployment-apollo-admin-server-uat-7c855cd4f5-cck5g 1/1 Running 0 2d 10.247.8.9 k8s-apollo-node-3
deployment-apollo-admin-server-uat-7c855cd4f5-x6gt4 1/1 Running 0 2d 10.247.4.81 k8s-apollo-node-2
deployment-apollo-portal-server-6d4bbc879c-bv7cn 1/1 Running 0 2d 10.247.8.12 k8s-apollo-node-3
deployment-apollo-portal-server-6d4bbc879c-c4zrb 1/1 Running 0 2d 10.247.1.28 k8s-apollo-node-1
deployment-apollo-portal-server-6d4bbc879c-qm4mn 1/1 Running 0 2d 10.247.4.84 k8s-apollo-node-2
statefulset-apollo-config-server-dev-0 1/1 Running 0 2d 10.247.8.6 k8s-apollo-node-3
statefulset-apollo-config-server-dev-1 1/1 Running 0 2d 10.247.4.78 k8s-apollo-node-2
statefulset-apollo-config-server-dev-2 1/1 Running 0 2d 10.247.1.22 k8s-apollo-node-1
statefulset-apollo-config-server-prod-0 1/1 Running 0 2d 10.247.8.10 k8s-apollo-node-3
statefulset-apollo-config-server-prod-1 1/1 Running 0 2d 10.247.4.82 k8s-apollo-node-2
statefulset-apollo-config-server-prod-2 1/1 Running 0 2d 10.247.1.26 k8s-apollo-node-1
statefulset-apollo-config-server-uat-0 1/1 Running 0 2d 10.247.8.8 k8s-apollo-node-3
statefulset-apollo-config-server-uat-1 1/1 Running 0 2d 10.247.4.80 k8s-apollo-node-2
statefulset-apollo-config-server-uat-2 1/1 Running 0 2d 10.247.1.24 k8s-apollo-node-1
```
### 2.4 访问 apollo service
- server 端(即 portal) <br/>
kubernetes-master-ip:30001
- client 端, 在 client 端无需再实现负载均衡 <br/>
Dev<br/>
kubernetes-master-ip:30002 <br/>
Fat <br/>
kubernetes-master-ip:30003 <br/>
Uat <br/>
kubernetes-master-ip:30004 <br/>
Prod <br/>
kubernetes-master-ip:30005 <br/>
# FAQ
## 关于 kubernetes yaml 文件
具体内容请查看 `scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml` 注释 <br/>
其他类似。
## 关于 eureka.service.url
使用 meta-server(即 config-server) 的 pod name, config-server 务必使用 statefulset。
格式为：`http://<config server pod名>.<meta server 服务名>:<meta server端口号>/eureka/`。
以 apollo-env-dev 为例:
```bash
('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔')
```
你可以精简 config-server pod 的 name, 示例的长名字是为了更好的阅读与理解。
### 方式一：通过Spring Boot文件 application-github.properties配置（推荐）
推荐此方式配置 `eureka.service.url`，因为可以通过ConfigMap的方式传入容器，无需再修改数据库的字段。
Admin Server的配置：
```yaml
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = root
spring.datasource.password = test
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
```
Config Server的配置：
```yaml
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = root
spring.datasource.password = m6bCdQXa00
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
```
### 方式二：修改数据表 ApolloConfigDB.ServerConfig
修改数据库表 ApolloConfigDB.ServerConfig的 eureka.service.url。
| # 使用方法
> Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的[Helm Chart部署模式](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_241-%e5%9f%ba%e4%ba%8ekubernetes%e5%8e%9f%e7%94%9f%e6%9c%8d%e5%8a%a1%e5%8f%91%e7%8e%b0)，由于不再使用内置的Eureka，所以在整体部署上有很大简化，如无特殊需求，建议使用该模式部署。
## 1. 创建数据库
具体步骤请参考 [2.1 创建数据库](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_21-%e5%88%9b%e5%bb%ba%e6%95%b0%e6%8d%ae%e5%ba%93)，需要注意的是 ApolloPortalDB 只需要在生产环境部署一个即可，而 ApolloConfigDB 需要在每个环境部署一套，示例假设你的 apollo 开启了 4 个环境, 即 dev、fat、uat、prod，那么就需要创建 4 个 ApolloConfigDB。
## 2. 调整部署配置
### 2.1 ApolloConfigDB 数据库连接信息
以 dev 环境为例，需要修改：
1. `apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`spring.datasource.url`，`spring.datasource.username`和`spring.datasource.password`配置
2. `apollo-env-dev/service-mysql-for-apollo-dev-env.yaml`中 mysql endpoint 地址信息
### 2.2 eureka.service.url
以 dev 环境为例，默认是以 replica 为 3 做的样例配置，如果 replica 数量改变了，那么也要对应修改`apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`eureka.service.url`配置。
如果该配置希望以数据库中为准，那么在 yaml 中直接删除该配置项即可。
### 2.3 ApolloPortalDB 数据库连接信息
1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`spring.datasource.url`，`spring.datasource.username`和`spring.datasource.password`配置
2. 修改`service-apollo-portal-server.yaml`中 mysql endpoint 地址信息
### 2.4 ApolloPortal 的环境信息
1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`apollo.portal.envs`配置
* 如果该配置希望以数据库中为准，那么在 yaml 中直接删除该配置项即可。
2. 修改`service-apollo-portal-server.yaml`中`apollo-env.properties`的各环境 meta server 地址信息
## 3. Deploy apollo on kubernetes
示例假设 apollo 开启了 4 个环境, 即 dev、fat、uat、pro
按照 scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh 文件的内容部署 apollo 即可。
```bash
scripts/apollo-on-kubernetes/kubernetes$ cat kubectl-apply.sh
# create namespace
kubectl create namespace sre
# dev-env
kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \
kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \
kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record
# fat-env
kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \
kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \
kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record
# uat-env
kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \
kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \
kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record
# prod-env
kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \
kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \
kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record
# portal
kubectl apply -f service-apollo-portal-server.yaml --record
```
## 4. 验证所有 pod 处于 Running 并且 READY 状态
```bash
kubectl get pod -n sre -o wide
# 示例结果
NAME READY STATUS RESTARTS AGE IP NODE
deployment-apollo-admin-server-dev-b7bbd657-4d5jx 1/1 Running 0 2d 10.247.4.79 k8s-apollo-node-2
deployment-apollo-admin-server-dev-b7bbd657-lwz5x 1/1 Running 0 2d 10.247.8.7 k8s-apollo-node-3
deployment-apollo-admin-server-dev-b7bbd657-xs4wt 1/1 Running 0 2d 10.247.1.23 k8s-apollo-node-1
deployment-apollo-admin-server-prod-699bbd894f-j977p 1/1 Running 0 2d 10.247.4.83 k8s-apollo-node-2
deployment-apollo-admin-server-prod-699bbd894f-n9m54 1/1 Running 0 2d 10.247.8.11 k8s-apollo-node-3
deployment-apollo-admin-server-prod-699bbd894f-vs56w 1/1 Running 0 2d 10.247.1.27 k8s-apollo-node-1
deployment-apollo-admin-server-uat-7c855cd4f5-9br65 1/1 Running 0 2d 10.247.1.25 k8s-apollo-node-1
deployment-apollo-admin-server-uat-7c855cd4f5-cck5g 1/1 Running 0 2d 10.247.8.9 k8s-apollo-node-3
deployment-apollo-admin-server-uat-7c855cd4f5-x6gt4 1/1 Running 0 2d 10.247.4.81 k8s-apollo-node-2
deployment-apollo-portal-server-6d4bbc879c-bv7cn 1/1 Running 0 2d 10.247.8.12 k8s-apollo-node-3
deployment-apollo-portal-server-6d4bbc879c-c4zrb 1/1 Running 0 2d 10.247.1.28 k8s-apollo-node-1
deployment-apollo-portal-server-6d4bbc879c-qm4mn 1/1 Running 0 2d 10.247.4.84 k8s-apollo-node-2
statefulset-apollo-config-server-dev-0 1/1 Running 0 2d 10.247.8.6 k8s-apollo-node-3
statefulset-apollo-config-server-dev-1 1/1 Running 0 2d 10.247.4.78 k8s-apollo-node-2
statefulset-apollo-config-server-dev-2 1/1 Running 0 2d 10.247.1.22 k8s-apollo-node-1
statefulset-apollo-config-server-prod-0 1/1 Running 0 2d 10.247.8.10 k8s-apollo-node-3
statefulset-apollo-config-server-prod-1 1/1 Running 0 2d 10.247.4.82 k8s-apollo-node-2
statefulset-apollo-config-server-prod-2 1/1 Running 0 2d 10.247.1.26 k8s-apollo-node-1
statefulset-apollo-config-server-uat-0 1/1 Running 0 2d 10.247.8.8 k8s-apollo-node-3
statefulset-apollo-config-server-uat-1 1/1 Running 0 2d 10.247.4.80 k8s-apollo-node-2
statefulset-apollo-config-server-uat-2 1/1 Running 0 2d 10.247.1.24 k8s-apollo-node-1
```
### 2.4 访问 apollo service
- server 端(即 portal) <br/>
kubernetes-master-ip:30001
- client 端, 在 client 端无需再实现负载均衡 <br/>
Dev<br/>
kubernetes-master-ip:30002 <br/>
Fat <br/>
kubernetes-master-ip:30003 <br/>
Uat <br/>
kubernetes-master-ip:30004 <br/>
Prod <br/>
kubernetes-master-ip:30005 <br/>
# FAQ
## 关于 kubernetes yaml 文件
具体内容请查看 `scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml` 注释 <br/>
其他类似。
## 关于 eureka.service.url
使用 meta-server(即 config-server) 的 pod name, config-server 务必使用 statefulset。
格式为：`http://<config server pod名>.<meta server 服务名>:<meta server端口号>/eureka/`。
以 apollo-env-dev 为例:
```bash
('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔')
```
你可以精简 config-server pod 的 name, 示例的长名字是为了更好的阅读与理解。
### 方式一：通过Spring Boot文件 application-github.properties配置（推荐）
推荐此方式配置 `eureka.service.url`，因为可以通过ConfigMap的方式传入容器，无需再修改数据库的字段。
Admin Server的配置：
```yaml
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = root
spring.datasource.password = test
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
```
Config Server的配置：
```yaml
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = root
spring.datasource.password = m6bCdQXa00
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
```
### 方式二：修改数据表 ApolloConfigDB.ServerConfig
修改数据库表 ApolloConfigDB.ServerConfig的 eureka.service.url。
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/main/resources/adminservice.properties | #
# Copyright 2021 Apollo Authors
#
# 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.
#
#Used for apollo-assembly
spring.application.name= apollo-adminservice
ctrip.appid= 100003172
server.port= 8090
logging.file.name= /opt/logs/100003172/apollo-adminservice.log
spring.jmx.default-domain = apollo-adminservice
| #
# Copyright 2021 Apollo Authors
#
# 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.
#
#Used for apollo-assembly
spring.application.name= apollo-adminservice
ctrip.appid= 100003172
server.port= 8090
logging.file.name= /opt/logs/100003172/apollo-adminservice.log
spring.jmx.default-domain = apollo-adminservice
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/BizLoggingCustomizer.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.customize;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
@Component
@Profile("ctrip")
public class BizLoggingCustomizer extends LoggingCustomizer{
private final BizConfig bizConfig;
public BizLoggingCustomizer(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
protected String cloggingUrl() {
return bizConfig.cloggingUrl();
}
@Override
protected String cloggingPort() {
return bizConfig.cloggingPort();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.customize;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
@Component
@Profile("ctrip")
public class BizLoggingCustomizer extends LoggingCustomizer{
private final BizConfig bizConfig;
public BizLoggingCustomizer(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
protected String cloggingUrl() {
return bizConfig.cloggingUrl();
}
@Override
protected String cloggingPort() {
return bizConfig.cloggingPort();
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.service.ReleaseHistoryService;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RestController
public class ReleaseHistoryController {
private static final Gson GSON = new Gson();
private Type configurationTypeReference = new TypeToken<Map<String, Object>>() {
}.getType();
private final ReleaseHistoryService releaseHistoryService;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService) {
this.releaseHistoryService = releaseHistoryService;
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(
@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findReleaseHistoriesByNamespace(appId, clusterName,
namespaceName, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByReleaseIdAndOperation(
@RequestParam("releaseId") long releaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByReleaseIdAndOperation(releaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_previous_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByPreviousReleaseIdAndOperation(
@RequestParam("previousReleaseId") long previousReleaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByPreviousReleaseIdAndOperation(previousReleaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
private PageDTO<ReleaseHistoryDTO> transform2PageDTO(Page<ReleaseHistory> releaseHistoriesPage, Pageable pageable){
if (!releaseHistoriesPage.hasContent()) {
return null;
}
List<ReleaseHistory> releaseHistories = releaseHistoriesPage.getContent();
List<ReleaseHistoryDTO> releaseHistoryDTOs = new ArrayList<>(releaseHistories.size());
for (ReleaseHistory releaseHistory : releaseHistories) {
releaseHistoryDTOs.add(transformReleaseHistory2DTO(releaseHistory));
}
return new PageDTO<>(releaseHistoryDTOs, pageable, releaseHistoriesPage.getTotalElements());
}
private ReleaseHistoryDTO transformReleaseHistory2DTO(ReleaseHistory releaseHistory) {
ReleaseHistoryDTO dto = new ReleaseHistoryDTO();
BeanUtils.copyProperties(releaseHistory, dto, "operationContext");
dto.setOperationContext(GSON.fromJson(releaseHistory.getOperationContext(),
configurationTypeReference));
return dto;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.service.ReleaseHistoryService;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RestController
public class ReleaseHistoryController {
private static final Gson GSON = new Gson();
private Type configurationTypeReference = new TypeToken<Map<String, Object>>() {
}.getType();
private final ReleaseHistoryService releaseHistoryService;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService) {
this.releaseHistoryService = releaseHistoryService;
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(
@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findReleaseHistoriesByNamespace(appId, clusterName,
namespaceName, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByReleaseIdAndOperation(
@RequestParam("releaseId") long releaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByReleaseIdAndOperation(releaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_previous_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByPreviousReleaseIdAndOperation(
@RequestParam("previousReleaseId") long previousReleaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByPreviousReleaseIdAndOperation(previousReleaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
private PageDTO<ReleaseHistoryDTO> transform2PageDTO(Page<ReleaseHistory> releaseHistoriesPage, Pageable pageable){
if (!releaseHistoriesPage.hasContent()) {
return null;
}
List<ReleaseHistory> releaseHistories = releaseHistoriesPage.getContent();
List<ReleaseHistoryDTO> releaseHistoryDTOs = new ArrayList<>(releaseHistories.size());
for (ReleaseHistory releaseHistory : releaseHistories) {
releaseHistoryDTOs.add(transformReleaseHistory2DTO(releaseHistory));
}
return new PageDTO<>(releaseHistoryDTOs, pageable, releaseHistoriesPage.getTotalElements());
}
private ReleaseHistoryDTO transformReleaseHistory2DTO(ReleaseHistory releaseHistory) {
ReleaseHistoryDTO dto = new ReleaseHistoryDTO();
BeanUtils.copyProperties(releaseHistory, dto, "operationContext");
dto.setOperationContext(GSON.fromJson(releaseHistory.getOperationContext(),
configurationTypeReference));
return dto;
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/resources/banner.txt | _ _ _
/ \ _ __ ___ | | | ___
/ _ \ | '_ \ / _ \| | |/ _ \
/ ___ \| |_) | (_) | | | (_) |
/_/ \_\ .__/ \___/|_|_|\___/
|_|
:: Spring Boot :: ${spring-boot.formatted-version}
| _ _ _
/ \ _ __ ___ | | | ___
/ _ \ | '_ \ / _ \| | |/ _ \
/ ___ \| |_) | (_) | | | (_) |
/_/ \_\ .__/ \___/|_|_|\___/
|_|
:: Spring Boot :: ${spring-boot.formatted-version}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/DeferredLoggerTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| -1 |
apolloconfig/apollo | 3,836 | feature: public namespace support different formats | ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| dake0805 | 2021-07-20T14:34:48Z | 2021-08-05T08:03:42Z | 7afe23bf9aa2630f902c4cd377d327f6beb95679 | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | feature: public namespace support different formats. ## What's the purpose of this PR
Add new feature:
- Can create public namespace in different formats, include json, xml, yml, yaml, txt, just like creating a private namespace.
- Public namespace in these formats can be associated correctly.
[Discussion](https://github.com/ctripcorp/apollo/discussions/3815)
## Which issue(s) this PR fixes:
Fixes #2602
## Brief changelog
- Remove verify formats of creating public namespace in portal API and front-end
- Add front-end elements to create public namespace in formats
- Add front-end text box to show associated namespace when parent namespace are different with child namespace.
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.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/spi/Ordered.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.spi;
/**
* {@code Ordered} is an interface that can be implemented by objects that
* should be <em>orderable</em>, for example in a {@code Collection}.
*
* <p>The actual {@link #getOrder() order} can be interpreted as prioritization,
* with the first object (with the lowest order value) having the highest
* priority.
*
* @since 1.0.0
*/
public interface Ordered {
/**
* Useful constant for the highest precedence value.
* @see java.lang.Integer#MIN_VALUE
*/
int HIGHEST_PRECEDENCE = Integer.MIN_VALUE;
/**
* Useful constant for the lowest precedence value.
* @see java.lang.Integer#MAX_VALUE
*/
int LOWEST_PRECEDENCE = Integer.MAX_VALUE;
/**
* Get the order value of this object.
* <p>Higher values are interpreted as lower priority. As a consequence,
* the object with the lowest value has the highest priority (somewhat
* analogous to Servlet {@code load-on-startup} values).
* <p>Same order values will result in arbitrary sort positions for the
* affected objects.
* @return the order value
* @see #HIGHEST_PRECEDENCE
* @see #LOWEST_PRECEDENCE
*/
int getOrder();
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.spi;
/**
* {@code Ordered} is an interface that can be implemented by objects that
* should be <em>orderable</em>, for example in a {@code Collection}.
*
* <p>The actual {@link #getOrder() order} can be interpreted as prioritization,
* with the first object (with the lowest order value) having the highest
* priority.
*
* @since 1.0.0
*/
public interface Ordered {
/**
* Useful constant for the highest precedence value.
* @see java.lang.Integer#MIN_VALUE
*/
int HIGHEST_PRECEDENCE = Integer.MIN_VALUE;
/**
* Useful constant for the lowest precedence value.
* @see java.lang.Integer#MAX_VALUE
*/
int LOWEST_PRECEDENCE = Integer.MAX_VALUE;
/**
* Get the order value of this object.
* <p>Higher values are interpreted as lower priority. As a consequence,
* the object with the lowest value has the highest priority (somewhat
* analogous to Servlet {@code load-on-startup} values).
* <p>Same order values will result in arbitrary sort positions for the
* affected objects.
* @return the order value
* @see #HIGHEST_PRECEDENCE
* @see #LOWEST_PRECEDENCE
*/
int getOrder();
}
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./CHANGES.md | Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
* [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
* [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
* [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789)
* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
* [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
* [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
* [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)
* [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797)
* [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803)
* [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812)
* [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808)
* [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804)
* [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822)
* [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816)
* [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
* [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
* [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
* [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789)
* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
* [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
* [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
* [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)
* [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797)
* [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803)
* [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812)
* [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808)
* [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804)
* [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822)
* [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816)
* [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831)
* [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| 1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScanner.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.message;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.Lists;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ReleaseMessageScanner implements InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(ReleaseMessageScanner.class);
@Autowired
private BizConfig bizConfig;
@Autowired
private ReleaseMessageRepository releaseMessageRepository;
private int databaseScanInterval;
private List<ReleaseMessageListener> listeners;
private ScheduledExecutorService executorService;
private long maxIdScanned;
public ReleaseMessageScanner() {
listeners = Lists.newCopyOnWriteArrayList();
executorService = Executors.newScheduledThreadPool(1, ApolloThreadFactory
.create("ReleaseMessageScanner", true));
}
@Override
public void afterPropertiesSet() throws Exception {
databaseScanInterval = bizConfig.releaseMessageScanIntervalInMilli();
maxIdScanned = loadLargestMessageId();
executorService.scheduleWithFixedDelay(() -> {
Transaction transaction = Tracer.newTransaction("Apollo.ReleaseMessageScanner", "scanMessage");
try {
scanMessages();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Scan and send message failed", ex);
} finally {
transaction.complete();
}
}, databaseScanInterval, databaseScanInterval, TimeUnit.MILLISECONDS);
}
/**
* add message listeners for release message
* @param listener
*/
public void addMessageListener(ReleaseMessageListener listener) {
if (!listeners.contains(listener)) {
listeners.add(listener);
}
}
/**
* Scan messages, continue scanning until there is no more messages
*/
private void scanMessages() {
boolean hasMoreMessages = true;
while (hasMoreMessages && !Thread.currentThread().isInterrupted()) {
hasMoreMessages = scanAndSendMessages();
}
}
/**
* scan messages and send
*
* @return whether there are more messages
*/
private boolean scanAndSendMessages() {
//current batch is 500
List<ReleaseMessage> releaseMessages =
releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(maxIdScanned);
if (CollectionUtils.isEmpty(releaseMessages)) {
return false;
}
fireMessageScanned(releaseMessages);
int messageScanned = releaseMessages.size();
maxIdScanned = releaseMessages.get(messageScanned - 1).getId();
return messageScanned == 500;
}
/**
* find largest message id as the current start point
* @return current largest message id
*/
private long loadLargestMessageId() {
ReleaseMessage releaseMessage = releaseMessageRepository.findTopByOrderByIdDesc();
return releaseMessage == null ? 0 : releaseMessage.getId();
}
/**
* Notify listeners with messages loaded
* @param messages
*/
private void fireMessageScanned(List<ReleaseMessage> messages) {
for (ReleaseMessage message : messages) {
for (ReleaseMessageListener listener : listeners) {
try {
listener.handleMessage(message, Topics.APOLLO_RELEASE_TOPIC);
} catch (Throwable ex) {
Tracer.logError(ex);
logger.error("Failed to invoke message listener {}", listener.getClass(), ex);
}
}
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.biz.message;
import com.google.common.collect.Maps;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.Lists;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ReleaseMessageScanner implements InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(ReleaseMessageScanner.class);
private static final int missingReleaseMessageMaxAge = 10; // hardcoded to 10, could be configured via BizConfig if necessary
@Autowired
private BizConfig bizConfig;
@Autowired
private ReleaseMessageRepository releaseMessageRepository;
private int databaseScanInterval;
private final List<ReleaseMessageListener> listeners;
private final ScheduledExecutorService executorService;
private final Map<Long, Integer> missingReleaseMessages; // missing release message id => age counter
private long maxIdScanned;
public ReleaseMessageScanner() {
listeners = Lists.newCopyOnWriteArrayList();
executorService = Executors.newScheduledThreadPool(1, ApolloThreadFactory
.create("ReleaseMessageScanner", true));
missingReleaseMessages = Maps.newHashMap();
}
@Override
public void afterPropertiesSet() throws Exception {
databaseScanInterval = bizConfig.releaseMessageScanIntervalInMilli();
maxIdScanned = loadLargestMessageId();
executorService.scheduleWithFixedDelay(() -> {
Transaction transaction = Tracer.newTransaction("Apollo.ReleaseMessageScanner", "scanMessage");
try {
scanMissingMessages();
scanMessages();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Scan and send message failed", ex);
} finally {
transaction.complete();
}
}, databaseScanInterval, databaseScanInterval, TimeUnit.MILLISECONDS);
}
/**
* add message listeners for release message
* @param listener
*/
public void addMessageListener(ReleaseMessageListener listener) {
if (!listeners.contains(listener)) {
listeners.add(listener);
}
}
/**
* Scan messages, continue scanning until there is no more messages
*/
private void scanMessages() {
boolean hasMoreMessages = true;
while (hasMoreMessages && !Thread.currentThread().isInterrupted()) {
hasMoreMessages = scanAndSendMessages();
}
}
/**
* scan messages and send
*
* @return whether there are more messages
*/
private boolean scanAndSendMessages() {
//current batch is 500
List<ReleaseMessage> releaseMessages =
releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(maxIdScanned);
if (CollectionUtils.isEmpty(releaseMessages)) {
return false;
}
fireMessageScanned(releaseMessages);
int messageScanned = releaseMessages.size();
long newMaxIdScanned = releaseMessages.get(messageScanned - 1).getId();
// check id gaps, possible reasons are release message not committed yet or already rolled back
if (newMaxIdScanned - maxIdScanned > messageScanned) {
recordMissingReleaseMessageIds(releaseMessages, maxIdScanned);
}
maxIdScanned = newMaxIdScanned;
return messageScanned == 500;
}
private void scanMissingMessages() {
Set<Long> missingReleaseMessageIds = missingReleaseMessages.keySet();
Iterable<ReleaseMessage> releaseMessages = releaseMessageRepository
.findAllById(missingReleaseMessageIds);
fireMessageScanned(releaseMessages);
releaseMessages.forEach(releaseMessage -> {
missingReleaseMessageIds.remove(releaseMessage.getId());
});
growAndCleanMissingMessages();
}
private void growAndCleanMissingMessages() {
Iterator<Entry<Long, Integer>> iterator = missingReleaseMessages.entrySet()
.iterator();
while (iterator.hasNext()) {
Entry<Long, Integer> entry = iterator.next();
if (entry.getValue() > missingReleaseMessageMaxAge) {
iterator.remove();
} else {
entry.setValue(entry.getValue() + 1);
}
}
}
private void recordMissingReleaseMessageIds(List<ReleaseMessage> messages, long startId) {
for (ReleaseMessage message : messages) {
long currentId = message.getId();
if (currentId - startId > 1) {
for (long i = startId + 1; i < currentId; i++) {
missingReleaseMessages.putIfAbsent(i, 1);
}
}
startId = currentId;
}
}
/**
* find largest message id as the current start point
* @return current largest message id
*/
private long loadLargestMessageId() {
ReleaseMessage releaseMessage = releaseMessageRepository.findTopByOrderByIdDesc();
return releaseMessage == null ? 0 : releaseMessage.getId();
}
/**
* Notify listeners with messages loaded
* @param messages
*/
private void fireMessageScanned(Iterable<ReleaseMessage> messages) {
for (ReleaseMessage message : messages) {
for (ReleaseMessageListener listener : listeners) {
try {
listener.handleMessage(message, Topics.APOLLO_RELEASE_TOPIC);
} catch (Throwable ex) {
Tracer.logError(ex);
logger.error("Failed to invoke message listener {}", listener.getClass(), ex);
}
}
}
}
}
| 1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScannerTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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(song_s@ctrip.com)
*/
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;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
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.collect.Sets;
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 java.util.ArrayList;
import org.awaitility.Awaitility;
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.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
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();
Awaitility.reset();
Awaitility.setDefaultTimeout(databaseScanInterval * 5, TimeUnit.MILLISECONDS);
Awaitility.setDefaultPollInterval(databaseScanInterval, TimeUnit.MILLISECONDS);
}
@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());
}
@Test
public void testScanMessageWithGapAndNotifyMessageListener() throws Exception {
String someMessage = "someMessage";
long someId = 1;
ReleaseMessage someReleaseMessage = assembleReleaseMessage(someId, someMessage);
String someMissingMessage = "someMissingMessage";
long someMissingId = 2;
ReleaseMessage someMissingReleaseMessage = assembleReleaseMessage(someMissingId, someMissingMessage);
String anotherMessage = "anotherMessage";
long anotherId = 3;
ReleaseMessage anotherReleaseMessage = assembleReleaseMessage(anotherId, anotherMessage);
String anotherMissingMessage = "anotherMissingMessage";
long anotherMissingId = 4;
ReleaseMessage anotherMissingReleaseMessage = assembleReleaseMessage(anotherMissingId, anotherMissingMessage);
long someRolledBackId = 5;
String yetAnotherMessage = "yetAnotherMessage";
long yetAnotherId = 6;
ReleaseMessage yetAnotherReleaseMessage = assembleReleaseMessage(yetAnotherId, yetAnotherMessage);
ArrayList<ReleaseMessage> receivedMessage = Lists.newArrayList();
SettableFuture<ReleaseMessage> someListenerFuture = SettableFuture.create();
ReleaseMessageListener someListener = (message, channel) -> receivedMessage.add(message);
releaseMessageScanner.addMessageListener(someListener);
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0L)).thenReturn(
Lists.newArrayList(someReleaseMessage));
await().untilAsserted(() -> {
assertEquals(1, receivedMessage.size());
assertSame(someReleaseMessage, receivedMessage.get(0));
});
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(someId)).thenReturn(
Lists.newArrayList(anotherReleaseMessage));
await().untilAsserted(() -> {
assertEquals(2, receivedMessage.size());
assertSame(someReleaseMessage, receivedMessage.get(0));
assertSame(anotherReleaseMessage, receivedMessage.get(1));
});
when(releaseMessageRepository.findAllById(Sets.newHashSet(someMissingId)))
.thenReturn(Lists.newArrayList(someMissingReleaseMessage));
await().untilAsserted(() -> {
assertEquals(3, receivedMessage.size());
assertSame(someReleaseMessage, receivedMessage.get(0));
assertSame(anotherReleaseMessage, receivedMessage.get(1));
assertSame(someMissingReleaseMessage, receivedMessage.get(2));
});
when(releaseMessageRepository.findFirst500ByIdGreaterThanOrderByIdAsc(anotherId)).thenReturn(
Lists.newArrayList(yetAnotherReleaseMessage));
await().untilAsserted(() -> {
assertEquals(4, receivedMessage.size());
assertSame(someReleaseMessage, receivedMessage.get(0));
assertSame(anotherReleaseMessage, receivedMessage.get(1));
assertSame(someMissingReleaseMessage, receivedMessage.get(2));
assertSame(yetAnotherReleaseMessage, receivedMessage.get(3));
});
when(releaseMessageRepository.findAllById(Sets.newHashSet(anotherMissingId, someRolledBackId)))
.thenReturn(Lists.newArrayList(anotherMissingReleaseMessage));
await().untilAsserted(() -> {
assertEquals(5, receivedMessage.size());
assertSame(someReleaseMessage, receivedMessage.get(0));
assertSame(anotherReleaseMessage, receivedMessage.get(1));
assertSame(someMissingReleaseMessage, receivedMessage.get(2));
assertSame(yetAnotherReleaseMessage, receivedMessage.get(3));
assertSame(anotherMissingReleaseMessage, receivedMessage.get(4));
});
}
private ReleaseMessage assembleReleaseMessage(long id, String message) {
ReleaseMessage releaseMessage = new ReleaseMessage();
releaseMessage.setId(id);
releaseMessage.setMessage(message);
return releaseMessage;
}
}
| 1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spi;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigRegistry implements ConfigRegistry {
private static final Logger s_logger = LoggerFactory.getLogger(DefaultConfigRegistry.class);
private Map<String, ConfigFactory> m_instances = Maps.newConcurrentMap();
@Override
public void register(String namespace, ConfigFactory factory) {
if (m_instances.containsKey(namespace)) {
s_logger.warn("ConfigFactory({}) is overridden by {}!", namespace, factory.getClass());
}
m_instances.put(namespace, factory);
}
@Override
public ConfigFactory getFactory(String namespace) {
ConfigFactory config = m_instances.get(namespace);
return config;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spi;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigRegistry implements ConfigRegistry {
private static final Logger s_logger = LoggerFactory.getLogger(DefaultConfigRegistry.class);
private Map<String, ConfigFactory> m_instances = Maps.newConcurrentMap();
@Override
public void register(String namespace, ConfigFactory factory) {
if (m_instances.containsKey(namespace)) {
s_logger.warn("ConfigFactory({}) is overridden by {}!", namespace, factory.getClass());
}
m_instances.put(namespace, factory);
}
@Override
public ConfigFactory getFactory(String namespace) {
ConfigFactory config = m_instances.get(namespace);
return config;
}
}
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/en/development/portal-how-to-enable-webhook-notification.md | TODO
| TODO
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/signature/HmacSha1UtilsTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.signature;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author nisiyong
*/
public class HmacSha1UtilsTest {
@Test
public void testSignString() {
String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1";
String accessKeySecret = "df23df3f59884980844ff3dada30fa97";
String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret);
String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE=";
assertEquals(expectedSignature, actualSignature);
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.core.signature;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author nisiyong
*/
public class HmacSha1UtilsTest {
@Test
public void testSignString() {
String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1";
String accessKeySecret = "df23df3f59884980844ff3dada30fa97";
String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret);
String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE=";
assertEquals(expectedSignature, actualSignature);
}
} | -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/zh/usage/java-sdk-user-guide.md | >注意：本文档适用对象是Apollo系统的使用者，如果你是公司内Apollo系统的开发者/维护人员，建议先参考[Apollo开发指南](zh/development/apollo-development-guide)。
#
# 一、准备工作
## 1.1 环境要求
* Java: 1.7+
* Guava: 15.0+
* Apollo客户端默认会引用Guava 19，如果你的项目引用了其它版本，请确保版本号大于等于15.0
>注：对于Apollo客户端，如果有需要的话，可以做少量代码修改来降级到Java 1.6，详细信息可以参考[Issue 483](https://github.com/ctripcorp/apollo/issues/483)
## 1.2 必选设置
Apollo客户端依赖于`AppId`，`Apollo Meta Server`等环境信息来工作，所以请确保阅读下面的说明并且做正确的配置：
### 1.2.1 AppId
AppId是应用的身份信息，是从服务端获取配置的一个重要信息。
有以下几种方式设置，按照优先级从高到低分别为：
1. System Property
Apollo 0.7.0+支持通过System Property传入app.id信息，如
```bash
-Dapp.id=YOUR-APP-ID
```
2. 操作系统的System Environment
Apollo 1.4.0+支持通过操作系统的System Environment `APP_ID`来传入app.id信息，如
```bash
APP_ID=YOUR-APP-ID
```
3. Spring Boot application.properties
Apollo 1.0.0+支持通过Spring Boot的application.properties文件配置，如
```properties
app.id=YOUR-APP-ID
```
> 该配置方式不适用于多个war包部署在同一个tomcat的使用场景
4. app.properties
确保classpath:/META-INF/app.properties文件存在，并且其中内容形如：
>app.id=YOUR-APP-ID
文件位置参考如下：
> 注：app.id是用来标识应用身份的唯一id，格式为string。
### 1.2.2 Apollo Meta Server
Apollo支持应用在不同的环境有不同的配置，所以需要在运行提供给Apollo客户端当前环境的[Apollo Meta Server](zh/design/apollo-design?id=_133-meta-server)信息。默认情况下，meta server和config service是部署在同一个JVM进程，所以meta server的地址就是config service的地址。
为了实现meta server的高可用，推荐通过SLB（Software Load Balancer）做动态负载均衡。Meta server地址也可以填入IP，如`http://1.1.1.1:8080,http://2.2.2.2:8080`，不过生产环境还是建议使用域名（走slb），因为机器扩容、缩容等都可能导致IP列表的变化。
1.0.0版本开始支持以下方式配置apollo meta server信息，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.meta`
* 可以通过Java的System Property `apollo.meta`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.meta=http://config-service-url`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.meta=http://config-service-url -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.meta", "http://config-service-url");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.meta=http://config-service-url`
> 该配置方式不适用于多个war包部署在同一个tomcat的使用场景
3. 通过操作系统的System Environment`APOLLO_META`
* 可以通过操作系统的System Environment `APOLLO_META`来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.meta=http://config-service-url`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
5. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.meta=http://config-service-url`
6. 通过Java system property `${env}_meta`
* 如果当前[env](#_1241-environment)是`dev`，那么用户可以配置`-Ddev_meta=http://config-service-url`
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
7. 通过操作系统的System Environment `${ENV}_META` (1.2.0版本开始支持)
* 如果当前[env](#_1241-environment)是`dev`，那么用户可以配置操作系统的System Environment `DEV_META=http://config-service-url`
* 注意key为全大写
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
8. 通过`apollo-env.properties`文件
* 用户也可以创建一个`apollo-env.properties`，放在程序的classpath下，或者放在spring boot应用的config目录下
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
* 文件内容形如：
```properties
dev.meta=http://1.1.1.1:8080
fat.meta=http://apollo.fat.xxx.com
uat.meta=http://apollo.uat.xxx.com
pro.meta=http://apollo.xxx.com
```
> 如果通过以上各种手段都无法获取到Meta Server地址，Apollo最终会fallback到`http://apollo.meta`作为Meta Server地址
#### 1.2.2.1 自定义Apollo Meta Server地址定位逻辑
在1.0.0版本中，Apollo提供了[MetaServerProvider SPI](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/spi/MetaServerProvider.java)，用户可以注入自己的MetaServerProvider来自定义Meta Server地址定位逻辑。
由于我们使用典型的[Java Service Loader模式](https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html)，所以实现起来还是比较简单的。
有一点需要注意的是，apollo会在运行时按照顺序遍历所有的MetaServerProvider，直到某一个MetaServerProvider提供了一个非空的Meta Server地址，因此用户需要格外注意自定义MetaServerProvider的Order。规则是较小的Order具有较高的优先级，因此Order=0的MetaServerProvider会排在Order=1的MetaServerProvider的前面。
**如果你的公司有很多应用需要接入Apollo，建议封装一个jar包，然后提供自定义的Apollo Meta Server定位逻辑，从而可以让接入Apollo的应用零配置使用。比如自己写一个`xx-company-apollo-client`，该jar包依赖`apollo-client`，在该jar包中通过spi方式定义自定义的MetaServerProvider实现，然后应用直接依赖`xx-company-apollo-client`即可。**
MetaServerProvider的实现可以参考[LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)和[DefaultMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java)。
#### 1.2.2.2 跳过Apollo Meta Server服务发现
> 适用于apollo-client 0.11.0及以上版本
一般情况下都建议使用Apollo的Meta Server机制来实现Config Service的服务发现，从而可以实现Config Service的高可用。不过apollo-client也支持跳过Meta Server服务发现，主要用于以下场景：
1. Config Service部署在公有云上，注册到Meta Server的是内网地址，本地开发环境无法直接连接
* 如果通过公网 SLB 对外暴露 Config Service的话，记得要设置 IP 白名单，避免数据泄露
2. Config Service部署在docker环境中，注册到Meta Server的是docker内网地址，本地开发环境无法直接连接
3. Config Service部署在kubernetes中，希望使用kubernetes自带的服务发现能力（Service）
针对以上场景，可以通过直接指定Config Service地址的方式来跳过Meta Server服务发现，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.config-service`(1.9.0+) 或者 `apollo.configService`(1.9.0之前)
* 可以通过Java的System Property `apollo.config-service`(1.9.0+) 或者 `apollo.configService`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.config-service=http://config-service-url:port`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.configService=http://config-service-url:port -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.config-service", "http://config-service-url:port");`
2. 通过操作系统的System Environment `APOLLO_CONFIG_SERVICE`(1.9.0+) 或者 `APOLLO_CONFIGSERVICE`(1.9.0之前)
* 可以通过操作系统的System Environment `APOLLO_CONFIG_SERVICE`(1.9.0+) 或者 `APOLLO_CONFIGSERVICE`(1.9.0之前)来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.config-service=http://config-service-url:port`(1.9.0+) 或者 `apollo.configService=http://config-service-url:port`(1.9.0之前)
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
### 1.2.3 本地缓存路径
Apollo客户端会把从服务端获取到的配置在本地文件系统缓存一份，用于在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置，不影响应用正常运行。
本地缓存路径默认位于以下路径，所以请确保`/opt/data`或`C:\opt\data\`目录存在，且应用有读写权限。
* **Mac/Linux**: /opt/data/{_appId_}/config-cache
* **Windows**: C:\opt\data\\{_appId_}\config-cache
本地配置文件会以下面的文件名格式放置于本地缓存路径下：
**_{appId}+{cluster}+{namespace}.properties_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用的配置namespace，一般是application
文件内容以properties格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```properties
request.timeout=2000
batch=2000
```
#### 1.2.3.1 自定义缓存路径
1.0.0版本开始支持以下方式自定义缓存路径，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.cache-dir`(1.9.0+) 或者 `apollo.cacheDir`(1.9.0之前)
* 可以通过Java的System Property `apollo.cache-dir`(1.9.0+) 或者 `apollo.cacheDir`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
* 如果是运行jar文件，需要注意格式是`java -Dapollo.cache-dir=/opt/data/some-cache-dir -jar xxx.jar`(1.9.0+) 或者 `java -Dapollo.cacheDir=/opt/data/some-cache-dir -jar xxx.jar`(1.9.0之前)
* 也可以通过程序指定，如`System.setProperty("apollo.cache-dir", "/opt/data/some-cache-dir");`(1.9.0+) 或者 `System.setProperty("apollo.cacheDir", "/opt/data/some-cache-dir");`(1.9.0之前)
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
3. 通过操作系统的System Environment`APOLLO_CACHE_DIR`(1.9.0+) 或者 `APOLLO_CACHEDIR`(1.9.0之前)
* 可以通过操作系统的System Environment `APOLLO_CACHE_DIR`(1.9.0+) 或者 `APOLLO_CACHEDIR`(1.9.0之前)来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
> 注：本地缓存路径也可用于容灾目录，如果应用在所有config service都挂掉的情况下需要扩容，那么也可以先把配置从已有机器上的缓存路径复制到新机器上的相同缓存路径
### 1.2.4 可选设置
#### 1.2.4.1 Environment
Environment可以通过以下3种方式的任意一个配置：
1. 通过Java System Property
* 可以通过Java的System Property `env`来指定环境
* 在Java程序启动脚本中，可以指定`-Denv=YOUR-ENVIRONMENT`
* 如果是运行jar文件，需要注意格式是`java -Denv=YOUR-ENVIRONMENT -jar xxx.jar`
* 注意key为全小写
2. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `ENV`来指定
* 注意key为全大写
3. 通过配置文件
* 最后一个推荐的方式是通过配置文件来指定`env=YOUR-ENVIRONMENT`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
文件内容形如：
```properties
env=DEV
```
目前，`env`支持以下几个值（大小写不敏感）：
* DEV
* Development environment
* FAT
* Feature Acceptance Test environment
* UAT
* User Acceptance Test environment
* PRO
* Production environment
更多环境定义，可以参考[Env.java](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)
#### 1.2.4.2 Cluster（集群）
Apollo支持配置按照集群划分，也就是说对于一个appId和一个环境，对不同的集群可以有不同的配置。
1.0.0版本开始支持以下方式集群，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.cluster`
* 可以通过Java的System Property `apollo.cluster`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.cluster=SomeCluster`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.cluster=SomeCluster -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.cluster", "SomeCluster");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.cluster=SomeCluster`
3. 通过Java System Property
* 可以通过Java的System Property `idc`来指定环境
* 在Java程序启动脚本中，可以指定`-Didc=xxx`
* 如果是运行jar文件，需要注意格式是`java -Didc=xxx -jar xxx.jar`
* 注意key为全小写
4. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `IDC`来指定
* 注意key为全大写
5. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`idc=xxx`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
**Cluster Precedence**（集群顺序）
1. 如果`apollo.cluster`和`idc`同时指定：
* 我们会首先尝试从`apollo.cluster`指定的集群加载配置
* 如果没找到任何配置，会尝试从`idc`指定的集群加载配置
* 如果还是没找到，会从默认的集群（`default`）加载
2. 如果只指定了`apollo.cluster`：
* 我们会首先尝试从`apollo.cluster`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
3. 如果只指定了`idc`：
* 我们会首先尝试从`idc`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
4. 如果`apollo.cluster`和`idc`都没有指定：
* 我们会从默认的集群（`default`）加载配置
#### 1.2.4.3 设置内存中的配置项是否保持和页面上的顺序一致
> 适用于1.6.0及以上版本
默认情况下，apollo client内存中的配置存放在Properties中（底下是Hashtable），不会刻意保持和页面上看到的顺序一致，对绝大部分的场景是没有影响的。不过有些场景会强依赖配置项的顺序（如spring cloud zuul的路由规则），针对这种情况，可以开启OrderedProperties特性来使得内存中的配置顺序和页面上看到的一致。
配置方式按照优先级从高到低分别为：
1. 通过Java System Property `apollo.property.order.enable`
* 可以通过Java的System Property `apollo.property.order.enable`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.property.order.enable=true`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.property.order.enable=true -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.property.order.enable", "true");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.property.order.enable=true`
3. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.property.order.enable=true`
#### 1.2.4.4 配置访问密钥
> 适用于1.6.0及以上版本
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
配置方式按照优先级从高到低分别为：
1. 通过Java System Property `apollo.access-key.secret`(1.9.0+) 或者 `apollo.accesskey.secret`(1.9.0之前)
* 可以通过Java的System Property `apollo.access-key.secret`(1.9.0+) 或者 `apollo.accesskey.secret`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `-Dapollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
* 如果是运行jar文件，需要注意格式是`java -Dapollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719 -jar xxx.jar`(1.9.0+) 或者 `java -Dapollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719 -jar xxx.jar`(1.9.0之前)
* 也可以通过程序指定，如`System.setProperty("apollo.access-key.secret", "1cf998c4e2ad4704b45a98a509d15719");`(1.9.0+) 或者 `System.setProperty("apollo.accesskey.secret", "1cf998c4e2ad4704b45a98a509d15719");`(1.9.0之前)
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `apollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
3. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `APOLLO_ACCESS_KEY_SECRET`(1.9.0+) 或者 `APOLLO_ACCESSKEY_SECRET`(1.9.0之前)来指定
* 注意key为全大写
4. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `apollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
#### 1.2.4.5 自定义server.properties路径
> 适用于1.8.0及以上版本
1.8.0版本开始支持以下方式自定义server.properties路径，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.path.server.properties`
* 可以通过Java的System Property `apollo.path.server.properties`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.path.server.properties=/some-dir/some-file.properties`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.path.server.properties=/some-dir/some-file.properties -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.path.server.properties", "/some-dir/some-file.properties");`
2. 通过操作系统的System Environment`APOLLO_PATH_SERVER_PROPERTIES`
* 可以通过操作系统的System Environment `APOLLO_PATH_SERVER_PROPERTIES`来指定
* 注意key为全大写，且中间是`_`分隔
#### 1.2.4.6 开启`propertyNames`缓存，在大量配置场景下可以显著改善启动速度
> 适用于1.9.0及以上版本
在使用`@ConfigurationProperties`和存在大量配置项场景下，Spring容器的启动速度会变慢。通过开启该配置可以显著提升启动速度，当配置发生变化时缓存会自动清理，默认为`false`。详见：[issue 3800](https://github.com/ctripcorp/apollo/issues/3800)
配置方式按照优先级从高到低依次为：
1. 通过Java System Property `apollo.property.names.cache.enable`
* 可以通过Java的System Property `apollo.property.names.cache.enable`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.property.names.cache.enable=true`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.property.names.cache.enable=true -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.property.names.cache.enable", "true");`
2. 通过系统环境变量
* 在启动程序前配置环境变量`APOLLO_PROPERTY_NAMES_CACHE_ENABLE=true`来指定
* 注意key为全大写，且中间是`_`分隔
3. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.property.names.cache.enable=true`
4. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.property.names.cache.enable=true`
# 二、Maven Dependency
Apollo的客户端jar包已经上传到中央仓库，应用在实际使用时只需要按照如下方式引入即可。
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>1.7.0</version>
</dependency>
```
# 三、客户端用法
Apollo支持API方式和Spring整合方式，该怎么选择用哪一种方式？
* API方式灵活，功能完备，配置值实时更新（热发布），支持所有Java环境。
* Spring方式接入简单，结合Spring有N种酷炫的玩法，如
* Placeholder方式：
* 代码中直接使用，如：`@Value("${someKeyFromApollo:someDefaultValue}")`
* 配置文件中使用替换placeholder，如：`spring.datasource.url: ${someKeyFromApollo:someDefaultValue}`
* 直接托管spring的配置，如在apollo中直接配置`spring.datasource.url=jdbc:mysql://localhost:3306/somedb?characterEncoding=utf8`
* Spring boot的[@ConfigurationProperties](http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/ConfigurationProperties.html)方式
* 从v0.10.0开始的版本支持placeholder在运行时自动更新，具体参见[PR #972](https://github.com/ctripcorp/apollo/pull/972)。（v0.10.0之前的版本在配置变化后不会重新注入，需要重启才会更新，如果需要配置值实时更新，可以参考后续[3.2.2 Spring Placeholder的使用](#_322-spring-placeholder的使用)的说明）
* Spring方式也可以结合API方式使用，如注入Apollo的Config对象，就可以照常通过API方式获取配置了：
```java
@ApolloConfig
private Config config; //inject config for namespace application
```
* 更多有意思的实际使用场景和示例代码，请参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)
## 3.1 API使用方式
API方式是最简单、高效使用Apollo配置的方式，不依赖Spring框架即可使用。
### 3.1.1 获取默认namespace的配置（application）
```java
Config config = ConfigService.getAppConfig(); //config instance is singleton for each namespace and is never null
String someKey = "someKeyFromDefaultNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
通过上述的**config.getProperty**可以获取到someKey对应的实时最新的配置值。
另外，配置值从内存中获取，所以不需要应用自己做缓存。
### 3.1.2 监听配置变化事件
监听配置变化事件只在应用真的关心配置变化，需要在配置变化时得到通知时使用，比如：数据库连接串变化后需要重建连接等。
如果只是希望每次都取到最新的配置的话，只需要按照上面的例子，调用**config.getProperty**即可。
```java
Config config = ConfigService.getAppConfig(); //config instance is singleton for each namespace and is never null
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
System.out.println("Changes for namespace " + changeEvent.getNamespace());
for (String key : changeEvent.changedKeys()) {
ConfigChange change = changeEvent.getChange(key);
System.out.println(String.format("Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType()));
}
}
});
```
### 3.1.3 获取公共Namespace的配置
```java
String somePublicNamespace = "CAT";
Config config = ConfigService.getConfig(somePublicNamespace); //config instance is singleton for each namespace and is never null
String someKey = "someKeyFromPublicNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
### 3.1.4 获取非properties格式namespace的配置
#### 3.1.4.1 yaml/yml格式的namespace
apollo-client 1.3.0版本开始对yaml/yml做了更好的支持，使用起来和properties格式一致。
```java
Config config = ConfigService.getConfig("application.yml");
String someKey = "someKeyFromYmlNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
#### 3.1.4.2 非yaml/yml格式的namespace
获取时需要使用`ConfigService.getConfigFile`接口并指定Format，如`ConfigFileFormat.XML`。
```java
String someNamespace = "test";
ConfigFile configFile = ConfigService.getConfigFile("test", ConfigFileFormat.XML);
String content = configFile.getContent();
```
## 3.2 Spring整合方式
### 3.2.1 配置
Apollo也支持和Spring整合（Spring 3.1.1+），只需要做一些简单的配置就可以了。
Apollo目前既支持比较传统的`基于XML`的配置，也支持目前比较流行的`基于Java（推荐）`的配置。
如果是Spring Boot环境，建议参照[3.2.1.3 Spring Boot集成方式（推荐）](#_3213-spring-boot集成方式（推荐）)配置。
需要注意的是，如果之前有使用`org.springframework.beans.factory.config.PropertyPlaceholderConfigurer`的，请替换成`org.springframework.context.support.PropertySourcesPlaceholderConfigurer`。Spring 3.1以后就不建议使用PropertyPlaceholderConfigurer了，要改用PropertySourcesPlaceholderConfigurer。
如果之前有使用`<context:property-placeholder>`，请注意xml中引入的`spring-context.xsd`版本需要是3.1以上（一般只要没有指定版本会自动升级的），建议使用不带版本号的形式引入，如：`http://www.springframework.org/schema/context/spring-context.xsd`
> 注1：yaml/yml格式的namespace从1.3.0版本开始支持和Spring整合，注入时需要填写带后缀的完整名字，比如application.yml
> 注2：非properties、非yaml/yml格式（如xml，json等）的namespace暂不支持和Spring整合。
#### 3.2.1.1 基于XML的配置
>注：需要把apollo相关的xml namespace加到配置文件头上，不然会报xml语法错误。
1.注入默认namespace的配置到Spring中
```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注入application namespace的配置到Spring环境中 -->
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
2.注入多个namespace的配置到Spring中
```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注入application namespace的配置到Spring环境中 -->
<apollo:config/>
<!-- 这个是稍微复杂一些的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中 -->
<apollo:config namespaces="FX.apollo,application.yml"/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
3.注入多个namespace，并且指定顺序
Spring的配置是有顺序的，如果多个property source都有同一个key，那么最终是顺序在前的配置生效。
<apollo:config>如果不指定order，那么默认是最低优先级。
```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 order="2"/>
<!-- 这个是最复杂的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中，并且顺序在application前面 -->
<apollo:config namespaces="FX.apollo,application.yml" order="1"/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
#### 3.2.1.2 基于Java的配置（推荐）
相对于基于XML的配置，基于Java的配置是目前比较流行的方式。
注意`@EnableApolloConfig`要和`@Configuration`一起使用，不然不会生效。
1.注入默认namespace的配置到Spring中
```java
//这个是最简单的配置形式，一般应用用这种形式就可以了，用来指示Apollo注入application namespace的配置到Spring环境中
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
```
2.注入多个namespace的配置到Spring中
```java
@Configuration
@EnableApolloConfig
public class SomeAppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
//这个是稍微复杂一些的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中
@Configuration
@EnableApolloConfig({"FX.apollo", "application.yml"})
public class AnotherAppConfig {}
```
3.注入多个namespace，并且指定顺序
```java
//这个是最复杂的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中，并且顺序在application前面
@Configuration
@EnableApolloConfig(order = 2)
public class SomeAppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
@Configuration
@EnableApolloConfig(value = {"FX.apollo", "application.yml"}, order = 1)
public class AnotherAppConfig {}
```
#### 3.2.1.3 Spring Boot集成方式（推荐）
Spring Boot除了支持上述两种集成方式以外，还支持通过application.properties/bootstrap.properties来配置，该方式能使配置在更早的阶段注入，比如使用`@ConditionalOnProperty`的场景或者是有一些spring-boot-starter在启动阶段就需要读取配置做一些事情（如[dubbo-spring-boot-project](https://github.com/apache/incubator-dubbo-spring-boot-project)），所以对于Spring Boot环境建议通过以下方式来接入Apollo(需要0.10.0及以上版本）。
使用方式很简单，只需要在application.properties/bootstrap.properties中按照如下样例配置即可。
1. 注入默认`application` namespace的配置示例
```properties
# will inject 'application' namespace in bootstrap phase
apollo.bootstrap.enabled = true
```
2. 注入非默认`application` namespace或多个namespace的配置示例
```properties
apollo.bootstrap.enabled = true
# will inject 'application', 'FX.apollo' and 'application.yml' namespaces in bootstrap phase
apollo.bootstrap.namespaces = application,FX.apollo,application.yml
```
3. 将Apollo配置加载提到初始化日志系统之前(1.2.0+)
从1.2.0版本开始，如果希望把日志相关的配置（如`logging.level.root=info`或`logback-spring.xml`中的参数）也放在Apollo管理，那么可以额外配置`apollo.bootstrap.eagerLoad.enabled=true`来使Apollo的加载顺序放到日志系统加载之前，更多信息可以参考[PR 1614](https://github.com/ctripcorp/apollo/pull/1614)。参考配置示例如下：
```properties
# will inject 'application' namespace in bootstrap phase
apollo.bootstrap.enabled = true
# put apollo initialization before logging system initialization
apollo.bootstrap.eagerLoad.enabled=true
```
#### 3.2.1.4 Spring Boot Config Data Loader (Spring Boot 2.4+, Apollo Client 1.9.0+ 推荐)
对于 Spring Boot 2.4 以上版本还支持通过 Config Data Loader 模式来加载配置
##### 3.2.1.4.1 添加 maven 依赖
apollo-client-config-data 已经依赖了 apollo-client, 所以只需要添加这一个依赖即可, 无需再添加 apollo-client 的依赖
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
</dependencies>
```
##### 3.2.1.4.2 参照前述的方式配置 `app.id`, `env`, `apollo.meta`(或者 `apollo.config-service`), `apollo.cluster`
##### 3.2.1.4.3 配置 `application.properties` 或 `application.yml`
使用默认的 namespace `application`
```properties
# old way
# apollo.bootstrap.enabled=true
# 不配置 apollo.bootstrap.namespaces
# new way
spring.config.import=apollo://
```
或者
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=application
# new way
spring.config.import=apollo://application
```
使用自定义 namespace
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=your-namespace
# new way
spring.config.import=apollo://your-namespace
```
使用多个 namespaces
注: `spring.config.import` 是从后往前加载配置的, 而 `apollo.bootstrap.namespaces` 是从前往后加载的, 刚好相反。为了保证和原有逻辑一致, 请颠倒 namespaces 的顺序
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=namespace1,namespace2,namespace3
# new way
spring.config.import=apollo://namespace3, apollo://namespace2, apollo://namespace1
```
#### 3.2.1.5 Spring Boot Config Data Loader (Spring Boot 2.4+, Apollo Client 1.9.0+ 推荐) + webClient 扩展
对于 Spring Boot 2.4 以上版本还支持通过 Config Data Loader 模式来加载配置
Apollo 的 Config Data Loader 还提供了基于 webClient 的 http 客户端来替换原有的 http 客户端, 从而方便的对 http 客户端进行扩展
##### 3.2.1.5.1 添加 maven 依赖
webClient 可以基于多种实现 (reactor netty httpclient, jetty reactive httpclient, apache httpclient5), 所需添加的依赖如下
###### reactor netty httpclient
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- reactor netty httpclient -->
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
</dependency>
</dependencies>
```
###### jetty reactive httpclient
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- jetty reactive httpclient -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-reactive-httpclient</artifactId>
</dependency>
</dependencies>
```
###### apache httpclient5
spring boot 没有指定 apache httpclient5 的版本, 所以这里需要手动指定一下版本
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- apache httpclient5 -->
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-reactive</artifactId>
<version>5.1</version>
</dependency>
</dependencies>
```
##### 3.2.1.5.2 参照前述的方式配置 `app.id`, `env`, `apollo.meta`(或者 `apollo.config-service`), `apollo.cluster`
##### 3.2.1.5.3 配置 `application.properties` 或 `application.yml`
这里以默认 namespace 为例, namespace 的配置详见 3.2.1.4.3
```properties
spring.config.import=apollo://application
apollo.client.extension.enabled=true
```
##### 3.2.1.5.4 提供 spi 的实现
提供接口 `com.ctrip.framework.apollo.config.data.extension.webclient.customizer.spi.ApolloClientWebClientCustomizerFactory` 的 spi 实现
在配置了 `apollo.client.extension.enabled=true` 之后, Apollo 的 Config Data Loader 会尝试去加载该 spi 的实现类来定制 webClient
### 3.2.2 Spring Placeholder的使用
Spring应用通常会使用Placeholder来注入配置，使用的格式形如${someKey:someDefaultValue}，如${timeout:100}。冒号前面的是key，冒号后面的是默认值。
建议在实际使用时尽量给出默认值，以免由于key没有定义导致运行时错误。
从v0.10.0开始的版本支持placeholder在运行时自动更新，具体参见[PR #972](https://github.com/ctripcorp/apollo/pull/972)。
如果需要关闭placeholder在运行时自动更新功能，可以通过以下两种方式关闭：
1. 通过设置System Property `apollo.autoUpdateInjectedSpringProperties`，如启动时传入`-Dapollo.autoUpdateInjectedSpringProperties=false`
2. 通过设置META-INF/app.properties中的`apollo.autoUpdateInjectedSpringProperties`属性，如
```properties
app.id=SampleApp
apollo.autoUpdateInjectedSpringProperties=false
```
#### 3.2.2.1 XML使用方式
假设我有一个TestXmlBean，它有两个配置项需要注入：
```java
public class TestXmlBean {
private int timeout;
private int batch;
public void setTimeout(int timeout) {
this.timeout = timeout;
}
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
```
那么，我在XML中会使用如下方式来定义（假设应用默认的application namespace中有timeout和batch的配置项）：
```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/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
#### 3.2.2.2 Java Config使用方式
假设我有一个TestJavaConfigBean，通过Java Config的方式还可以使用@Value的方式注入：
```java
public class TestJavaConfigBean {
@Value("${timeout:100}")
private int timeout;
private int batch;
@Value("${batch:200}")
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
```
在Configuration类中按照下面的方式使用（假设应用默认的application namespace中有`timeout`和`batch`的配置项）：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
```
#### 3.2.2.3 ConfigurationProperties使用方式
Spring Boot提供了[@ConfigurationProperties](http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/ConfigurationProperties.html)把配置注入到bean对象中。
Apollo也支持这种方式，下面的例子会把`redis.cache.expireSeconds`和`redis.cache.commandTimeout`分别注入到SampleRedisConfig的`expireSeconds`和`commandTimeout`字段中。
```java
@ConfigurationProperties(prefix = "redis.cache")
public class SampleRedisConfig {
private int expireSeconds;
private int commandTimeout;
public void setExpireSeconds(int expireSeconds) {
this.expireSeconds = expireSeconds;
}
public void setCommandTimeout(int commandTimeout) {
this.commandTimeout = commandTimeout;
}
}
```
在Configuration类中按照下面的方式使用（假设应用默认的application namespace中有`redis.cache.expireSeconds`和`redis.cache.commandTimeout`的配置项）：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public SampleRedisConfig sampleRedisConfig() {
return new SampleRedisConfig();
}
}
```
需要注意的是，`@ConfigurationProperties`如果需要在Apollo配置变化时自动更新注入的值，需要配合使用[EnvironmentChangeEvent](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_environment_changes)或[RefreshScope](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_refresh_scope)。相关代码实现，可以参考apollo-use-cases项目中的[ZuulPropertiesRefresher.java](https://github.com/ctripcorp/apollo-use-cases/blob/master/spring-cloud-zuul/src/main/java/com/ctrip/framework/apollo/use/cases/spring/cloud/zuul/ZuulPropertiesRefresher.java#L48)和apollo-demo项目中的[SampleRedisConfig.java](https://github.com/ctripcorp/apollo/blob/master/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/config/SampleRedisConfig.java)以及[SpringBootApolloRefreshConfig.java](https://github.com/ctripcorp/apollo/blob/master/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java)
### 3.2.3 Spring Annotation支持
Apollo同时还增加了几个新的Annotation来简化在Spring环境中的使用。
1. @ApolloConfig
* 用来自动注入Config对象
2. @ApolloConfigChangeListener
* 用来自动注册ConfigChangeListener
3. @ApolloJsonValue
* 用来把配置的json字符串自动注入为对象
使用样例如下：
```java
public class TestApolloAnnotationBean {
@ApolloConfig
private Config config; //inject config for namespace application
@ApolloConfig("application")
private Config anotherConfig; //inject config for namespace application
@ApolloConfig("FX.apollo")
private Config yetAnotherConfig; //inject config for namespace FX.apollo
@ApolloConfig("application.yml")
private Config ymlConfig; //inject config for namespace application.yml
/**
* ApolloJsonValue annotated on fields example, the default value is specified as empty list - []
* <br />
* jsonBeanProperty=[{"someString":"hello","someInt":100},{"someString":"world!","someInt":200}]
*/
@ApolloJsonValue("${jsonBeanProperty:[]}")
private List<JsonBean> anotherJsonBeans;
@Value("${batch:100}")
private int batch;
//config change listener for namespace application
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
//update injected value of batch if it is changed in Apollo
if (changeEvent.isChanged("batch")) {
batch = config.getIntProperty("batch", 100);
}
}
//config change listener for namespace application
@ApolloConfigChangeListener("application")
private void anotherOnChange(ConfigChangeEvent changeEvent) {
//do something
}
//config change listener for namespaces application, FX.apollo and application.yml
@ApolloConfigChangeListener({"application", "FX.apollo", "application.yml"})
private void yetAnotherOnChange(ConfigChangeEvent changeEvent) {
//do something
}
//example of getting config from Apollo directly
//this will always return the latest value of timeout
public int getTimeout() {
return config.getIntProperty("timeout", 200);
}
//example of getting config from injected value
//the program needs to update the injected value when batch is changed in Apollo using @ApolloConfigChangeListener shown above
public int getBatch() {
return this.batch;
}
private static class JsonBean{
private String someString;
private int someInt;
}
}
```
在Configuration类中按照下面的方式使用：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestApolloAnnotationBean testApolloAnnotationBean() {
return new TestApolloAnnotationBean();
}
}
```
### 3.2.4 已有配置迁移
很多情况下，应用可能已经有不少配置了，比如Spring Boot的应用，就会有bootstrap.properties/yml, application.properties/yml等配置。
在应用接入Apollo之后，这些配置是可以非常方便的迁移到Apollo的，具体步骤如下：
1. 在Apollo为应用新建项目
2. 在应用中配置好META-INF/app.properties
3. 建议把原先配置先转为properties格式，然后通过Apollo提供的文本编辑模式全部粘帖到应用的application namespace，发布配置
* 如果原来格式是yml，可以使用[YamlPropertiesFactoryBean.getObject](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.html#getObject--)转成properties格式
4. 如果原来是yml，想继续使用yml来编辑配置，那么可以创建私有的application.yml namespace，把原来的配置全部粘贴进去，发布配置
* 需要apollo-client是1.3.0及以上版本
5. 把原先的配置文件如bootstrap.properties/yml, application.properties/yml从项目中删除
* 如果需要保留本地配置文件，需要注意部分配置如`server.port`必须确保本地文件已经删除该配置项
如：
```properties
spring.application.name = reservation-service
server.port = 8080
logging.level = ERROR
eureka.client.serviceUrl.defaultZone = http://127.0.0.1:8761/eureka/
eureka.client.healthcheck.enabled = true
eureka.client.registerWithEureka = true
eureka.client.fetchRegistry = true
eureka.client.eurekaServiceUrlPollIntervalSeconds = 60
eureka.instance.preferIpAddress = true
```
## 3.3 Demo
项目中有一个样例客户端的项目：`apollo-demo`，具体信息可以参考[Apollo开发指南](zh/development/apollo-development-guide)中的[2.3 Java样例客户端启动](zh/development/apollo-development-guide?id=_23-java样例客户端启动)部分。
更多使用案例Demo可以参考[Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)。
# 四、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖，单位为分钟。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
# 五、本地开发模式
Apollo客户端还支持本地开发模式，这个主要用于当开发环境无法连接Apollo服务器的时候，比如在邮轮、飞机上做相关功能开发。
在本地开发模式下，Apollo只会从本地文件读取配置信息，不会从Apollo服务器读取配置。
可以通过下面的步骤开启Apollo本地开发模式。
## 5.1 修改环境
修改/opt/settings/server.properties（Mac/Linux）或C:\opt\settings\server.properties（Windows）文件，设置env为Local：
```properties
env=Local
```
更多配置环境的方式请参考[1.2.4.1 Environment](#_1241-environment)
## 5.2 准备本地配置文件
在本地开发模式下，Apollo客户端会从本地读取文件，所以我们需要事先准备好配置文件。
### 5.2.1 本地配置目录
本地配置目录位于：
* **Mac/Linux**: /opt/data/{_appId_}/config-cache
* **Windows**: C:\opt\data\\{_appId_}\config-cache
appId就是应用的appId，如100004458。
请确保该目录存在，且应用程序对该目录有读权限。
**【小技巧】** 推荐的方式是先在普通模式下使用Apollo，这样Apollo会自动创建该目录并在目录下生成配置文件。
### 5.2.2 本地配置文件
本地配置文件需要按照一定的文件名格式放置于本地配置目录下，文件名格式如下：
**_{appId}+{cluster}+{namespace}.properties_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用的配置namespace，一般是application
文件内容以properties格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```properties
request.timeout=2000
batch=2000
```
## 5.3 修改配置
在本地开发模式下，Apollo不会实时监测文件内容是否有变化，所以如果修改了配置，需要重启应用生效。
# 六、测试模式
1.1.0版本开始增加了`apollo-mockserver`，从而可以很好地支持单元测试时需要mock配置的场景，使用方法如下：
## 6.1 引入pom依赖
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-mockserver</artifactId>
<version>1.7.0</version>
</dependency>
```
## 6.2 在test的resources下放置mock的数据
文件名格式约定为`mockdata-{namespace}.properties`
## 6.3 写测试类
更多使用demo可以参考[ApolloMockServerApiTest.java](https://github.com/ctripcorp/apollo/blob/master/apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerApiTest.java)和[ApolloMockServerSpringIntegrationTest.java](https://github.com/ctripcorp/apollo/blob/master/apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerSpringIntegrationTest.java)。
```java
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = TestConfiguration.class)
public class SpringIntegrationTest {
// 启动apollo的mockserver
@ClassRule
public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
@Test
@DirtiesContext // 这个注解很有必要，因为配置注入会弄脏应用上下文
public void testPropertyInject(){
assertEquals("value1", testBean.key1);
assertEquals("value2", testBean.key2);
}
@Test
@DirtiesContext
public void testListenerTriggeredByAdd() throws InterruptedException, ExecutionException, TimeoutException {
String otherNamespace = "othernamespace";
embeddedApollo.addOrModifyPropery(otherNamespace,"someKey","someValue");
ConfigChangeEvent changeEvent = testBean.futureData.get(5000, TimeUnit.MILLISECONDS);
assertEquals(otherNamespace, changeEvent.getNamespace());
assertEquals("someValue", changeEvent.getChange("someKey").getNewValue());
}
@EnableApolloConfig("application")
@Configuration
static class TestConfiguration{
@Bean
public TestBean testBean(){
return new TestBean();
}
}
static class TestBean{
@Value("${key1:default}")
String key1;
@Value("${key2:default}")
String key2;
SettableFuture<ConfigChangeEvent> futureData = SettableFuture.create();
@ApolloConfigChangeListener("othernamespace")
private void onChange(ConfigChangeEvent changeEvent) {
futureData.set(changeEvent);
}
}
}
```
| >注意：本文档适用对象是Apollo系统的使用者，如果你是公司内Apollo系统的开发者/维护人员，建议先参考[Apollo开发指南](zh/development/apollo-development-guide)。
#
# 一、准备工作
## 1.1 环境要求
* Java: 1.7+
* Guava: 15.0+
* Apollo客户端默认会引用Guava 19，如果你的项目引用了其它版本，请确保版本号大于等于15.0
>注：对于Apollo客户端，如果有需要的话，可以做少量代码修改来降级到Java 1.6，详细信息可以参考[Issue 483](https://github.com/ctripcorp/apollo/issues/483)
## 1.2 必选设置
Apollo客户端依赖于`AppId`，`Apollo Meta Server`等环境信息来工作，所以请确保阅读下面的说明并且做正确的配置：
### 1.2.1 AppId
AppId是应用的身份信息，是从服务端获取配置的一个重要信息。
有以下几种方式设置，按照优先级从高到低分别为：
1. System Property
Apollo 0.7.0+支持通过System Property传入app.id信息，如
```bash
-Dapp.id=YOUR-APP-ID
```
2. 操作系统的System Environment
Apollo 1.4.0+支持通过操作系统的System Environment `APP_ID`来传入app.id信息，如
```bash
APP_ID=YOUR-APP-ID
```
3. Spring Boot application.properties
Apollo 1.0.0+支持通过Spring Boot的application.properties文件配置，如
```properties
app.id=YOUR-APP-ID
```
> 该配置方式不适用于多个war包部署在同一个tomcat的使用场景
4. app.properties
确保classpath:/META-INF/app.properties文件存在，并且其中内容形如：
>app.id=YOUR-APP-ID
文件位置参考如下：
> 注：app.id是用来标识应用身份的唯一id，格式为string。
### 1.2.2 Apollo Meta Server
Apollo支持应用在不同的环境有不同的配置，所以需要在运行提供给Apollo客户端当前环境的[Apollo Meta Server](zh/design/apollo-design?id=_133-meta-server)信息。默认情况下，meta server和config service是部署在同一个JVM进程，所以meta server的地址就是config service的地址。
为了实现meta server的高可用，推荐通过SLB（Software Load Balancer）做动态负载均衡。Meta server地址也可以填入IP，如`http://1.1.1.1:8080,http://2.2.2.2:8080`，不过生产环境还是建议使用域名（走slb），因为机器扩容、缩容等都可能导致IP列表的变化。
1.0.0版本开始支持以下方式配置apollo meta server信息，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.meta`
* 可以通过Java的System Property `apollo.meta`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.meta=http://config-service-url`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.meta=http://config-service-url -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.meta", "http://config-service-url");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.meta=http://config-service-url`
> 该配置方式不适用于多个war包部署在同一个tomcat的使用场景
3. 通过操作系统的System Environment`APOLLO_META`
* 可以通过操作系统的System Environment `APOLLO_META`来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.meta=http://config-service-url`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
5. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.meta=http://config-service-url`
6. 通过Java system property `${env}_meta`
* 如果当前[env](#_1241-environment)是`dev`，那么用户可以配置`-Ddev_meta=http://config-service-url`
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
7. 通过操作系统的System Environment `${ENV}_META` (1.2.0版本开始支持)
* 如果当前[env](#_1241-environment)是`dev`，那么用户可以配置操作系统的System Environment `DEV_META=http://config-service-url`
* 注意key为全大写
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
8. 通过`apollo-env.properties`文件
* 用户也可以创建一个`apollo-env.properties`，放在程序的classpath下，或者放在spring boot应用的config目录下
* 使用该配置方式，那么就必须要正确配置Environment，详见[1.2.4.1 Environment](#_1241-environment)
* 文件内容形如：
```properties
dev.meta=http://1.1.1.1:8080
fat.meta=http://apollo.fat.xxx.com
uat.meta=http://apollo.uat.xxx.com
pro.meta=http://apollo.xxx.com
```
> 如果通过以上各种手段都无法获取到Meta Server地址，Apollo最终会fallback到`http://apollo.meta`作为Meta Server地址
#### 1.2.2.1 自定义Apollo Meta Server地址定位逻辑
在1.0.0版本中，Apollo提供了[MetaServerProvider SPI](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/spi/MetaServerProvider.java)，用户可以注入自己的MetaServerProvider来自定义Meta Server地址定位逻辑。
由于我们使用典型的[Java Service Loader模式](https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html)，所以实现起来还是比较简单的。
有一点需要注意的是，apollo会在运行时按照顺序遍历所有的MetaServerProvider，直到某一个MetaServerProvider提供了一个非空的Meta Server地址，因此用户需要格外注意自定义MetaServerProvider的Order。规则是较小的Order具有较高的优先级，因此Order=0的MetaServerProvider会排在Order=1的MetaServerProvider的前面。
**如果你的公司有很多应用需要接入Apollo，建议封装一个jar包，然后提供自定义的Apollo Meta Server定位逻辑，从而可以让接入Apollo的应用零配置使用。比如自己写一个`xx-company-apollo-client`，该jar包依赖`apollo-client`，在该jar包中通过spi方式定义自定义的MetaServerProvider实现，然后应用直接依赖`xx-company-apollo-client`即可。**
MetaServerProvider的实现可以参考[LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)和[DefaultMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java)。
#### 1.2.2.2 跳过Apollo Meta Server服务发现
> 适用于apollo-client 0.11.0及以上版本
一般情况下都建议使用Apollo的Meta Server机制来实现Config Service的服务发现，从而可以实现Config Service的高可用。不过apollo-client也支持跳过Meta Server服务发现，主要用于以下场景：
1. Config Service部署在公有云上，注册到Meta Server的是内网地址，本地开发环境无法直接连接
* 如果通过公网 SLB 对外暴露 Config Service的话，记得要设置 IP 白名单，避免数据泄露
2. Config Service部署在docker环境中，注册到Meta Server的是docker内网地址，本地开发环境无法直接连接
3. Config Service部署在kubernetes中，希望使用kubernetes自带的服务发现能力（Service）
针对以上场景，可以通过直接指定Config Service地址的方式来跳过Meta Server服务发现，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.config-service`(1.9.0+) 或者 `apollo.configService`(1.9.0之前)
* 可以通过Java的System Property `apollo.config-service`(1.9.0+) 或者 `apollo.configService`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.config-service=http://config-service-url:port`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.configService=http://config-service-url:port -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.config-service", "http://config-service-url:port");`
2. 通过操作系统的System Environment `APOLLO_CONFIG_SERVICE`(1.9.0+) 或者 `APOLLO_CONFIGSERVICE`(1.9.0之前)
* 可以通过操作系统的System Environment `APOLLO_CONFIG_SERVICE`(1.9.0+) 或者 `APOLLO_CONFIGSERVICE`(1.9.0之前)来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.config-service=http://config-service-url:port`(1.9.0+) 或者 `apollo.configService=http://config-service-url:port`(1.9.0之前)
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
### 1.2.3 本地缓存路径
Apollo客户端会把从服务端获取到的配置在本地文件系统缓存一份，用于在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置，不影响应用正常运行。
本地缓存路径默认位于以下路径，所以请确保`/opt/data`或`C:\opt\data\`目录存在，且应用有读写权限。
* **Mac/Linux**: /opt/data/{_appId_}/config-cache
* **Windows**: C:\opt\data\\{_appId_}\config-cache
本地配置文件会以下面的文件名格式放置于本地缓存路径下：
**_{appId}+{cluster}+{namespace}.properties_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用的配置namespace，一般是application
文件内容以properties格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```properties
request.timeout=2000
batch=2000
```
#### 1.2.3.1 自定义缓存路径
1.0.0版本开始支持以下方式自定义缓存路径，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.cache-dir`(1.9.0+) 或者 `apollo.cacheDir`(1.9.0之前)
* 可以通过Java的System Property `apollo.cache-dir`(1.9.0+) 或者 `apollo.cacheDir`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
* 如果是运行jar文件，需要注意格式是`java -Dapollo.cache-dir=/opt/data/some-cache-dir -jar xxx.jar`(1.9.0+) 或者 `java -Dapollo.cacheDir=/opt/data/some-cache-dir -jar xxx.jar`(1.9.0之前)
* 也可以通过程序指定，如`System.setProperty("apollo.cache-dir", "/opt/data/some-cache-dir");`(1.9.0+) 或者 `System.setProperty("apollo.cacheDir", "/opt/data/some-cache-dir");`(1.9.0之前)
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
3. 通过操作系统的System Environment`APOLLO_CACHE_DIR`(1.9.0+) 或者 `APOLLO_CACHEDIR`(1.9.0之前)
* 可以通过操作系统的System Environment `APOLLO_CACHE_DIR`(1.9.0+) 或者 `APOLLO_CACHEDIR`(1.9.0之前)来指定
* 注意key为全大写，且中间是`_`分隔
4. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`apollo.cache-dir=/opt/data/some-cache-dir`(1.9.0+) 或者 `apollo.cacheDir=/opt/data/some-cache-dir`(1.9.0之前)
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
> 注：本地缓存路径也可用于容灾目录，如果应用在所有config service都挂掉的情况下需要扩容，那么也可以先把配置从已有机器上的缓存路径复制到新机器上的相同缓存路径
### 1.2.4 可选设置
#### 1.2.4.1 Environment
Environment可以通过以下3种方式的任意一个配置：
1. 通过Java System Property
* 可以通过Java的System Property `env`来指定环境
* 在Java程序启动脚本中，可以指定`-Denv=YOUR-ENVIRONMENT`
* 如果是运行jar文件，需要注意格式是`java -Denv=YOUR-ENVIRONMENT -jar xxx.jar`
* 注意key为全小写
2. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `ENV`来指定
* 注意key为全大写
3. 通过配置文件
* 最后一个推荐的方式是通过配置文件来指定`env=YOUR-ENVIRONMENT`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
文件内容形如：
```properties
env=DEV
```
目前，`env`支持以下几个值（大小写不敏感）：
* DEV
* Development environment
* FAT
* Feature Acceptance Test environment
* UAT
* User Acceptance Test environment
* PRO
* Production environment
更多环境定义，可以参考[Env.java](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)
#### 1.2.4.2 Cluster（集群）
Apollo支持配置按照集群划分，也就是说对于一个appId和一个环境，对不同的集群可以有不同的配置。
1.0.0版本开始支持以下方式集群，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.cluster`
* 可以通过Java的System Property `apollo.cluster`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.cluster=SomeCluster`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.cluster=SomeCluster -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.cluster", "SomeCluster");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.cluster=SomeCluster`
3. 通过Java System Property
* 可以通过Java的System Property `idc`来指定环境
* 在Java程序启动脚本中，可以指定`-Didc=xxx`
* 如果是运行jar文件，需要注意格式是`java -Didc=xxx -jar xxx.jar`
* 注意key为全小写
4. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `IDC`来指定
* 注意key为全大写
5. 通过`server.properties`配置文件
* 可以在`server.properties`配置文件中指定`idc=xxx`
* 对于Mac/Linux，默认文件位置为`/opt/settings/server.properties`
* 对于Windows，默认文件位置为`C:\opt\settings\server.properties`
**Cluster Precedence**（集群顺序）
1. 如果`apollo.cluster`和`idc`同时指定：
* 我们会首先尝试从`apollo.cluster`指定的集群加载配置
* 如果没找到任何配置，会尝试从`idc`指定的集群加载配置
* 如果还是没找到，会从默认的集群（`default`）加载
2. 如果只指定了`apollo.cluster`：
* 我们会首先尝试从`apollo.cluster`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
3. 如果只指定了`idc`：
* 我们会首先尝试从`idc`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
4. 如果`apollo.cluster`和`idc`都没有指定：
* 我们会从默认的集群（`default`）加载配置
#### 1.2.4.3 设置内存中的配置项是否保持和页面上的顺序一致
> 适用于1.6.0及以上版本
默认情况下，apollo client内存中的配置存放在Properties中（底下是Hashtable），不会刻意保持和页面上看到的顺序一致，对绝大部分的场景是没有影响的。不过有些场景会强依赖配置项的顺序（如spring cloud zuul的路由规则），针对这种情况，可以开启OrderedProperties特性来使得内存中的配置顺序和页面上看到的一致。
配置方式按照优先级从高到低分别为：
1. 通过Java System Property `apollo.property.order.enable`
* 可以通过Java的System Property `apollo.property.order.enable`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.property.order.enable=true`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.property.order.enable=true -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.property.order.enable", "true");`
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.property.order.enable=true`
3. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.property.order.enable=true`
#### 1.2.4.4 配置访问密钥
> 适用于1.6.0及以上版本
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
配置方式按照优先级从高到低分别为：
1. 通过Java System Property `apollo.access-key.secret`(1.9.0+) 或者 `apollo.accesskey.secret`(1.9.0之前)
* 可以通过Java的System Property `apollo.access-key.secret`(1.9.0+) 或者 `apollo.accesskey.secret`(1.9.0之前)来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `-Dapollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
* 如果是运行jar文件，需要注意格式是`java -Dapollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719 -jar xxx.jar`(1.9.0+) 或者 `java -Dapollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719 -jar xxx.jar`(1.9.0之前)
* 也可以通过程序指定，如`System.setProperty("apollo.access-key.secret", "1cf998c4e2ad4704b45a98a509d15719");`(1.9.0+) 或者 `System.setProperty("apollo.accesskey.secret", "1cf998c4e2ad4704b45a98a509d15719");`(1.9.0之前)
2. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `apollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
3. 通过操作系统的System Environment
* 还可以通过操作系统的System Environment `APOLLO_ACCESS_KEY_SECRET`(1.9.0+) 或者 `APOLLO_ACCESSKEY_SECRET`(1.9.0之前)来指定
* 注意key为全大写
4. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.access-key.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0+) 或者 `apollo.accesskey.secret=1cf998c4e2ad4704b45a98a509d15719`(1.9.0之前)
#### 1.2.4.5 自定义server.properties路径
> 适用于1.8.0及以上版本
1.8.0版本开始支持以下方式自定义server.properties路径，按照优先级从高到低分别为：
1. 通过Java System Property `apollo.path.server.properties`
* 可以通过Java的System Property `apollo.path.server.properties`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.path.server.properties=/some-dir/some-file.properties`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.path.server.properties=/some-dir/some-file.properties -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.path.server.properties", "/some-dir/some-file.properties");`
2. 通过操作系统的System Environment`APOLLO_PATH_SERVER_PROPERTIES`
* 可以通过操作系统的System Environment `APOLLO_PATH_SERVER_PROPERTIES`来指定
* 注意key为全大写，且中间是`_`分隔
#### 1.2.4.6 开启`propertyNames`缓存，在大量配置场景下可以显著改善启动速度
> 适用于1.9.0及以上版本
在使用`@ConfigurationProperties`和存在大量配置项场景下，Spring容器的启动速度会变慢。通过开启该配置可以显著提升启动速度，当配置发生变化时缓存会自动清理，默认为`false`。详见：[issue 3800](https://github.com/ctripcorp/apollo/issues/3800)
配置方式按照优先级从高到低依次为：
1. 通过Java System Property `apollo.property.names.cache.enable`
* 可以通过Java的System Property `apollo.property.names.cache.enable`来指定
* 在Java程序启动脚本中，可以指定`-Dapollo.property.names.cache.enable=true`
* 如果是运行jar文件，需要注意格式是`java -Dapollo.property.names.cache.enable=true -jar xxx.jar`
* 也可以通过程序指定，如`System.setProperty("apollo.property.names.cache.enable", "true");`
2. 通过系统环境变量
* 在启动程序前配置环境变量`APOLLO_PROPERTY_NAMES_CACHE_ENABLE=true`来指定
* 注意key为全大写，且中间是`_`分隔
3. 通过Spring Boot的配置文件
* 可以在Spring Boot的`application.properties`或`bootstrap.properties`中指定`apollo.property.names.cache.enable=true`
4. 通过`app.properties`配置文件
* 可以在`classpath:/META-INF/app.properties`指定`apollo.property.names.cache.enable=true`
# 二、Maven Dependency
Apollo的客户端jar包已经上传到中央仓库，应用在实际使用时只需要按照如下方式引入即可。
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>1.7.0</version>
</dependency>
```
# 三、客户端用法
Apollo支持API方式和Spring整合方式，该怎么选择用哪一种方式？
* API方式灵活，功能完备，配置值实时更新（热发布），支持所有Java环境。
* Spring方式接入简单，结合Spring有N种酷炫的玩法，如
* Placeholder方式：
* 代码中直接使用，如：`@Value("${someKeyFromApollo:someDefaultValue}")`
* 配置文件中使用替换placeholder，如：`spring.datasource.url: ${someKeyFromApollo:someDefaultValue}`
* 直接托管spring的配置，如在apollo中直接配置`spring.datasource.url=jdbc:mysql://localhost:3306/somedb?characterEncoding=utf8`
* Spring boot的[@ConfigurationProperties](http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/ConfigurationProperties.html)方式
* 从v0.10.0开始的版本支持placeholder在运行时自动更新，具体参见[PR #972](https://github.com/ctripcorp/apollo/pull/972)。（v0.10.0之前的版本在配置变化后不会重新注入，需要重启才会更新，如果需要配置值实时更新，可以参考后续[3.2.2 Spring Placeholder的使用](#_322-spring-placeholder的使用)的说明）
* Spring方式也可以结合API方式使用，如注入Apollo的Config对象，就可以照常通过API方式获取配置了：
```java
@ApolloConfig
private Config config; //inject config for namespace application
```
* 更多有意思的实际使用场景和示例代码，请参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)
## 3.1 API使用方式
API方式是最简单、高效使用Apollo配置的方式，不依赖Spring框架即可使用。
### 3.1.1 获取默认namespace的配置（application）
```java
Config config = ConfigService.getAppConfig(); //config instance is singleton for each namespace and is never null
String someKey = "someKeyFromDefaultNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
通过上述的**config.getProperty**可以获取到someKey对应的实时最新的配置值。
另外，配置值从内存中获取，所以不需要应用自己做缓存。
### 3.1.2 监听配置变化事件
监听配置变化事件只在应用真的关心配置变化，需要在配置变化时得到通知时使用，比如：数据库连接串变化后需要重建连接等。
如果只是希望每次都取到最新的配置的话，只需要按照上面的例子，调用**config.getProperty**即可。
```java
Config config = ConfigService.getAppConfig(); //config instance is singleton for each namespace and is never null
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
System.out.println("Changes for namespace " + changeEvent.getNamespace());
for (String key : changeEvent.changedKeys()) {
ConfigChange change = changeEvent.getChange(key);
System.out.println(String.format("Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType()));
}
}
});
```
### 3.1.3 获取公共Namespace的配置
```java
String somePublicNamespace = "CAT";
Config config = ConfigService.getConfig(somePublicNamespace); //config instance is singleton for each namespace and is never null
String someKey = "someKeyFromPublicNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
### 3.1.4 获取非properties格式namespace的配置
#### 3.1.4.1 yaml/yml格式的namespace
apollo-client 1.3.0版本开始对yaml/yml做了更好的支持，使用起来和properties格式一致。
```java
Config config = ConfigService.getConfig("application.yml");
String someKey = "someKeyFromYmlNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
String value = config.getProperty(someKey, someDefaultValue);
```
#### 3.1.4.2 非yaml/yml格式的namespace
获取时需要使用`ConfigService.getConfigFile`接口并指定Format，如`ConfigFileFormat.XML`。
```java
String someNamespace = "test";
ConfigFile configFile = ConfigService.getConfigFile("test", ConfigFileFormat.XML);
String content = configFile.getContent();
```
## 3.2 Spring整合方式
### 3.2.1 配置
Apollo也支持和Spring整合（Spring 3.1.1+），只需要做一些简单的配置就可以了。
Apollo目前既支持比较传统的`基于XML`的配置，也支持目前比较流行的`基于Java（推荐）`的配置。
如果是Spring Boot环境，建议参照[3.2.1.3 Spring Boot集成方式（推荐）](#_3213-spring-boot集成方式（推荐）)配置。
需要注意的是，如果之前有使用`org.springframework.beans.factory.config.PropertyPlaceholderConfigurer`的，请替换成`org.springframework.context.support.PropertySourcesPlaceholderConfigurer`。Spring 3.1以后就不建议使用PropertyPlaceholderConfigurer了，要改用PropertySourcesPlaceholderConfigurer。
如果之前有使用`<context:property-placeholder>`，请注意xml中引入的`spring-context.xsd`版本需要是3.1以上（一般只要没有指定版本会自动升级的），建议使用不带版本号的形式引入，如：`http://www.springframework.org/schema/context/spring-context.xsd`
> 注1：yaml/yml格式的namespace从1.3.0版本开始支持和Spring整合，注入时需要填写带后缀的完整名字，比如application.yml
> 注2：非properties、非yaml/yml格式（如xml，json等）的namespace暂不支持和Spring整合。
#### 3.2.1.1 基于XML的配置
>注：需要把apollo相关的xml namespace加到配置文件头上，不然会报xml语法错误。
1.注入默认namespace的配置到Spring中
```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注入application namespace的配置到Spring环境中 -->
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
2.注入多个namespace的配置到Spring中
```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注入application namespace的配置到Spring环境中 -->
<apollo:config/>
<!-- 这个是稍微复杂一些的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中 -->
<apollo:config namespaces="FX.apollo,application.yml"/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
3.注入多个namespace，并且指定顺序
Spring的配置是有顺序的，如果多个property source都有同一个key，那么最终是顺序在前的配置生效。
<apollo:config>如果不指定order，那么默认是最低优先级。
```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 order="2"/>
<!-- 这个是最复杂的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中，并且顺序在application前面 -->
<apollo:config namespaces="FX.apollo,application.yml" order="1"/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
#### 3.2.1.2 基于Java的配置（推荐）
相对于基于XML的配置，基于Java的配置是目前比较流行的方式。
注意`@EnableApolloConfig`要和`@Configuration`一起使用，不然不会生效。
1.注入默认namespace的配置到Spring中
```java
//这个是最简单的配置形式，一般应用用这种形式就可以了，用来指示Apollo注入application namespace的配置到Spring环境中
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
```
2.注入多个namespace的配置到Spring中
```java
@Configuration
@EnableApolloConfig
public class SomeAppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
//这个是稍微复杂一些的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中
@Configuration
@EnableApolloConfig({"FX.apollo", "application.yml"})
public class AnotherAppConfig {}
```
3.注入多个namespace，并且指定顺序
```java
//这个是最复杂的配置形式，指示Apollo注入FX.apollo和application.yml namespace的配置到Spring环境中，并且顺序在application前面
@Configuration
@EnableApolloConfig(order = 2)
public class SomeAppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
@Configuration
@EnableApolloConfig(value = {"FX.apollo", "application.yml"}, order = 1)
public class AnotherAppConfig {}
```
#### 3.2.1.3 Spring Boot集成方式（推荐）
Spring Boot除了支持上述两种集成方式以外，还支持通过application.properties/bootstrap.properties来配置，该方式能使配置在更早的阶段注入，比如使用`@ConditionalOnProperty`的场景或者是有一些spring-boot-starter在启动阶段就需要读取配置做一些事情（如[dubbo-spring-boot-project](https://github.com/apache/incubator-dubbo-spring-boot-project)），所以对于Spring Boot环境建议通过以下方式来接入Apollo(需要0.10.0及以上版本）。
使用方式很简单，只需要在application.properties/bootstrap.properties中按照如下样例配置即可。
1. 注入默认`application` namespace的配置示例
```properties
# will inject 'application' namespace in bootstrap phase
apollo.bootstrap.enabled = true
```
2. 注入非默认`application` namespace或多个namespace的配置示例
```properties
apollo.bootstrap.enabled = true
# will inject 'application', 'FX.apollo' and 'application.yml' namespaces in bootstrap phase
apollo.bootstrap.namespaces = application,FX.apollo,application.yml
```
3. 将Apollo配置加载提到初始化日志系统之前(1.2.0+)
从1.2.0版本开始，如果希望把日志相关的配置（如`logging.level.root=info`或`logback-spring.xml`中的参数）也放在Apollo管理，那么可以额外配置`apollo.bootstrap.eagerLoad.enabled=true`来使Apollo的加载顺序放到日志系统加载之前，更多信息可以参考[PR 1614](https://github.com/ctripcorp/apollo/pull/1614)。参考配置示例如下：
```properties
# will inject 'application' namespace in bootstrap phase
apollo.bootstrap.enabled = true
# put apollo initialization before logging system initialization
apollo.bootstrap.eagerLoad.enabled=true
```
#### 3.2.1.4 Spring Boot Config Data Loader (Spring Boot 2.4+, Apollo Client 1.9.0+ 推荐)
对于 Spring Boot 2.4 以上版本还支持通过 Config Data Loader 模式来加载配置
##### 3.2.1.4.1 添加 maven 依赖
apollo-client-config-data 已经依赖了 apollo-client, 所以只需要添加这一个依赖即可, 无需再添加 apollo-client 的依赖
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
</dependencies>
```
##### 3.2.1.4.2 参照前述的方式配置 `app.id`, `env`, `apollo.meta`(或者 `apollo.config-service`), `apollo.cluster`
##### 3.2.1.4.3 配置 `application.properties` 或 `application.yml`
使用默认的 namespace `application`
```properties
# old way
# apollo.bootstrap.enabled=true
# 不配置 apollo.bootstrap.namespaces
# new way
spring.config.import=apollo://
```
或者
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=application
# new way
spring.config.import=apollo://application
```
使用自定义 namespace
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=your-namespace
# new way
spring.config.import=apollo://your-namespace
```
使用多个 namespaces
注: `spring.config.import` 是从后往前加载配置的, 而 `apollo.bootstrap.namespaces` 是从前往后加载的, 刚好相反。为了保证和原有逻辑一致, 请颠倒 namespaces 的顺序
```properties
# old way
# apollo.bootstrap.enabled=true
# apollo.bootstrap.namespaces=namespace1,namespace2,namespace3
# new way
spring.config.import=apollo://namespace3, apollo://namespace2, apollo://namespace1
```
#### 3.2.1.5 Spring Boot Config Data Loader (Spring Boot 2.4+, Apollo Client 1.9.0+ 推荐) + webClient 扩展
对于 Spring Boot 2.4 以上版本还支持通过 Config Data Loader 模式来加载配置
Apollo 的 Config Data Loader 还提供了基于 webClient 的 http 客户端来替换原有的 http 客户端, 从而方便的对 http 客户端进行扩展
##### 3.2.1.5.1 添加 maven 依赖
webClient 可以基于多种实现 (reactor netty httpclient, jetty reactive httpclient, apache httpclient5), 所需添加的依赖如下
###### reactor netty httpclient
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- reactor netty httpclient -->
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
</dependency>
</dependencies>
```
###### jetty reactive httpclient
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- jetty reactive httpclient -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-reactive-httpclient</artifactId>
</dependency>
</dependencies>
```
###### apache httpclient5
spring boot 没有指定 apache httpclient5 的版本, 所以这里需要手动指定一下版本
```xml
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client-config-data</artifactId>
<version>1.9.0</version>
</dependency>
<!-- webclient -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<!-- apache httpclient5 -->
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-reactive</artifactId>
<version>5.1</version>
</dependency>
</dependencies>
```
##### 3.2.1.5.2 参照前述的方式配置 `app.id`, `env`, `apollo.meta`(或者 `apollo.config-service`), `apollo.cluster`
##### 3.2.1.5.3 配置 `application.properties` 或 `application.yml`
这里以默认 namespace 为例, namespace 的配置详见 3.2.1.4.3
```properties
spring.config.import=apollo://application
apollo.client.extension.enabled=true
```
##### 3.2.1.5.4 提供 spi 的实现
提供接口 `com.ctrip.framework.apollo.config.data.extension.webclient.customizer.spi.ApolloClientWebClientCustomizerFactory` 的 spi 实现
在配置了 `apollo.client.extension.enabled=true` 之后, Apollo 的 Config Data Loader 会尝试去加载该 spi 的实现类来定制 webClient
### 3.2.2 Spring Placeholder的使用
Spring应用通常会使用Placeholder来注入配置，使用的格式形如${someKey:someDefaultValue}，如${timeout:100}。冒号前面的是key，冒号后面的是默认值。
建议在实际使用时尽量给出默认值，以免由于key没有定义导致运行时错误。
从v0.10.0开始的版本支持placeholder在运行时自动更新，具体参见[PR #972](https://github.com/ctripcorp/apollo/pull/972)。
如果需要关闭placeholder在运行时自动更新功能，可以通过以下两种方式关闭：
1. 通过设置System Property `apollo.autoUpdateInjectedSpringProperties`，如启动时传入`-Dapollo.autoUpdateInjectedSpringProperties=false`
2. 通过设置META-INF/app.properties中的`apollo.autoUpdateInjectedSpringProperties`属性，如
```properties
app.id=SampleApp
apollo.autoUpdateInjectedSpringProperties=false
```
#### 3.2.2.1 XML使用方式
假设我有一个TestXmlBean，它有两个配置项需要注入：
```java
public class TestXmlBean {
private int timeout;
private int batch;
public void setTimeout(int timeout) {
this.timeout = timeout;
}
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
```
那么，我在XML中会使用如下方式来定义（假设应用默认的application namespace中有timeout和batch的配置项）：
```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/>
<bean class="com.ctrip.framework.apollo.spring.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
```
#### 3.2.2.2 Java Config使用方式
假设我有一个TestJavaConfigBean，通过Java Config的方式还可以使用@Value的方式注入：
```java
public class TestJavaConfigBean {
@Value("${timeout:100}")
private int timeout;
private int batch;
@Value("${batch:200}")
public void setBatch(int batch) {
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
}
```
在Configuration类中按照下面的方式使用（假设应用默认的application namespace中有`timeout`和`batch`的配置项）：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestJavaConfigBean javaConfigBean() {
return new TestJavaConfigBean();
}
}
```
#### 3.2.2.3 ConfigurationProperties使用方式
Spring Boot提供了[@ConfigurationProperties](http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/ConfigurationProperties.html)把配置注入到bean对象中。
Apollo也支持这种方式，下面的例子会把`redis.cache.expireSeconds`和`redis.cache.commandTimeout`分别注入到SampleRedisConfig的`expireSeconds`和`commandTimeout`字段中。
```java
@ConfigurationProperties(prefix = "redis.cache")
public class SampleRedisConfig {
private int expireSeconds;
private int commandTimeout;
public void setExpireSeconds(int expireSeconds) {
this.expireSeconds = expireSeconds;
}
public void setCommandTimeout(int commandTimeout) {
this.commandTimeout = commandTimeout;
}
}
```
在Configuration类中按照下面的方式使用（假设应用默认的application namespace中有`redis.cache.expireSeconds`和`redis.cache.commandTimeout`的配置项）：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public SampleRedisConfig sampleRedisConfig() {
return new SampleRedisConfig();
}
}
```
需要注意的是，`@ConfigurationProperties`如果需要在Apollo配置变化时自动更新注入的值，需要配合使用[EnvironmentChangeEvent](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_environment_changes)或[RefreshScope](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_refresh_scope)。相关代码实现，可以参考apollo-use-cases项目中的[ZuulPropertiesRefresher.java](https://github.com/ctripcorp/apollo-use-cases/blob/master/spring-cloud-zuul/src/main/java/com/ctrip/framework/apollo/use/cases/spring/cloud/zuul/ZuulPropertiesRefresher.java#L48)和apollo-demo项目中的[SampleRedisConfig.java](https://github.com/ctripcorp/apollo/blob/master/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/config/SampleRedisConfig.java)以及[SpringBootApolloRefreshConfig.java](https://github.com/ctripcorp/apollo/blob/master/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java)
### 3.2.3 Spring Annotation支持
Apollo同时还增加了几个新的Annotation来简化在Spring环境中的使用。
1. @ApolloConfig
* 用来自动注入Config对象
2. @ApolloConfigChangeListener
* 用来自动注册ConfigChangeListener
3. @ApolloJsonValue
* 用来把配置的json字符串自动注入为对象
使用样例如下：
```java
public class TestApolloAnnotationBean {
@ApolloConfig
private Config config; //inject config for namespace application
@ApolloConfig("application")
private Config anotherConfig; //inject config for namespace application
@ApolloConfig("FX.apollo")
private Config yetAnotherConfig; //inject config for namespace FX.apollo
@ApolloConfig("application.yml")
private Config ymlConfig; //inject config for namespace application.yml
/**
* ApolloJsonValue annotated on fields example, the default value is specified as empty list - []
* <br />
* jsonBeanProperty=[{"someString":"hello","someInt":100},{"someString":"world!","someInt":200}]
*/
@ApolloJsonValue("${jsonBeanProperty:[]}")
private List<JsonBean> anotherJsonBeans;
@Value("${batch:100}")
private int batch;
//config change listener for namespace application
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
//update injected value of batch if it is changed in Apollo
if (changeEvent.isChanged("batch")) {
batch = config.getIntProperty("batch", 100);
}
}
//config change listener for namespace application
@ApolloConfigChangeListener("application")
private void anotherOnChange(ConfigChangeEvent changeEvent) {
//do something
}
//config change listener for namespaces application, FX.apollo and application.yml
@ApolloConfigChangeListener({"application", "FX.apollo", "application.yml"})
private void yetAnotherOnChange(ConfigChangeEvent changeEvent) {
//do something
}
//example of getting config from Apollo directly
//this will always return the latest value of timeout
public int getTimeout() {
return config.getIntProperty("timeout", 200);
}
//example of getting config from injected value
//the program needs to update the injected value when batch is changed in Apollo using @ApolloConfigChangeListener shown above
public int getBatch() {
return this.batch;
}
private static class JsonBean{
private String someString;
private int someInt;
}
}
```
在Configuration类中按照下面的方式使用：
```java
@Configuration
@EnableApolloConfig
public class AppConfig {
@Bean
public TestApolloAnnotationBean testApolloAnnotationBean() {
return new TestApolloAnnotationBean();
}
}
```
### 3.2.4 已有配置迁移
很多情况下，应用可能已经有不少配置了，比如Spring Boot的应用，就会有bootstrap.properties/yml, application.properties/yml等配置。
在应用接入Apollo之后，这些配置是可以非常方便的迁移到Apollo的，具体步骤如下：
1. 在Apollo为应用新建项目
2. 在应用中配置好META-INF/app.properties
3. 建议把原先配置先转为properties格式，然后通过Apollo提供的文本编辑模式全部粘帖到应用的application namespace，发布配置
* 如果原来格式是yml，可以使用[YamlPropertiesFactoryBean.getObject](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.html#getObject--)转成properties格式
4. 如果原来是yml，想继续使用yml来编辑配置，那么可以创建私有的application.yml namespace，把原来的配置全部粘贴进去，发布配置
* 需要apollo-client是1.3.0及以上版本
5. 把原先的配置文件如bootstrap.properties/yml, application.properties/yml从项目中删除
* 如果需要保留本地配置文件，需要注意部分配置如`server.port`必须确保本地文件已经删除该配置项
如：
```properties
spring.application.name = reservation-service
server.port = 8080
logging.level = ERROR
eureka.client.serviceUrl.defaultZone = http://127.0.0.1:8761/eureka/
eureka.client.healthcheck.enabled = true
eureka.client.registerWithEureka = true
eureka.client.fetchRegistry = true
eureka.client.eurekaServiceUrlPollIntervalSeconds = 60
eureka.instance.preferIpAddress = true
```
## 3.3 Demo
项目中有一个样例客户端的项目：`apollo-demo`，具体信息可以参考[Apollo开发指南](zh/development/apollo-development-guide)中的[2.3 Java样例客户端启动](zh/development/apollo-development-guide?id=_23-java样例客户端启动)部分。
更多使用案例Demo可以参考[Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)。
# 四、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖，单位为分钟。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
# 五、本地开发模式
Apollo客户端还支持本地开发模式，这个主要用于当开发环境无法连接Apollo服务器的时候，比如在邮轮、飞机上做相关功能开发。
在本地开发模式下，Apollo只会从本地文件读取配置信息，不会从Apollo服务器读取配置。
可以通过下面的步骤开启Apollo本地开发模式。
## 5.1 修改环境
修改/opt/settings/server.properties（Mac/Linux）或C:\opt\settings\server.properties（Windows）文件，设置env为Local：
```properties
env=Local
```
更多配置环境的方式请参考[1.2.4.1 Environment](#_1241-environment)
## 5.2 准备本地配置文件
在本地开发模式下，Apollo客户端会从本地读取文件，所以我们需要事先准备好配置文件。
### 5.2.1 本地配置目录
本地配置目录位于：
* **Mac/Linux**: /opt/data/{_appId_}/config-cache
* **Windows**: C:\opt\data\\{_appId_}\config-cache
appId就是应用的appId，如100004458。
请确保该目录存在，且应用程序对该目录有读权限。
**【小技巧】** 推荐的方式是先在普通模式下使用Apollo，这样Apollo会自动创建该目录并在目录下生成配置文件。
### 5.2.2 本地配置文件
本地配置文件需要按照一定的文件名格式放置于本地配置目录下，文件名格式如下：
**_{appId}+{cluster}+{namespace}.properties_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用的配置namespace，一般是application
文件内容以properties格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```properties
request.timeout=2000
batch=2000
```
## 5.3 修改配置
在本地开发模式下，Apollo不会实时监测文件内容是否有变化，所以如果修改了配置，需要重启应用生效。
# 六、测试模式
1.1.0版本开始增加了`apollo-mockserver`，从而可以很好地支持单元测试时需要mock配置的场景，使用方法如下：
## 6.1 引入pom依赖
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-mockserver</artifactId>
<version>1.7.0</version>
</dependency>
```
## 6.2 在test的resources下放置mock的数据
文件名格式约定为`mockdata-{namespace}.properties`
## 6.3 写测试类
更多使用demo可以参考[ApolloMockServerApiTest.java](https://github.com/ctripcorp/apollo/blob/master/apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerApiTest.java)和[ApolloMockServerSpringIntegrationTest.java](https://github.com/ctripcorp/apollo/blob/master/apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerSpringIntegrationTest.java)。
```java
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = TestConfiguration.class)
public class SpringIntegrationTest {
// 启动apollo的mockserver
@ClassRule
public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
@Test
@DirtiesContext // 这个注解很有必要，因为配置注入会弄脏应用上下文
public void testPropertyInject(){
assertEquals("value1", testBean.key1);
assertEquals("value2", testBean.key2);
}
@Test
@DirtiesContext
public void testListenerTriggeredByAdd() throws InterruptedException, ExecutionException, TimeoutException {
String otherNamespace = "othernamespace";
embeddedApollo.addOrModifyPropery(otherNamespace,"someKey","someValue");
ConfigChangeEvent changeEvent = testBean.futureData.get(5000, TimeUnit.MILLISECONDS);
assertEquals(otherNamespace, changeEvent.getNamespace());
assertEquals("someValue", changeEvent.getChange("someKey").getNewValue());
}
@EnableApolloConfig("application")
@Configuration
static class TestConfiguration{
@Bean
public TestBean testBean(){
return new TestBean();
}
}
static class TestBean{
@Value("${key1:default}")
String key1;
@Value("${key2:default}")
String key2;
SettableFuture<ConfigChangeEvent> futureData = SettableFuture.create();
@ApolloConfigChangeListener("othernamespace")
private void onChange(ConfigChangeEvent changeEvent) {
futureData.set(changeEvent);
}
}
}
```
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
System.clearProperty(ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean.class, AppConfig10.class);
final ArgumentCaptor<Set> interestedKeyPrefixesArgumentCaptor = ArgumentCaptor
.forClass(Set.class);
verify(applicationConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
interestedKeyPrefixesArgumentCaptor.capture());
assertEquals(1, interestedKeyPrefixesArgumentCaptor.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set<String> interestedKeyPrefixes : interestedKeyPrefixesArgumentCaptor.getAllValues()) {
result.addAll(interestedKeyPrefixes);
}
assertEquals(Sets.newHashSet("logging.level", "number"), result);
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes_fire()
throws InterruptedException {
// default mock, useless here
// just for speed up test without waiting
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
SimpleConfig simpleConfig = spy(
this.prepareConfig(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
new Properties()));
mockConfig(TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
simpleConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.class, AppConfig11.class);
verify(simpleConfig, atLeastOnce())
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
anySetOf(String.class));
Properties properties = new Properties();
properties.put("logging.level.com", "debug");
properties.put("logging.level.root", "warn");
properties.put("number.value", "333");
// publish config change
simpleConfig.onRepositoryChange(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE, properties);
// get event from bean
ConfigChangeEvent configChangeEvent = bean.getConfigChangeEvent();
Set<String> interestedChangedKeys = configChangeEvent.interestedChangedKeys();
assertEquals(Sets.newHashSet("logging.level.com", "logging.level.root", "number.value"),
interestedChangedKeys);
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
System.setProperty(ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE, "true");
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update
// one invocation for the @ApolloConfigChangeListener annotation
// one invocation for CachedCompositePropertySource clear cache listener
verify(applicationConfig, times(3)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig10 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig11 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean() {
return spy(new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1());
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean {
@ApolloConfigChangeListener(interestedKeyPrefixes = {"number", "logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 {
static final String SPECIAL_NAMESPACE = "special-namespace-2021";
private final BlockingQueue<ConfigChangeEvent> configChangeEventQueue = new ArrayBlockingQueue<>(100);
@ApolloConfigChangeListener(value = SPECIAL_NAMESPACE, interestedKeyPrefixes = {"number",
"logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
this.configChangeEventQueue.add(changeEvent);
}
public ConfigChangeEvent getConfigChangeEvent() throws InterruptedException {
return this.configChangeEventQueue.poll(5, TimeUnit.SECONDS);
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
System.clearProperty(ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean.class, AppConfig10.class);
final ArgumentCaptor<Set> interestedKeyPrefixesArgumentCaptor = ArgumentCaptor
.forClass(Set.class);
verify(applicationConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
interestedKeyPrefixesArgumentCaptor.capture());
assertEquals(1, interestedKeyPrefixesArgumentCaptor.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set<String> interestedKeyPrefixes : interestedKeyPrefixesArgumentCaptor.getAllValues()) {
result.addAll(interestedKeyPrefixes);
}
assertEquals(Sets.newHashSet("logging.level", "number"), result);
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes_fire()
throws InterruptedException {
// default mock, useless here
// just for speed up test without waiting
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
SimpleConfig simpleConfig = spy(
this.prepareConfig(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
new Properties()));
mockConfig(TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
simpleConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.class, AppConfig11.class);
verify(simpleConfig, atLeastOnce())
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
anySetOf(String.class));
Properties properties = new Properties();
properties.put("logging.level.com", "debug");
properties.put("logging.level.root", "warn");
properties.put("number.value", "333");
// publish config change
simpleConfig.onRepositoryChange(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE, properties);
// get event from bean
ConfigChangeEvent configChangeEvent = bean.getConfigChangeEvent();
Set<String> interestedChangedKeys = configChangeEvent.interestedChangedKeys();
assertEquals(Sets.newHashSet("logging.level.com", "logging.level.root", "number.value"),
interestedChangedKeys);
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
System.setProperty(ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE, "true");
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update
// one invocation for the @ApolloConfigChangeListener annotation
// one invocation for CachedCompositePropertySource clear cache listener
verify(applicationConfig, times(3)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig10 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig11 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean() {
return spy(new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1());
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean {
@ApolloConfigChangeListener(interestedKeyPrefixes = {"number", "logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 {
static final String SPECIAL_NAMESPACE = "special-namespace-2021";
private final BlockingQueue<ConfigChangeEvent> configChangeEventQueue = new ArrayBlockingQueue<>(100);
@ApolloConfigChangeListener(value = SPECIAL_NAMESPACE, interestedKeyPrefixes = {"number",
"logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
this.configChangeEventQueue.add(changeEvent);
}
public ConfigChangeEvent getConfigChangeEvent() throws InterruptedException {
return this.configChangeEventQueue.poll(5, TimeUnit.SECONDS);
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/AbstractConfigTest.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
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.util.concurrent.SettableFuture;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.mockito.Matchers;
/**
* @author wxq
*/
public class AbstractConfigTest {
/**
* @see AbstractConfig#fireConfigChange(ConfigChangeEvent)
*/
@Test
public void testFireConfigChange_cannot_notify() throws InterruptedException {
AbstractConfig abstractConfig = spy(new ErrorConfig());
final String namespace = "app-namespace-0";
ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
}
});
abstractConfig
.addChangeListener(configChangeListener, Collections.singleton("cannot-be-match-key"));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put("key1",
new ConfigChange(namespace, "key1", null, "new-value", PropertyChangeType.ADDED));
ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes);
abstractConfig.fireConfigChange(configChangeEvent);
abstractConfig.fireConfigChange(namespace, changes);
// wait a minute for invoking
Thread.sleep(100);
verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any());
}
@Test
public void testFireConfigChange_event_notify_once()
throws ExecutionException, InterruptedException, TimeoutException {
AbstractConfig abstractConfig = new ErrorConfig();
final String namespace = "app-namespace-1";
final String key = "great-key";
final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create();
final AtomicInteger invokeCount = new AtomicInteger();
final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future1.set(changeEvent);
}
});
final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future2.set(changeEvent);
}
});
abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key));
abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put(key,
new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED));
ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes);
abstractConfig.fireConfigChange(configChangeEvent);
assertEquals(configChangeEvent, future1.get(500, TimeUnit.MILLISECONDS));
assertEquals(configChangeEvent, future2.get(500, TimeUnit.MILLISECONDS));
assertEquals(2, invokeCount.get());
verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent));
verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent));
}
@Test
public void testFireConfigChange_changes_notify_once()
throws ExecutionException, InterruptedException, TimeoutException {
AbstractConfig abstractConfig = new ErrorConfig();
final String namespace = "app-namespace-1";
final String key = "great-key";
final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create();
final AtomicInteger invokeCount = new AtomicInteger();
final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future1.set(changeEvent);
}
});
final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future2.set(changeEvent);
}
});
abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key));
abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put(key,
new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED));
abstractConfig.fireConfigChange(namespace, changes);
assertEquals(Collections.singleton(key), future1.get(500, TimeUnit.MILLISECONDS).changedKeys());
assertEquals(Collections.singleton(key), future2.get(500, TimeUnit.MILLISECONDS).changedKeys());
assertEquals(2, invokeCount.get());
verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
}
/**
* Only for current test usage.
*
* @author wxq
*/
private static class ErrorConfig extends AbstractConfig {
@Override
public String getProperty(String key, String defaultValue) {
throw new UnsupportedOperationException();
}
@Override
public Set<String> getPropertyNames() {
throw new UnsupportedOperationException();
}
@Override
public ConfigSourceType getSourceType() {
throw new UnsupportedOperationException();
}
}
} | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
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.util.concurrent.SettableFuture;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.mockito.Matchers;
/**
* @author wxq
*/
public class AbstractConfigTest {
/**
* @see AbstractConfig#fireConfigChange(ConfigChangeEvent)
*/
@Test
public void testFireConfigChange_cannot_notify() throws InterruptedException {
AbstractConfig abstractConfig = spy(new ErrorConfig());
final String namespace = "app-namespace-0";
ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
}
});
abstractConfig
.addChangeListener(configChangeListener, Collections.singleton("cannot-be-match-key"));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put("key1",
new ConfigChange(namespace, "key1", null, "new-value", PropertyChangeType.ADDED));
ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes);
abstractConfig.fireConfigChange(configChangeEvent);
abstractConfig.fireConfigChange(namespace, changes);
// wait a minute for invoking
Thread.sleep(100);
verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any());
}
@Test
public void testFireConfigChange_event_notify_once()
throws ExecutionException, InterruptedException, TimeoutException {
AbstractConfig abstractConfig = new ErrorConfig();
final String namespace = "app-namespace-1";
final String key = "great-key";
final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create();
final AtomicInteger invokeCount = new AtomicInteger();
final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future1.set(changeEvent);
}
});
final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future2.set(changeEvent);
}
});
abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key));
abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put(key,
new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED));
ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes);
abstractConfig.fireConfigChange(configChangeEvent);
assertEquals(configChangeEvent, future1.get(500, TimeUnit.MILLISECONDS));
assertEquals(configChangeEvent, future2.get(500, TimeUnit.MILLISECONDS));
assertEquals(2, invokeCount.get());
verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent));
verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent));
}
@Test
public void testFireConfigChange_changes_notify_once()
throws ExecutionException, InterruptedException, TimeoutException {
AbstractConfig abstractConfig = new ErrorConfig();
final String namespace = "app-namespace-1";
final String key = "great-key";
final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create();
final AtomicInteger invokeCount = new AtomicInteger();
final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future1.set(changeEvent);
}
});
final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
invokeCount.incrementAndGet();
future2.set(changeEvent);
}
});
abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key));
abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key));
Map<String, ConfigChange> changes = new HashMap<>();
changes.put(key,
new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED));
abstractConfig.fireConfigChange(namespace, changes);
assertEquals(Collections.singleton(key), future1.get(500, TimeUnit.MILLISECONDS).changedKeys());
assertEquals(Collections.singleton(key), future2.get(500, TimeUnit.MILLISECONDS).changedKeys());
assertEquals(2, invokeCount.get());
verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
}
/**
* Only for current test usage.
*
* @author wxq
*/
private static class ErrorConfig extends AbstractConfig {
@Override
public String getProperty(String key, String defaultValue) {
throw new UnsupportedOperationException();
}
@Override
public Set<String> getPropertyNames() {
throw new UnsupportedOperationException();
}
@Override
public ConfigSourceType getSourceType() {
throw new UnsupportedOperationException();
}
}
} | -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetController.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.adminservice.aop.PreAcquireNamespaceLock;
import com.ctrip.framework.apollo.biz.service.ItemSetService;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class ItemSetController {
private final ItemSetService itemSetService;
public ItemSetController(final ItemSetService itemSetService) {
this.itemSetService = itemSetService;
}
@PreAcquireNamespaceLock
@PostMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset")
public ResponseEntity<Void> create(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @RequestBody ItemChangeSets changeSet) {
itemSetService.updateSet(appId, clusterName, namespaceName, changeSet);
return ResponseEntity.status(HttpStatus.OK).build();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.adminservice.aop.PreAcquireNamespaceLock;
import com.ctrip.framework.apollo.biz.service.ItemSetService;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class ItemSetController {
private final ItemSetService itemSetService;
public ItemSetController(final ItemSetService itemSetService) {
this.itemSetService = itemSetService;
}
@PreAcquireNamespaceLock
@PostMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset")
public ResponseEntity<Void> create(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @RequestBody ItemChangeSets changeSet) {
itemSetService.updateSet(appId, clusterName, namespaceName, changeSet);
return ResponseEntity.status(HttpStatus.OK).build();
}
}
| -1 |
apolloconfig/apollo | 3,819 | fix the issue that release messages might be missed in certain scenarios | ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| nobodyiam | 2021-07-11T08:32:34Z | 2021-07-22T00:09:32Z | 9bd47037886468040dacb693db370e6417b31aad | f9c69dbb181e9cb6c5cb0ee08ae915a52430c23a | fix the issue that release messages might be missed in certain scenarios. ## What's the purpose of this PR
fix the issue that release messages might be missed in certain scenarios
## Which issue(s) this PR fixes:
Fixes #3806
## Brief changelog
1. record the missing release messages when scanning
2. try to reload and notify the missing release messages for certain amount of times
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.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/ApolloMetaServiceConfig.java | /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.metaservice;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.security.web.firewall.DefaultHttpFirewall;
import org.springframework.security.web.firewall.HttpFirewall;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloMetaServiceConfig.class)
public class ApolloMetaServiceConfig {
@Bean
public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
return new DefaultHttpFirewall();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* 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.
*
*/
package com.ctrip.framework.apollo.metaservice;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.security.web.firewall.DefaultHttpFirewall;
import org.springframework.security.web.firewall.HttpFirewall;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloMetaServiceConfig.class)
public class ApolloMetaServiceConfig {
@Bean
public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
return new DefaultHttpFirewall();
}
}
| -1 |