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,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/update.sample | #!/bin/sh
#
# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
#
# Config
# ------
# hooks.allowunannotated
# This boolean sets whether unannotated tags will be allowed into the
# repository. By default they won't be.
# hooks.allowdeletetag
# This boolean sets whether deleting tags will be allowed in the
# repository. By default they won't be.
# hooks.allowmodifytag
# This boolean sets whether a tag may be modified after creation. By default
# it won't be.
# hooks.allowdeletebranch
# This boolean sets whether deleting branches will be allowed in the
# repository. By default they won't be.
# hooks.denycreatebranch
# This boolean sets whether remotely creating branches will be denied
# in the repository. By default this is allowed.
#
# --- Command line
refname="$1"
oldrev="$2"
newrev="$3"
# --- Safety check
if [ -z "$GIT_DIR" ]; then
echo "Don't run this script from the command line." >&2
echo " (if you want, you could supply GIT_DIR then run" >&2
echo " $0 <ref> <oldrev> <newrev>)" >&2
exit 1
fi
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
exit 1
fi
# --- Config
allowunannotated=$(git config --bool hooks.allowunannotated)
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
denycreatebranch=$(git config --bool hooks.denycreatebranch)
allowdeletetag=$(git config --bool hooks.allowdeletetag)
allowmodifytag=$(git config --bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
case "$projectdesc" in
"Unnamed repository"* | "")
echo "*** Project description file hasn't been set" >&2
exit 1
;;
esac
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
zero="0000000000000000000000000000000000000000"
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
newrev_type=$(git cat-file -t $newrev)
fi
case "$refname","$newrev_type" in
refs/tags/*,commit)
# un-annotated tag
short_refname=${refname##refs/tags/}
if [ "$allowunannotated" != "true" ]; then
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
exit 1
fi
;;
refs/tags/*,delete)
# delete tag
if [ "$allowdeletetag" != "true" ]; then
echo "*** Deleting a tag is not allowed in this repository" >&2
exit 1
fi
;;
refs/tags/*,tag)
# annotated tag
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
then
echo "*** Tag '$refname' already exists." >&2
echo "*** Modifying a tag is not allowed in this repository." >&2
exit 1
fi
;;
refs/heads/*,commit)
# branch
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
echo "*** Creating a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/heads/*,delete)
# delete branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/remotes/*,commit)
# tracking branch
;;
refs/remotes/*,delete)
# delete tracking branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
exit 1
fi
;;
*)
# Anything else (is there anything else?)
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
exit 1
;;
esac
# --- Finished
exit 0
| #!/bin/sh
#
# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
#
# Config
# ------
# hooks.allowunannotated
# This boolean sets whether unannotated tags will be allowed into the
# repository. By default they won't be.
# hooks.allowdeletetag
# This boolean sets whether deleting tags will be allowed in the
# repository. By default they won't be.
# hooks.allowmodifytag
# This boolean sets whether a tag may be modified after creation. By default
# it won't be.
# hooks.allowdeletebranch
# This boolean sets whether deleting branches will be allowed in the
# repository. By default they won't be.
# hooks.denycreatebranch
# This boolean sets whether remotely creating branches will be denied
# in the repository. By default this is allowed.
#
# --- Command line
refname="$1"
oldrev="$2"
newrev="$3"
# --- Safety check
if [ -z "$GIT_DIR" ]; then
echo "Don't run this script from the command line." >&2
echo " (if you want, you could supply GIT_DIR then run" >&2
echo " $0 <ref> <oldrev> <newrev>)" >&2
exit 1
fi
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
exit 1
fi
# --- Config
allowunannotated=$(git config --bool hooks.allowunannotated)
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
denycreatebranch=$(git config --bool hooks.denycreatebranch)
allowdeletetag=$(git config --bool hooks.allowdeletetag)
allowmodifytag=$(git config --bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
case "$projectdesc" in
"Unnamed repository"* | "")
echo "*** Project description file hasn't been set" >&2
exit 1
;;
esac
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
zero="0000000000000000000000000000000000000000"
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
newrev_type=$(git cat-file -t $newrev)
fi
case "$refname","$newrev_type" in
refs/tags/*,commit)
# un-annotated tag
short_refname=${refname##refs/tags/}
if [ "$allowunannotated" != "true" ]; then
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
exit 1
fi
;;
refs/tags/*,delete)
# delete tag
if [ "$allowdeletetag" != "true" ]; then
echo "*** Deleting a tag is not allowed in this repository" >&2
exit 1
fi
;;
refs/tags/*,tag)
# annotated tag
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
then
echo "*** Tag '$refname' already exists." >&2
echo "*** Modifying a tag is not allowed in this repository." >&2
exit 1
fi
;;
refs/heads/*,commit)
# branch
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
echo "*** Creating a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/heads/*,delete)
# delete branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/remotes/*,commit)
# tracking branch
;;
refs/remotes/*,delete)
# delete tracking branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
exit 1
fi
;;
*)
# Anything else (is there anything else?)
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
exit 1
;;
esac
# --- Finished
exit 0
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/ReleaseMessageService.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.service;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.collect.Lists;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Service
public class ReleaseMessageService {
private final ReleaseMessageRepository releaseMessageRepository;
public ReleaseMessageService(final ReleaseMessageRepository releaseMessageRepository) {
this.releaseMessageRepository = releaseMessageRepository;
}
public ReleaseMessage findLatestReleaseMessageForMessages(Collection<String> messages) {
if (CollectionUtils.isEmpty(messages)) {
return null;
}
return releaseMessageRepository.findTopByMessageInOrderByIdDesc(messages);
}
public List<ReleaseMessage> findLatestReleaseMessagesGroupByMessages(Collection<String> messages) {
if (CollectionUtils.isEmpty(messages)) {
return Collections.emptyList();
}
List<Object[]> result =
releaseMessageRepository.findLatestReleaseMessagesGroupByMessages(messages);
List<ReleaseMessage> releaseMessages = Lists.newArrayList();
for (Object[] o : result) {
try {
ReleaseMessage releaseMessage = new ReleaseMessage((String) o[0]);
releaseMessage.setId((Long) o[1]);
releaseMessages.add(releaseMessage);
} catch (Exception ex) {
Tracer.logError("Parsing LatestReleaseMessagesGroupByMessages failed", ex);
}
}
return releaseMessages;
}
}
| /*
* 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.service;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.collect.Lists;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Service
public class ReleaseMessageService {
private final ReleaseMessageRepository releaseMessageRepository;
public ReleaseMessageService(final ReleaseMessageRepository releaseMessageRepository) {
this.releaseMessageRepository = releaseMessageRepository;
}
public ReleaseMessage findLatestReleaseMessageForMessages(Collection<String> messages) {
if (CollectionUtils.isEmpty(messages)) {
return null;
}
return releaseMessageRepository.findTopByMessageInOrderByIdDesc(messages);
}
public List<ReleaseMessage> findLatestReleaseMessagesGroupByMessages(Collection<String> messages) {
if (CollectionUtils.isEmpty(messages)) {
return Collections.emptyList();
}
List<Object[]> result =
releaseMessageRepository.findLatestReleaseMessagesGroupByMessages(messages);
List<ReleaseMessage> releaseMessages = Lists.newArrayList();
for (Object[] o : result) {
try {
ReleaseMessage releaseMessage = new ReleaseMessage((String) o[0]);
releaseMessage.setId((Long) o[1]);
releaseMessages.add(releaseMessage);
} catch (Exception ex) {
Tracer.logError("Parsing LatestReleaseMessagesGroupByMessages failed", ex);
}
}
return releaseMessages;
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/images/community/intellij-idea.svg | <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.7898" y1="40.0893" x2="33.3172" y2="40.0893">
<stop offset="0.2581" style="stop-color:#F97A12"/>
<stop offset="0.4591" style="stop-color:#B07B58"/>
<stop offset="0.7241" style="stop-color:#577BAE"/>
<stop offset="0.9105" style="stop-color:#1E7CE5"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_1_);" points="17.7,54.6 0.8,41.2 9.2,25.6 33.3,35 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.7674" y1="24.88" x2="79.424" y2="54.57">
<stop offset="0" style="stop-color:#F97A12"/>
<stop offset="7.179946e-002" style="stop-color:#CB7A3E"/>
<stop offset="0.1541" style="stop-color:#9E7B6A"/>
<stop offset="0.242" style="stop-color:#757B91"/>
<stop offset="0.3344" style="stop-color:#537BB1"/>
<stop offset="0.4324" style="stop-color:#387CCC"/>
<stop offset="0.5381" style="stop-color:#237CE0"/>
<stop offset="0.6552" style="stop-color:#147CEF"/>
<stop offset="0.7925" style="stop-color:#0B7CF7"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_2_);" points="70,18.7 68.7,59.2 41.8,70 25.6,59.6 49.3,35 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="63.2277" y1="42.9153" x2="48.2903" y2="-1.7191">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="7.840246e-002" style="stop-color:#CB417E"/>
<stop offset="0.1601" style="stop-color:#9E4E9B"/>
<stop offset="0.2474" style="stop-color:#755BB4"/>
<stop offset="0.3392" style="stop-color:#5365CA"/>
<stop offset="0.4365" style="stop-color:#386DDB"/>
<stop offset="0.5414" style="stop-color:#2374E9"/>
<stop offset="0.6576" style="stop-color:#1478F3"/>
<stop offset="0.794" style="stop-color:#0B7BF8"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_3_);" points="70,18.7 48.7,43.9 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="10.7204" y1="16.473" x2="55.5237" y2="90.58">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="4.023279e-002" style="stop-color:#F63462"/>
<stop offset="0.1037" style="stop-color:#DF3A71"/>
<stop offset="0.1667" style="stop-color:#C24383"/>
<stop offset="0.2912" style="stop-color:#AD4A91"/>
<stop offset="0.5498" style="stop-color:#755BB4"/>
<stop offset="0.9175" style="stop-color:#1D76ED"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_4_);" points="33.7,58.1 5.6,68.3 10.1,52.5 16,33.1 0,27.7 10.1,0 32.1,2.7 53.7,27.4 "/>
</g>
<g>
<rect x="13.7" y="13.5" style="fill:#000000;" width="43.2" height="43.2"/>
<rect x="17.7" y="48.6" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
<polygon style="fill:#FFFFFF;" points="29.4,22.4 29.4,19.1 20.4,19.1 20.4,22.4 23,22.4 23,33.7 20.4,33.7 20.4,37 29.4,37
29.4,33.7 26.9,33.7 26.9,22.4 "/>
<path style="fill:#FFFFFF;" d="M38,37.3c-1.4,0-2.6-0.3-3.5-0.8c-0.9-0.5-1.7-1.2-2.3-1.9l2.5-2.8c0.5,0.6,1,1,1.5,1.3
c0.5,0.3,1.1,0.5,1.7,0.5c0.7,0,1.3-0.2,1.8-0.7c0.4-0.5,0.6-1.2,0.6-2.3V19.1h4v11.7c0,1.1-0.1,2-0.4,2.8c-0.3,0.8-0.7,1.4-1.3,2
c-0.5,0.5-1.2,1-2,1.2C39.8,37.1,39,37.3,38,37.3"/>
</g>
</g>
</svg>
| <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.7898" y1="40.0893" x2="33.3172" y2="40.0893">
<stop offset="0.2581" style="stop-color:#F97A12"/>
<stop offset="0.4591" style="stop-color:#B07B58"/>
<stop offset="0.7241" style="stop-color:#577BAE"/>
<stop offset="0.9105" style="stop-color:#1E7CE5"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_1_);" points="17.7,54.6 0.8,41.2 9.2,25.6 33.3,35 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.7674" y1="24.88" x2="79.424" y2="54.57">
<stop offset="0" style="stop-color:#F97A12"/>
<stop offset="7.179946e-002" style="stop-color:#CB7A3E"/>
<stop offset="0.1541" style="stop-color:#9E7B6A"/>
<stop offset="0.242" style="stop-color:#757B91"/>
<stop offset="0.3344" style="stop-color:#537BB1"/>
<stop offset="0.4324" style="stop-color:#387CCC"/>
<stop offset="0.5381" style="stop-color:#237CE0"/>
<stop offset="0.6552" style="stop-color:#147CEF"/>
<stop offset="0.7925" style="stop-color:#0B7CF7"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_2_);" points="70,18.7 68.7,59.2 41.8,70 25.6,59.6 49.3,35 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="63.2277" y1="42.9153" x2="48.2903" y2="-1.7191">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="7.840246e-002" style="stop-color:#CB417E"/>
<stop offset="0.1601" style="stop-color:#9E4E9B"/>
<stop offset="0.2474" style="stop-color:#755BB4"/>
<stop offset="0.3392" style="stop-color:#5365CA"/>
<stop offset="0.4365" style="stop-color:#386DDB"/>
<stop offset="0.5414" style="stop-color:#2374E9"/>
<stop offset="0.6576" style="stop-color:#1478F3"/>
<stop offset="0.794" style="stop-color:#0B7BF8"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_3_);" points="70,18.7 48.7,43.9 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="10.7204" y1="16.473" x2="55.5237" y2="90.58">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="4.023279e-002" style="stop-color:#F63462"/>
<stop offset="0.1037" style="stop-color:#DF3A71"/>
<stop offset="0.1667" style="stop-color:#C24383"/>
<stop offset="0.2912" style="stop-color:#AD4A91"/>
<stop offset="0.5498" style="stop-color:#755BB4"/>
<stop offset="0.9175" style="stop-color:#1D76ED"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_4_);" points="33.7,58.1 5.6,68.3 10.1,52.5 16,33.1 0,27.7 10.1,0 32.1,2.7 53.7,27.4 "/>
</g>
<g>
<rect x="13.7" y="13.5" style="fill:#000000;" width="43.2" height="43.2"/>
<rect x="17.7" y="48.6" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
<polygon style="fill:#FFFFFF;" points="29.4,22.4 29.4,19.1 20.4,19.1 20.4,22.4 23,22.4 23,33.7 20.4,33.7 20.4,37 29.4,37
29.4,33.7 26.9,33.7 26.9,22.4 "/>
<path style="fill:#FFFFFF;" d="M38,37.3c-1.4,0-2.6-0.3-3.5-0.8c-0.9-0.5-1.7-1.2-2.3-1.9l2.5-2.8c0.5,0.6,1,1,1.5,1.3
c0.5,0.3,1.1,0.5,1.7,0.5c0.7,0,1.3-0.2,1.8-0.7c0.4-0.5,0.6-1.2,0.6-2.3V19.1h4v11.7c0,1.1-0.1,2-0.4,2.8c-0.3,0.8-0.7,1.4-1.3,2
c-0.5,0.5-1.2,1-2,1.2C39.8,37.1,39,37.3,38,37.3"/>
</g>
</g>
</svg>
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/filter/test-access-control-enabled.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.
--
INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`)
VALUES
('admin-service.access.tokens', 'default', 'someToken,anotherToken'),
('admin-service.access.control.enabled', 'default', 'true');
| --
-- 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.
--
INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`)
VALUES
('admin-service.access.tokens', 'default', 'someToken,anotherToken'),
('admin-service.access.control.enabled', 'default', 'true');
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/NormalPublishEmailBuilder.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 NormalPublishEmailBuilder 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 NormalPublishEmailBuilder 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,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/openapi/util/OpenApiBeanUtils.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.util;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.ctrip.framework.apollo.portal.entity.bo.ItemBO;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.google.common.base.Preconditions;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
public class OpenApiBeanUtils {
private static final Gson GSON = new Gson();
private static Type type = new TypeToken<Map<String, String>>() {}.getType();
public static OpenItemDTO transformFromItemDTO(ItemDTO item) {
Preconditions.checkArgument(item != null);
return BeanUtils.transform(OpenItemDTO.class, item);
}
public static ItemDTO transformToItemDTO(OpenItemDTO openItemDTO) {
Preconditions.checkArgument(openItemDTO != null);
return BeanUtils.transform(ItemDTO.class, openItemDTO);
}
public static OpenAppNamespaceDTO transformToOpenAppNamespaceDTO(AppNamespace appNamespace) {
Preconditions.checkArgument(appNamespace != null);
return BeanUtils.transform(OpenAppNamespaceDTO.class, appNamespace);
}
public static AppNamespace transformToAppNamespace(OpenAppNamespaceDTO openAppNamespaceDTO) {
Preconditions.checkArgument(openAppNamespaceDTO != null);
return BeanUtils.transform(AppNamespace.class, openAppNamespaceDTO);
}
public static OpenReleaseDTO transformFromReleaseDTO(ReleaseDTO release) {
Preconditions.checkArgument(release != null);
OpenReleaseDTO openReleaseDTO = BeanUtils.transform(OpenReleaseDTO.class, release);
Map<String, String> configs = GSON.fromJson(release.getConfigurations(), type);
openReleaseDTO.setConfigurations(configs);
return openReleaseDTO;
}
public static OpenNamespaceDTO transformFromNamespaceBO(NamespaceBO namespaceBO) {
Preconditions.checkArgument(namespaceBO != null);
OpenNamespaceDTO openNamespaceDTO =
BeanUtils.transform(OpenNamespaceDTO.class, namespaceBO.getBaseInfo());
// app namespace info
openNamespaceDTO.setFormat(namespaceBO.getFormat());
openNamespaceDTO.setComment(namespaceBO.getComment());
openNamespaceDTO.setPublic(namespaceBO.isPublic());
// items
List<OpenItemDTO> items = new LinkedList<>();
List<ItemBO> itemBOs = namespaceBO.getItems();
if (!CollectionUtils.isEmpty(itemBOs)) {
items.addAll(itemBOs.stream().map(itemBO -> transformFromItemDTO(itemBO.getItem()))
.collect(Collectors.toList()));
}
openNamespaceDTO.setItems(items);
return openNamespaceDTO;
}
public static List<OpenNamespaceDTO> batchTransformFromNamespaceBOs(
List<NamespaceBO> namespaceBOs) {
if (CollectionUtils.isEmpty(namespaceBOs)) {
return Collections.emptyList();
}
List<OpenNamespaceDTO> openNamespaceDTOs =
namespaceBOs.stream().map(OpenApiBeanUtils::transformFromNamespaceBO)
.collect(Collectors.toCollection(LinkedList::new));
return openNamespaceDTOs;
}
public static OpenNamespaceLockDTO transformFromNamespaceLockDTO(String namespaceName,
NamespaceLockDTO namespaceLock) {
OpenNamespaceLockDTO lock = new OpenNamespaceLockDTO();
lock.setNamespaceName(namespaceName);
if (namespaceLock == null) {
lock.setLocked(false);
} else {
lock.setLocked(true);
lock.setLockedBy(namespaceLock.getDataChangeCreatedBy());
}
return lock;
}
public static OpenGrayReleaseRuleDTO transformFromGrayReleaseRuleDTO(
GrayReleaseRuleDTO grayReleaseRuleDTO) {
Preconditions.checkArgument(grayReleaseRuleDTO != null);
return BeanUtils.transform(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
}
public static GrayReleaseRuleDTO transformToGrayReleaseRuleDTO(
OpenGrayReleaseRuleDTO openGrayReleaseRuleDTO) {
Preconditions.checkArgument(openGrayReleaseRuleDTO != null);
String appId = openGrayReleaseRuleDTO.getAppId();
String branchName = openGrayReleaseRuleDTO.getBranchName();
String clusterName = openGrayReleaseRuleDTO.getClusterName();
String namespaceName = openGrayReleaseRuleDTO.getNamespaceName();
GrayReleaseRuleDTO grayReleaseRuleDTO =
new GrayReleaseRuleDTO(appId, clusterName, namespaceName, branchName);
Set<OpenGrayReleaseRuleItemDTO> openGrayReleaseRuleItemDTOSet =
openGrayReleaseRuleDTO.getRuleItems();
openGrayReleaseRuleItemDTOSet.forEach(openGrayReleaseRuleItemDTO -> {
String clientAppId = openGrayReleaseRuleItemDTO.getClientAppId();
Set<String> clientIpList = openGrayReleaseRuleItemDTO.getClientIpList();
GrayReleaseRuleItemDTO ruleItem = new GrayReleaseRuleItemDTO(clientAppId, clientIpList);
grayReleaseRuleDTO.addRuleItem(ruleItem);
});
return grayReleaseRuleDTO;
}
public static List<OpenAppDTO> transformFromApps(final List<App> apps) {
if (CollectionUtils.isEmpty(apps)) {
return Collections.emptyList();
}
return apps.stream().map(OpenApiBeanUtils::transformFromApp).collect(Collectors.toList());
}
public static OpenAppDTO transformFromApp(final App app) {
Preconditions.checkArgument(app != null);
return BeanUtils.transform(OpenAppDTO.class, app);
}
public static OpenClusterDTO transformFromClusterDTO(ClusterDTO Cluster) {
Preconditions.checkArgument(Cluster != null);
return BeanUtils.transform(OpenClusterDTO.class, Cluster);
}
public static ClusterDTO transformToClusterDTO(OpenClusterDTO openClusterDTO) {
Preconditions.checkArgument(openClusterDTO != null);
return BeanUtils.transform(ClusterDTO.class, openClusterDTO);
}
}
| /*
* 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.util;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.ctrip.framework.apollo.portal.entity.bo.ItemBO;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.google.common.base.Preconditions;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
public class OpenApiBeanUtils {
private static final Gson GSON = new Gson();
private static Type type = new TypeToken<Map<String, String>>() {}.getType();
public static OpenItemDTO transformFromItemDTO(ItemDTO item) {
Preconditions.checkArgument(item != null);
return BeanUtils.transform(OpenItemDTO.class, item);
}
public static ItemDTO transformToItemDTO(OpenItemDTO openItemDTO) {
Preconditions.checkArgument(openItemDTO != null);
return BeanUtils.transform(ItemDTO.class, openItemDTO);
}
public static OpenAppNamespaceDTO transformToOpenAppNamespaceDTO(AppNamespace appNamespace) {
Preconditions.checkArgument(appNamespace != null);
return BeanUtils.transform(OpenAppNamespaceDTO.class, appNamespace);
}
public static AppNamespace transformToAppNamespace(OpenAppNamespaceDTO openAppNamespaceDTO) {
Preconditions.checkArgument(openAppNamespaceDTO != null);
return BeanUtils.transform(AppNamespace.class, openAppNamespaceDTO);
}
public static OpenReleaseDTO transformFromReleaseDTO(ReleaseDTO release) {
Preconditions.checkArgument(release != null);
OpenReleaseDTO openReleaseDTO = BeanUtils.transform(OpenReleaseDTO.class, release);
Map<String, String> configs = GSON.fromJson(release.getConfigurations(), type);
openReleaseDTO.setConfigurations(configs);
return openReleaseDTO;
}
public static OpenNamespaceDTO transformFromNamespaceBO(NamespaceBO namespaceBO) {
Preconditions.checkArgument(namespaceBO != null);
OpenNamespaceDTO openNamespaceDTO =
BeanUtils.transform(OpenNamespaceDTO.class, namespaceBO.getBaseInfo());
// app namespace info
openNamespaceDTO.setFormat(namespaceBO.getFormat());
openNamespaceDTO.setComment(namespaceBO.getComment());
openNamespaceDTO.setPublic(namespaceBO.isPublic());
// items
List<OpenItemDTO> items = new LinkedList<>();
List<ItemBO> itemBOs = namespaceBO.getItems();
if (!CollectionUtils.isEmpty(itemBOs)) {
items.addAll(itemBOs.stream().map(itemBO -> transformFromItemDTO(itemBO.getItem()))
.collect(Collectors.toList()));
}
openNamespaceDTO.setItems(items);
return openNamespaceDTO;
}
public static List<OpenNamespaceDTO> batchTransformFromNamespaceBOs(
List<NamespaceBO> namespaceBOs) {
if (CollectionUtils.isEmpty(namespaceBOs)) {
return Collections.emptyList();
}
List<OpenNamespaceDTO> openNamespaceDTOs =
namespaceBOs.stream().map(OpenApiBeanUtils::transformFromNamespaceBO)
.collect(Collectors.toCollection(LinkedList::new));
return openNamespaceDTOs;
}
public static OpenNamespaceLockDTO transformFromNamespaceLockDTO(String namespaceName,
NamespaceLockDTO namespaceLock) {
OpenNamespaceLockDTO lock = new OpenNamespaceLockDTO();
lock.setNamespaceName(namespaceName);
if (namespaceLock == null) {
lock.setLocked(false);
} else {
lock.setLocked(true);
lock.setLockedBy(namespaceLock.getDataChangeCreatedBy());
}
return lock;
}
public static OpenGrayReleaseRuleDTO transformFromGrayReleaseRuleDTO(
GrayReleaseRuleDTO grayReleaseRuleDTO) {
Preconditions.checkArgument(grayReleaseRuleDTO != null);
return BeanUtils.transform(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
}
public static GrayReleaseRuleDTO transformToGrayReleaseRuleDTO(
OpenGrayReleaseRuleDTO openGrayReleaseRuleDTO) {
Preconditions.checkArgument(openGrayReleaseRuleDTO != null);
String appId = openGrayReleaseRuleDTO.getAppId();
String branchName = openGrayReleaseRuleDTO.getBranchName();
String clusterName = openGrayReleaseRuleDTO.getClusterName();
String namespaceName = openGrayReleaseRuleDTO.getNamespaceName();
GrayReleaseRuleDTO grayReleaseRuleDTO =
new GrayReleaseRuleDTO(appId, clusterName, namespaceName, branchName);
Set<OpenGrayReleaseRuleItemDTO> openGrayReleaseRuleItemDTOSet =
openGrayReleaseRuleDTO.getRuleItems();
openGrayReleaseRuleItemDTOSet.forEach(openGrayReleaseRuleItemDTO -> {
String clientAppId = openGrayReleaseRuleItemDTO.getClientAppId();
Set<String> clientIpList = openGrayReleaseRuleItemDTO.getClientIpList();
GrayReleaseRuleItemDTO ruleItem = new GrayReleaseRuleItemDTO(clientAppId, clientIpList);
grayReleaseRuleDTO.addRuleItem(ruleItem);
});
return grayReleaseRuleDTO;
}
public static List<OpenAppDTO> transformFromApps(final List<App> apps) {
if (CollectionUtils.isEmpty(apps)) {
return Collections.emptyList();
}
return apps.stream().map(OpenApiBeanUtils::transformFromApp).collect(Collectors.toList());
}
public static OpenAppDTO transformFromApp(final App app) {
Preconditions.checkArgument(app != null);
return BeanUtils.transform(OpenAppDTO.class, app);
}
public static OpenClusterDTO transformFromClusterDTO(ClusterDTO Cluster) {
Preconditions.checkArgument(Cluster != null);
return BeanUtils.transform(OpenClusterDTO.class, Cluster);
}
public static ClusterDTO transformToClusterDTO(OpenClusterDTO openClusterDTO) {
Preconditions.checkArgument(openClusterDTO != null);
return BeanUtils.transform(ClusterDTO.class, openClusterDTO);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/release-modal.html | <form id="releaseModal" class="modal fade form-horizontal" name="releaseForm" valdr-type="Release"
ng-submit="release()">
<!--
~ 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" ng-show="!toReleaseNamespace.isBranch">
{{'Component.Publish.Title' | translate }}
<small>{{'Component.Publish.Tips' | translate:this }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.Grayscale' | translate }}
<small>{{'Component.Publish.GrayscaleTips' | translate }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.AllPublish' | translate }}
<small>{{'Component.Publish.AllPublishTips' | translate }}</small>
</h4>
</div>
<div class="release modal-body">
<div class="form-group">
<div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
<div class="row">
<div class="btn-group btn-group-xs" style="padding-right: 10px" role="group">
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='change'}"
ng-click="switchReleaseChangeViewType('change')">{{'Component.Publish.ToSeeChange' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='release'}"
ng-click="switchReleaseChangeViewType('release')">{{'Component.Publish.PublishedValue' | translate }}
</button>
</div>
</div>
</div>
<label class="col-sm-2 control-label"
ng-if="toReleaseNamespace.isPropertiesFormat">{{'Component.Publish.Changes' | translate }}</label>
<div class="col-sm-10"
ng-if="(!toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length)"
valdr-form-group>
<!--properties format-->
<!--normal release-->
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toReleaseNamespace.isPropertiesFormat && !toReleaseNamespace.isBranch">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.items"
ng-if="config.item.key && config.isModified">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.NewAddedTips' | translate }}">{{'Component.Publish.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.ModifiedTips' | translate }}">{{'Component.Publish.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Publish.DeletedTips' | translate }}">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="25%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="25%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch gray release-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.MasterValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayNoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems"
ng-if="config.isModified || config.isDeleted">
<td width="15%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-danger"
ng-show="config.isDeleted">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="20%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="20%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="20%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch updateAndPublish and publish-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch">
{{'Component.Publish.MasterValue' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.GrayValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems" ng-if="!config.isDeleted">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
</td>
<td width="25%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="25%" title="{{config.item.value}}">
<span ng-bind="config.item.value"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--file format -->
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='change'">
<apollodiff old-str="item.oldValue" new-str="item.newValue" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='release'">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-show="item.newValue" ng-bind="item.newValue">
</textarea>
</div>
</div>
<div class="col-sm-5"
ng-show="(!toReleaseNamespace.isBranch && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.ItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.GrayItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.NoGrayItems' | translate }}
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.Publish.Release' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<input type="text" name="releaseName" class="form-control" placeholder="input release name"
ng-model="toReleaseNamespace.releaseTitle" ng-required="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.Publish.ReleaseComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea rows="4" name="comment" class="form-control" style="margin-top: 15px;"
ng-model="releaseComment" placeholder="Add an optional extended description..."></textarea>
</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-primary"
ng-disabled="releaseForm.$invalid || releaseBtnDisabled
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)">
{{'Component.Publish.OpPublish' | translate }}
</button>
</div>
</div>
</div>
</form>
| <form id="releaseModal" class="modal fade form-horizontal" name="releaseForm" valdr-type="Release"
ng-submit="release()">
<!--
~ 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" ng-show="!toReleaseNamespace.isBranch">
{{'Component.Publish.Title' | translate }}
<small>{{'Component.Publish.Tips' | translate:this }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.Grayscale' | translate }}
<small>{{'Component.Publish.GrayscaleTips' | translate }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.AllPublish' | translate }}
<small>{{'Component.Publish.AllPublishTips' | translate }}</small>
</h4>
</div>
<div class="release modal-body">
<div class="form-group">
<div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
<div class="row">
<div class="btn-group btn-group-xs" style="padding-right: 10px" role="group">
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='change'}"
ng-click="switchReleaseChangeViewType('change')">{{'Component.Publish.ToSeeChange' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='release'}"
ng-click="switchReleaseChangeViewType('release')">{{'Component.Publish.PublishedValue' | translate }}
</button>
</div>
</div>
</div>
<label class="col-sm-2 control-label"
ng-if="toReleaseNamespace.isPropertiesFormat">{{'Component.Publish.Changes' | translate }}</label>
<div class="col-sm-10"
ng-if="(!toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length)"
valdr-form-group>
<!--properties format-->
<!--normal release-->
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toReleaseNamespace.isPropertiesFormat && !toReleaseNamespace.isBranch">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.items"
ng-if="config.item.key && config.isModified">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.NewAddedTips' | translate }}">{{'Component.Publish.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.ModifiedTips' | translate }}">{{'Component.Publish.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Publish.DeletedTips' | translate }}">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="25%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="25%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch gray release-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.MasterValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayNoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems"
ng-if="config.isModified || config.isDeleted">
<td width="15%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-danger"
ng-show="config.isDeleted">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="20%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="20%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="20%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch updateAndPublish and publish-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch">
{{'Component.Publish.MasterValue' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.GrayValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems" ng-if="!config.isDeleted">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
</td>
<td width="25%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="25%" title="{{config.item.value}}">
<span ng-bind="config.item.value"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--file format -->
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='change'">
<apollodiff old-str="item.oldValue" new-str="item.newValue" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='release'">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-show="item.newValue" ng-bind="item.newValue">
</textarea>
</div>
</div>
<div class="col-sm-5"
ng-show="(!toReleaseNamespace.isBranch && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.ItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.GrayItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.NoGrayItems' | translate }}
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.Publish.Release' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<input type="text" name="releaseName" class="form-control" placeholder="input release name"
ng-model="toReleaseNamespace.releaseTitle" ng-required="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.Publish.ReleaseComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea rows="4" name="comment" class="form-control" style="margin-top: 15px;"
ng-model="releaseComment" placeholder="Add an optional extended description..."></textarea>
</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-primary"
ng-disabled="releaseForm.$invalid || releaseBtnDisabled
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)">
{{'Component.Publish.OpPublish' | translate }}
</button>
</div>
</div>
</div>
</form>
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/resources/META-INF/spring.schemas | http\://www.ctrip.com/schema/apollo-1.0.0.xsd=/META-INF/apollo-1.0.0.xsd
http\://www.ctrip.com/schema/apollo.xsd=/META-INF/apollo-1.0.0.xsd
| http\://www.ctrip.com/schema/apollo-1.0.0.xsd=/META-INF/apollo-1.0.0.xsd
http\://www.ctrip.com/schema/apollo.xsd=/META-INF/apollo-1.0.0.xsd
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/AccessKeyController.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.AccessKey;
import com.ctrip.framework.apollo.biz.service.AccessKeyService;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import java.util.List;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
/**
* @author nisiyong
*/
@RestController
public class AccessKeyController {
private final AccessKeyService accessKeyService;
public AccessKeyController(
AccessKeyService accessKeyService) {
this.accessKeyService = accessKeyService;
}
@PostMapping(value = "/apps/{appId}/accesskeys")
public AccessKeyDTO create(@PathVariable String appId, @RequestBody AccessKeyDTO dto) {
AccessKey entity = BeanUtils.transform(AccessKey.class, dto);
entity = accessKeyService.create(appId, entity);
return BeanUtils.transform(AccessKeyDTO.class, entity);
}
@GetMapping(value = "/apps/{appId}/accesskeys")
public List<AccessKeyDTO> findByAppId(@PathVariable String appId) {
List<AccessKey> accessKeyList = accessKeyService.findByAppId(appId);
return BeanUtils.batchTransform(AccessKeyDTO.class, accessKeyList);
}
@DeleteMapping(value = "/apps/{appId}/accesskeys/{id}")
public void delete(@PathVariable String appId, @PathVariable long id, String operator) {
accessKeyService.delete(appId, id, operator);
}
@PutMapping(value = "/apps/{appId}/accesskeys/{id}/enable")
public void enable(@PathVariable String appId, @PathVariable long id, String operator) {
AccessKey entity = new AccessKey();
entity.setId(id);
entity.setEnabled(true);
entity.setDataChangeLastModifiedBy(operator);
accessKeyService.update(appId, entity);
}
@PutMapping(value = "/apps/{appId}/accesskeys/{id}/disable")
public void disable(@PathVariable String appId, @PathVariable long id, String operator) {
AccessKey entity = new AccessKey();
entity.setId(id);
entity.setEnabled(false);
entity.setDataChangeLastModifiedBy(operator);
accessKeyService.update(appId, 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.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.biz.service.AccessKeyService;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import java.util.List;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
/**
* @author nisiyong
*/
@RestController
public class AccessKeyController {
private final AccessKeyService accessKeyService;
public AccessKeyController(
AccessKeyService accessKeyService) {
this.accessKeyService = accessKeyService;
}
@PostMapping(value = "/apps/{appId}/accesskeys")
public AccessKeyDTO create(@PathVariable String appId, @RequestBody AccessKeyDTO dto) {
AccessKey entity = BeanUtils.transform(AccessKey.class, dto);
entity = accessKeyService.create(appId, entity);
return BeanUtils.transform(AccessKeyDTO.class, entity);
}
@GetMapping(value = "/apps/{appId}/accesskeys")
public List<AccessKeyDTO> findByAppId(@PathVariable String appId) {
List<AccessKey> accessKeyList = accessKeyService.findByAppId(appId);
return BeanUtils.batchTransform(AccessKeyDTO.class, accessKeyList);
}
@DeleteMapping(value = "/apps/{appId}/accesskeys/{id}")
public void delete(@PathVariable String appId, @PathVariable long id, String operator) {
accessKeyService.delete(appId, id, operator);
}
@PutMapping(value = "/apps/{appId}/accesskeys/{id}/enable")
public void enable(@PathVariable String appId, @PathVariable long id, String operator) {
AccessKey entity = new AccessKey();
entity.setId(id);
entity.setEnabled(true);
entity.setDataChangeLastModifiedBy(operator);
accessKeyService.update(appId, entity);
}
@PutMapping(value = "/apps/{appId}/accesskeys/{id}/disable")
public void disable(@PathVariable String appId, @PathVariable long id, String operator) {
AccessKey entity = new AccessKey();
entity.setId(id);
entity.setEnabled(false);
entity.setDataChangeLastModifiedBy(operator);
accessKeyService.update(appId, entity);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/util/http/DefaultHttpClient.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.util.http;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Function;
import com.google.common.io.CharStreams;
import com.google.gson.Gson;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultHttpClient implements HttpClient {
private ConfigUtil m_configUtil;
private static final Gson GSON = new Gson();
/**
* Constructor.
*/
public DefaultHttpClient() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
/**
* Do get operation for the http request.
*
* @param httpRequest the request
* @param responseType the response type
* @return the response
* @throws ApolloConfigException if any error happened or response code is neither 200 nor 304
*/
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Class<T> responseType) {
Function<String, T> convertResponse = new Function<String, T>() {
@Override
public T apply(String input) {
return GSON.fromJson(input, responseType);
}
};
return doGetWithSerializeFunction(httpRequest, convertResponse);
}
/**
* Do get operation for the http request.
*
* @param httpRequest the request
* @param responseType the response type
* @return the response
* @throws ApolloConfigException if any error happened or response code is neither 200 nor 304
*/
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Type responseType) {
Function<String, T> convertResponse = new Function<String, T>() {
@Override
public T apply(String input) {
return GSON.fromJson(input, responseType);
}
};
return doGetWithSerializeFunction(httpRequest, convertResponse);
}
private <T> HttpResponse<T> doGetWithSerializeFunction(HttpRequest httpRequest,
Function<String, T> serializeFunction) {
InputStreamReader isr = null;
InputStreamReader esr = null;
int statusCode;
try {
HttpURLConnection conn = (HttpURLConnection) new URL(httpRequest.getUrl()).openConnection();
conn.setRequestMethod("GET");
Map<String, String> headers = httpRequest.getHeaders();
if (headers != null && headers.size() > 0) {
for (Map.Entry<String, String> entry : headers.entrySet()) {
conn.setRequestProperty(entry.getKey(), entry.getValue());
}
}
int connectTimeout = httpRequest.getConnectTimeout();
if (connectTimeout < 0) {
connectTimeout = m_configUtil.getConnectTimeout();
}
int readTimeout = httpRequest.getReadTimeout();
if (readTimeout < 0) {
readTimeout = m_configUtil.getReadTimeout();
}
conn.setConnectTimeout(connectTimeout);
conn.setReadTimeout(readTimeout);
conn.connect();
statusCode = conn.getResponseCode();
String response;
try {
isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8);
response = CharStreams.toString(isr);
} catch (IOException ex) {
/**
* according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html,
* we should clean up the connection by reading the response body so that the connection
* could be reused.
*/
InputStream errorStream = conn.getErrorStream();
if (errorStream != null) {
esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8);
try {
CharStreams.toString(esr);
} catch (IOException ioe) {
//ignore
}
}
// 200 and 304 should not trigger IOException, thus we must throw the original exception out
if (statusCode == 200 || statusCode == 304) {
throw ex;
}
// for status codes like 404, IOException is expected when calling conn.getInputStream()
throw new ApolloConfigStatusCodeException(statusCode, ex);
}
if (statusCode == 200) {
return new HttpResponse<>(statusCode, serializeFunction.apply(response));
}
if (statusCode == 304) {
return new HttpResponse<>(statusCode, null);
}
} catch (ApolloConfigStatusCodeException ex) {
throw ex;
} catch (Throwable ex) {
throw new ApolloConfigException("Could not complete get operation", ex);
} finally {
if (isr != null) {
try {
isr.close();
} catch (IOException ex) {
// ignore
}
}
if (esr != null) {
try {
esr.close();
} catch (IOException ex) {
// ignore
}
}
}
throw new ApolloConfigStatusCodeException(statusCode,
String.format("Get operation failed for %s", httpRequest.getUrl()));
}
}
| /*
* 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.util.http;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Function;
import com.google.common.io.CharStreams;
import com.google.gson.Gson;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultHttpClient implements HttpClient {
private ConfigUtil m_configUtil;
private static final Gson GSON = new Gson();
/**
* Constructor.
*/
public DefaultHttpClient() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
/**
* Do get operation for the http request.
*
* @param httpRequest the request
* @param responseType the response type
* @return the response
* @throws ApolloConfigException if any error happened or response code is neither 200 nor 304
*/
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Class<T> responseType) {
Function<String, T> convertResponse = new Function<String, T>() {
@Override
public T apply(String input) {
return GSON.fromJson(input, responseType);
}
};
return doGetWithSerializeFunction(httpRequest, convertResponse);
}
/**
* Do get operation for the http request.
*
* @param httpRequest the request
* @param responseType the response type
* @return the response
* @throws ApolloConfigException if any error happened or response code is neither 200 nor 304
*/
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Type responseType) {
Function<String, T> convertResponse = new Function<String, T>() {
@Override
public T apply(String input) {
return GSON.fromJson(input, responseType);
}
};
return doGetWithSerializeFunction(httpRequest, convertResponse);
}
private <T> HttpResponse<T> doGetWithSerializeFunction(HttpRequest httpRequest,
Function<String, T> serializeFunction) {
InputStreamReader isr = null;
InputStreamReader esr = null;
int statusCode;
try {
HttpURLConnection conn = (HttpURLConnection) new URL(httpRequest.getUrl()).openConnection();
conn.setRequestMethod("GET");
Map<String, String> headers = httpRequest.getHeaders();
if (headers != null && headers.size() > 0) {
for (Map.Entry<String, String> entry : headers.entrySet()) {
conn.setRequestProperty(entry.getKey(), entry.getValue());
}
}
int connectTimeout = httpRequest.getConnectTimeout();
if (connectTimeout < 0) {
connectTimeout = m_configUtil.getConnectTimeout();
}
int readTimeout = httpRequest.getReadTimeout();
if (readTimeout < 0) {
readTimeout = m_configUtil.getReadTimeout();
}
conn.setConnectTimeout(connectTimeout);
conn.setReadTimeout(readTimeout);
conn.connect();
statusCode = conn.getResponseCode();
String response;
try {
isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8);
response = CharStreams.toString(isr);
} catch (IOException ex) {
/**
* according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html,
* we should clean up the connection by reading the response body so that the connection
* could be reused.
*/
InputStream errorStream = conn.getErrorStream();
if (errorStream != null) {
esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8);
try {
CharStreams.toString(esr);
} catch (IOException ioe) {
//ignore
}
}
// 200 and 304 should not trigger IOException, thus we must throw the original exception out
if (statusCode == 200 || statusCode == 304) {
throw ex;
}
// for status codes like 404, IOException is expected when calling conn.getInputStream()
throw new ApolloConfigStatusCodeException(statusCode, ex);
}
if (statusCode == 200) {
return new HttpResponse<>(statusCode, serializeFunction.apply(response));
}
if (statusCode == 304) {
return new HttpResponse<>(statusCode, null);
}
} catch (ApolloConfigStatusCodeException ex) {
throw ex;
} catch (Throwable ex) {
throw new ApolloConfigException("Could not complete get operation", ex);
} finally {
if (isr != null) {
try {
isr.close();
} catch (IOException ex) {
// ignore
}
}
if (esr != null) {
try {
esr.close();
} catch (IOException ex) {
// ignore
}
}
}
throw new ApolloConfigStatusCodeException(statusCode,
String.format("Get operation failed for %s", httpRequest.getUrl()));
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js | /*!
* angular-translate - v2.18.1 - 2018-05-19
*
* Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT
*/
!function(t,e){"function"==typeof define&&define.amd?define([],function(){return e()}):"object"==typeof module&&module.exports?module.exports=e():e()}(0,function(){function t(t){"use strict";var n;if(1===angular.version.major&&4<=angular.version.minor){var o=t.get("$cookies");n={get:function(t){return o.get(t)},put:function(t,e){o.put(t,e)}}}else{var r=t.get("$cookieStore");n={get:function(t){return r.get(t)},put:function(t,e){r.put(t,e)}}}return{get:function(t){return n.get(t)},set:function(t,e){n.put(t,e)},put:function(t,e){n.put(t,e)}}}return t.$inject=["$injector"],angular.module("pascalprecht.translate").factory("$translateCookieStorage",t),t.displayName="$translateCookieStorage","pascalprecht.translate"}); | /*!
* angular-translate - v2.18.1 - 2018-05-19
*
* Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT
*/
!function(t,e){"function"==typeof define&&define.amd?define([],function(){return e()}):"object"==typeof module&&module.exports?module.exports=e():e()}(0,function(){function t(t){"use strict";var n;if(1===angular.version.major&&4<=angular.version.minor){var o=t.get("$cookies");n={get:function(t){return o.get(t)},put:function(t,e){o.put(t,e)}}}else{var r=t.get("$cookieStore");n={get:function(t){return r.get(t)},put:function(t,e){r.put(t,e)}}}return{get:function(t){return n.get(t)},set:function(t,e){n.put(t,e)},put:function(t,e){n.put(t,e)}}}return t.$inject=["$injector"],angular.module("pascalprecht.translate").factory("$translateCookieStorage",t),t.displayName="$translateCookieStorage","pascalprecht.translate"}); | -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/core/MetaDomainConsts.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;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default
* ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
* <p>
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
* <p>
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = DeferredLoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select
* one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the
* comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap
.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
* <p>
* <br />
* <p>
* In production environment, we still suggest using one single domain like
* http://config.xxx.com(backed by software load balancers like nginx) instead of multiple ip
* addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer
.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn(
"Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger
.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| /*
* 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;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default
* ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
* <p>
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
* <p>
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = DeferredLoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select
* one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the
* comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap
.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
* <p>
* <br />
* <p>
* In production environment, we still suggest using one single domain like
* http://config.xxx.com(backed by software load balancers like nginx) instead of multiple ip
* addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer
.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn(
"Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger
.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/core/dto/ApolloNotificationMessages.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.dto;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloNotificationMessages {
private Map<String, Long> details;
public ApolloNotificationMessages() {
this(Maps.<String, Long>newHashMap());
}
private ApolloNotificationMessages(Map<String, Long> details) {
this.details = details;
}
public void put(String key, long notificationId) {
details.put(key, notificationId);
}
public Long get(String key) {
return this.details.get(key);
}
public boolean has(String key) {
return this.details.containsKey(key);
}
public boolean isEmpty() {
return this.details.isEmpty();
}
public Map<String, Long> getDetails() {
return details;
}
public void setDetails(Map<String, Long> details) {
this.details = details;
}
public void mergeFrom(ApolloNotificationMessages source) {
if (source == null) {
return;
}
for (Map.Entry<String, Long> entry : source.getDetails().entrySet()) {
//to make sure the notification id always grows bigger
if (this.has(entry.getKey()) &&
this.get(entry.getKey()) >= entry.getValue()) {
continue;
}
this.put(entry.getKey(), entry.getValue());
}
}
public ApolloNotificationMessages clone() {
return new ApolloNotificationMessages(ImmutableMap.copyOf(this.details));
}
}
| /*
* 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.dto;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloNotificationMessages {
private Map<String, Long> details;
public ApolloNotificationMessages() {
this(Maps.<String, Long>newHashMap());
}
private ApolloNotificationMessages(Map<String, Long> details) {
this.details = details;
}
public void put(String key, long notificationId) {
details.put(key, notificationId);
}
public Long get(String key) {
return this.details.get(key);
}
public boolean has(String key) {
return this.details.containsKey(key);
}
public boolean isEmpty() {
return this.details.isEmpty();
}
public Map<String, Long> getDetails() {
return details;
}
public void setDetails(Map<String, Long> details) {
this.details = details;
}
public void mergeFrom(ApolloNotificationMessages source) {
if (source == null) {
return;
}
for (Map.Entry<String, Long> entry : source.getDetails().entrySet()) {
//to make sure the notification id always grows bigger
if (this.has(entry.getKey()) &&
this.get(entry.getKey()) >= entry.getValue()) {
continue;
}
this.put(entry.getKey(), entry.getValue());
}
}
public ApolloNotificationMessages clone() {
return new ApolloNotificationMessages(ImmutableMap.copyOf(this.details));
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/annotation/ApolloConfig.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.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to inject Apollo Config Instance.
*
* <p>Usage example:</p>
* <pre class="code">
* //Inject the config for "someNamespace"
* @ApolloConfig("someNamespace")
* private Config config;
* </pre>
*
* <p>Usage example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* @ApolloConfig("${redis.namespace:xxx}")
* private Config config;
* </pre>
*
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@Documented
public @interface ApolloConfig {
/**
* Apollo namespace for the config, if not specified then default to application
*/
String value() default ConfigConsts.NAMESPACE_APPLICATION;
}
| /*
* 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.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to inject Apollo Config Instance.
*
* <p>Usage example:</p>
* <pre class="code">
* //Inject the config for "someNamespace"
* @ApolloConfig("someNamespace")
* private Config config;
* </pre>
*
* <p>Usage example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* @ApolloConfig("${redis.namespace:xxx}")
* private Config config;
* </pre>
*
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@Documented
public @interface ApolloConfig {
/**
* Apollo namespace for the config, if not specified then default to application
*/
String value() default ConfigConsts.NAMESPACE_APPLICATION;
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/foundation/internals/provider/DefaultServerProviderTest.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.provider;
import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX;
import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.foundation.internals.Utils;
import java.io.File;
import java.io.FileInputStream;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.foundation.internals.provider.DefaultServerProvider;
public class DefaultServerProviderTest {
private DefaultServerProvider defaultServerProvider;
@Before
public void setUp() throws Exception {
cleanUp();
defaultServerProvider = new DefaultServerProvider();
}
@After
public void tearDown() throws Exception {
cleanUp();
}
private void cleanUp() {
System.clearProperty("env");
System.clearProperty("idc");
System.clearProperty("apollo.path.server.properties");
}
@Test
public void testGetServerPropertiesPathDefault() {
assertEquals(Utils.isOSWindows() ? DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS
: DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX, defaultServerProvider.getServerPropertiesPath());
}
@Test
public void testGetServerPropertiesPathCustom() {
final String customPath = "/simple/custom/path";
System.setProperty("apollo.path.server.properties", customPath);
assertEquals(customPath, defaultServerProvider.getServerPropertiesPath());
}
@Test
public void testEnvWithSystemProperty() throws Exception {
String someEnv = "someEnv";
String someDc = "someDc";
System.setProperty("env", someEnv);
System.setProperty("idc", someDc);
defaultServerProvider.initialize(null);
assertEquals(someEnv, defaultServerProvider.getEnvType());
assertEquals(someDc, defaultServerProvider.getDataCenter());
}
@Test
public void testWithPropertiesStream() throws Exception {
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
assertEquals("SHAJQ", defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals("DEV", defaultServerProvider.getEnvType());
}
@Test
public void testWithUTF8BomPropertiesStream() throws Exception {
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server-with-utf8bom.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
assertEquals("SHAJQ", defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals("DEV", defaultServerProvider.getEnvType());
}
@Test
public void testWithPropertiesStreamAndEnvFromSystemProperty() throws Exception {
String prodEnv = "pro";
System.setProperty("env", prodEnv);
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
String predefinedDataCenter = "SHAJQ";
assertEquals(predefinedDataCenter, defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals(prodEnv, defaultServerProvider.getEnvType());
}
@Test
public void testWithNoPropertiesStream() throws Exception {
defaultServerProvider.initialize(null);
assertNull(defaultServerProvider.getDataCenter());
assertFalse(defaultServerProvider.isEnvTypeSet());
assertNull(defaultServerProvider.getEnvType());
}
}
| /*
* 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.provider;
import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX;
import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.foundation.internals.Utils;
import java.io.File;
import java.io.FileInputStream;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.foundation.internals.provider.DefaultServerProvider;
public class DefaultServerProviderTest {
private DefaultServerProvider defaultServerProvider;
@Before
public void setUp() throws Exception {
cleanUp();
defaultServerProvider = new DefaultServerProvider();
}
@After
public void tearDown() throws Exception {
cleanUp();
}
private void cleanUp() {
System.clearProperty("env");
System.clearProperty("idc");
System.clearProperty("apollo.path.server.properties");
}
@Test
public void testGetServerPropertiesPathDefault() {
assertEquals(Utils.isOSWindows() ? DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS
: DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX, defaultServerProvider.getServerPropertiesPath());
}
@Test
public void testGetServerPropertiesPathCustom() {
final String customPath = "/simple/custom/path";
System.setProperty("apollo.path.server.properties", customPath);
assertEquals(customPath, defaultServerProvider.getServerPropertiesPath());
}
@Test
public void testEnvWithSystemProperty() throws Exception {
String someEnv = "someEnv";
String someDc = "someDc";
System.setProperty("env", someEnv);
System.setProperty("idc", someDc);
defaultServerProvider.initialize(null);
assertEquals(someEnv, defaultServerProvider.getEnvType());
assertEquals(someDc, defaultServerProvider.getDataCenter());
}
@Test
public void testWithPropertiesStream() throws Exception {
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
assertEquals("SHAJQ", defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals("DEV", defaultServerProvider.getEnvType());
}
@Test
public void testWithUTF8BomPropertiesStream() throws Exception {
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server-with-utf8bom.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
assertEquals("SHAJQ", defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals("DEV", defaultServerProvider.getEnvType());
}
@Test
public void testWithPropertiesStreamAndEnvFromSystemProperty() throws Exception {
String prodEnv = "pro";
System.setProperty("env", prodEnv);
File baseDir = new File("src/test/resources/properties");
File serverProperties = new File(baseDir, "server.properties");
defaultServerProvider.initialize(new FileInputStream(serverProperties));
String predefinedDataCenter = "SHAJQ";
assertEquals(predefinedDataCenter, defaultServerProvider.getDataCenter());
assertTrue(defaultServerProvider.isEnvTypeSet());
assertEquals(prodEnv, defaultServerProvider.getEnvType());
}
@Test
public void testWithNoPropertiesStream() throws Exception {
defaultServerProvider.initialize(null);
assertNull(defaultServerProvider.getDataCenter());
assertFalse(defaultServerProvider.isEnvTypeSet());
assertNull(defaultServerProvider.getEnvType());
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/values.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.
#
name: apollo-portal
fullNameOverride: ""
replicaCount: 1
containerPort: 8070
image:
repository: apolloconfig/apollo-portal
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8070
targetPort: 8070
type: ClusterIP
sessionAffinity: ClientIP
ingress:
enabled: false
annotations: {}
hosts:
- host: ""
paths: []
tls: []
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
config:
# spring profiles to activate
profiles: "github,auth"
# specify the env names, e.g. dev,pro
envs: ""
# specify the meta servers, e.g.
# dev: http://apollo-configservice-dev:8080
# pro: http://apollo-configservice-pro:8080
metaServers: {}
# specify the context path, e.g. /apollo
contextPath: ""
# extra config files for apollo-portal, e.g. application-ldap.yml
files: {}
portaldb:
name: apollo-portaldb
# apolloportaldb host
host:
port: 3306
dbName: ApolloPortalDB
# apolloportaldb user name
userName:
# apolloportaldb password
password:
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
| #
# 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.
#
name: apollo-portal
fullNameOverride: ""
replicaCount: 1
containerPort: 8070
image:
repository: apolloconfig/apollo-portal
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8070
targetPort: 8070
type: ClusterIP
sessionAffinity: ClientIP
ingress:
enabled: false
annotations: {}
hosts:
- host: ""
paths: []
tls: []
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
config:
# spring profiles to activate
profiles: "github,auth"
# specify the env names, e.g. dev,pro
envs: ""
# specify the meta servers, e.g.
# dev: http://apollo-configservice-dev:8080
# pro: http://apollo-configservice-pro:8080
metaServers: {}
# specify the context path, e.g. /apollo
contextPath: ""
# extra config files for apollo-portal, e.g. application-ldap.yml
files: {}
portaldb:
name: apollo-portaldb
# apolloportaldb host
host:
port: 3306
dbName: ApolloPortalDB
# apolloportaldb user name
userName:
# apolloportaldb password
password:
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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-server-url-config.png | PNG
IHDR F )!}
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 ;IDATx}],uU {D~PR"_ğCH b; BX)RD xJĀHQhdc{Wouk sSݵo}=<̀0f 3`́0f 3`
0f 3`̀0f 3`Ȁ?J#+ <x1 3`x"+
f^Q}> / ֫]DBf* >\J31瘯 w|}8f 3`.jco}i b1StJ+@Gc?3`̀0kdQov=*<<Xp2Qc0f KaZSTipG)3
we}O1>ӟ6SGG;c 뺐P &nw
{r
f 3`j =1~p<ՊJ,68M @>L:F,:8#om®qͭj^:3`̀0#0FF
Z";ti<
ĺ3p0t
gW_̀0f E?X\,ݑϸ'`mͺZ]0f \#OOH1,r][2&D ` é_Tڦ1̀0f 1Bku#4ΰqY>E;6(4Y<mR\-O5&Z-).ߊg?3`̀0kdWO53`̀0ga,80f 3`Ȁ3f 3`pcp5f 3`pctF 3`̀Xnu 3`̀8#nHS3`̀0b mJ]3Gtsp*u.{v0f kc-}h(HpM )1ν'3`̀0 Rjs 9){f 36}uŧ&DmSY ¸hW=c|)r2y18juh|v 0f 30dyG&u
'M\5bZǚJPLk#~v.ײ0f 30'7-1(~h|m=ķ1Tu|3esQƎmf 3`e1hRPii.ZI<hVì0f@ ?#Oic&f
lbN5)X40f a k
7g}-!^ȫѦh8E;c58n<n٩ט yWl̀0f HҞƂ
|̀0f 2pe}3`̀00p470f 3`(+3`̀0f l7F9k 3`̀aQA63`̀0av;5f 3`z= m6lF-uK7G5f 3Vh:4CCPe6
ͥC-X>Ͼf 3`*%.հrϥss45f -0p1ʚ"}&Fu<}O8+6}TG|51>jW 1Θ˱Wx6f 3`8kcݼq 6n0KvbjX毭KX5a}-3`̀0]w >`"Ok͑+Ssg~jC ĺHY 3`@gmPb 6mUk2ơODbʏ)R66f 3*~͑]j:w6@uiE 7Ed³0f gbM }K̀61|8榽FcFE]3xȑ?x6f 3`XUcV 84,RqQ}N3`̀05F$6@riܻ^3`̀.ms3`̀0f`nVsof 3`̀haQ K1f 3`6M 7ì0f 0ƨ%3`̀0`|}NKSU yp uaqx K8ԛd>w'<nu\2fs8t} o~SZ\#/:O!^ `-w&})j,}k0f` l1ZKS7 ]Iz f` ls7ECO$bD=h5 1TO8?1zF[ă\j6U48!d`ЇxO %L?I=fTWZ+n)F9tl0{3`NbцwD ȥ? *c|)ay!OmAZ/b X5}͏:|W[m
,)v\G?u]vbGʺ.at.X[)OElأ.c 3kW:3` #2C!62[-U_8b<Ѿ9ߘ=%pA|yl=_:l1vl̀ ja^(nCo͘R{)̑oSt쥿̀3 fsTeȿPK-:mRϦrm`ͧg\KZK)Zt{ /-ubfXCe8jSvSr}f"[zC-:RѲat%Rm">W{ѧ636QhaQXQV,2 e3qԧ'1ӧfF=k Nf)AF;ƒשj60f`ӍѺfp7/f0]l0f`K 1i7Eygg;4f pcT3`̀0f`c l7vޮ0f 3ȀFf̀0f \?nC3`̀0f7FD]nnp^X 9.Xk# kkf̀0'1oV|ʧ=
_g#g/mq?0siᣄ vXJKyZ Ŝ ~ esJk mZV Z>aNf lQ|Co%16g?o [6 P7#XRzro<qX#gs--T8-c6dc6f|J9Lqؙ ols{6sX5Q'tsɿ3^CX̀0 lڛ+GaXǧ?j]GfSq]:w DhV#C oeR -&%KSGLFa}*9Cy3Q9a_ʁb`XSSa m2({3Fs͐ʺePfkJPWr[TAI>R@yE,4ʱ($mQ2ܶ>Hn(D >̀0} l18iG$;~Ŏ,r$zxzS㭄l(Tc\oHn3p= l1±i_Q, 6;L!o(Q.[Ja=([.NQ,4Z0[|v0c`sozҦhˀG{aZŭM{ D zDŽ ?t MZ/qKỳ8?Odj)Q[xz7a GS?p-Zҟ~F{+ cO
E`W[)'1Ҷ-J4+^´ 31(#fնY̶j\0kbʅa`ct,4ڼ6S1=-*q̀0ʀ)^3`̀0fO6}0f 3 1R66f 3`6̀M 7ò0f (n+_?IiW φEn")✸ y\ /IԘ g`_Hf1^]G#balwͲɏ@ x\ι=tF jx-zŅ?}x6gϿ01?-ϪOs9"GεXGZf` l7RCċ'g?ԑzl6g G\Č %;p!YhYރ8lxϖO08B%avvU5φ X 9 t
eWm[g`s (p!0 #_q8nPGȻʈr4+䑡AwSh;
\́Y*yXwC :A?!zQ;g2Q/gaQ`-B&U& 5_ŦEe6"NC 1:A?!zQ;Ĝ
oL
1kd`SdjohnRY8Dm2[Ӂޝb嶨 |X
.ɇ90k?ڣ\È}17j& rLRRbq+
5bUρ8#7u#ԷZ b !s17 07 l1iӳER{4tR\!*]H565>.`,1Q_AD95m*-뤊^Le^zH+Cj%=΅]g6@&P{3Ч?4HٻwT L#ʗp!U# X guP Sk)*hX:7)-2ŷŧ%OK.kc`?|7&MbBJb|;gگa
t K~joY+F)G |5f2?$Gs
krK%8bYRkG1J9jqQ86 l?oDGl-4ΧN}"P,>&%BaFsbcAhz/}zMF35bR&`RNb4
vڨ5gƨTy\O 34VmGW"n.|g[0 7kb5kD6Q% ԾfB8/ì8i 5aO6sި0f 3ǀ1d0f 3m樽Q3`̀0f7F} ǹ0f l7F9jo 3`̀c`s|෭opt3 ٣ |Q̰5F_헴
Ne9 [ߘ Y 2[x;5% >{mگ9b,>11 /D}1z n-&jV\{h?ԏowI{6~װDK:RЭ}\/}Wd
Zj={kkP?<}}qO @vÇѭ'nͻC: ݇wr(D`{@gRjg*dجvr ƣDEs\I{Twk\4SW=/u>
9ݙ躯hcwf]}=u;AA}sOҮ݈>ԫ:Fyؔ9 ǻevEP_]33)TO8 Y`hܘ= %y5@>;:3P8 QO d]#r hy c 2sb,NmG}ȧ xGmZ q?}39ڈU^hי/}f]Wڨa¿_K=|c8 >鿗wO;ow?c~κwOB ) &Xa'Nԕbh?(ma 朧h. x{яt~ɵ̀0f ,[[ X
wv_v?x> fz6.pU9D #F3 oHwfHy+Ԟf+) 3`.绯]{|{駻'x9ucbg,fK>݉!M)M^tc|xR>c}/to?|u";W [9b{{5*zm j~q-զk+Г+1ߍZlԫ,w^[[ûFdsuQfl3hSY[#^1&OU9,K:e6'G %}r ;"FfW_]g1eE[M_3u۟|}:|?({go7V[oe<v._~vz^|/Qʺ b&c|(ɌsRYs*֓a_i c*Q&Fʺ9 e97Eߘf.ƩRhW|8UiKr_\3s~:bOV:ØV4o _ާs?=s'G{[lK? Ne]l ~VsLnv ݯ?_?SGCk{tkb,=>ve7o
Q}EJ㩃OMO>;q%ӕ|"&W}_K[XbRF\EY}f3}Ԯ6ӗ_3ٜŕlyՎZK=4~c*KqGcìC}WlG^EN8Ǹv5skb®6Gm-:4X@c?S7OٮVw{?yTB|f> Fя2p#ts"v.'{Wԟ~;߹_gO8 c C( ,q (/Qs)=
?}O}rk{_۽=vz'|Ԧmc.gWqA#~H
M ;fOv/w?nk}=u/ ݗ?r=|;㯏 <0ܿ tϰ{E7F \D}~Y1[< 9p\뾖8*sαh >!ǭk4Dn̾(4،?xyv 3` {ftrdS9ƨ9Ѝì0f b K5f 3`eѼ
?yUŹ^xn{.́| Wk#b_/.9*ט eщ< C~ݍelG| M~2LOs.Eᣄ uffСx|Fl$7c"yH(߸Q AgF =S=Z]5[Md^kl)Y\f+aE cl9ejKZ ^>1{" of~3 9]-ֶy[zSumBh食m
XtK mƲY-S"DŽY12[
,.ei}ql9e 2$־c`_8}mαrGߛ6xn/z/}RfˮV1.#Sqw);KΥ}7<.}Vxqd( GmlW\+FyJyAY^!R^O}4p1&K ։5u{\ڃZz
A#E`%],.LEhD}I&c(kʡ6a ebG=k2[K3[ z2jXΥQ76. 5X/F!u#F(5 g }E.EMTRuI>
X́n 7 {g-Q \J@ ڢ 1ne2kbRV>[bu"Δr7jqcpkQØ16 pWar l1.L6E,r WJ핫Ŏ,r$ܪ~ptƏ)6#qj].rҶtSjݵz3)9[cjf21/kZէ?4H(6jT L#ʕncͣtP}(@u$܁6_.ju[+]}m}8J~V] ->k\cC Rߔ)ZB`}h/lP~Do@5 ry}r}ka$wf#v?lt&}q`euj `AI#Z7B ŧDlڪ_ZY f|WD%P1\3bӖa¿4ǙXs)~=rAZY1) D2nkgq1`,*kʘ.1yt֜:їJq>2|x-dփYqJXY-sJ5-U^6F8xAJG5Vº8R*N&|Q+?6[ Y遲j~5\s͙Qs^3n\ g83T)J}6W96s, ݷ1xYM7FP<ajB &òt{ {~K jo֞kdO֫z-kgOH[Up:ݩf`@vSK ckq0cG/|Ӂg^}hÇcm˽xà0 ]ݯد>sh|pb.1Cv ?K~~==3݃ >NssA 0f 3FvM-oFC@싋no[ӿ s3`̀0s3 = 釛YϙpBy# wer3`̀033_gy'z{' ; ~.g+9y[oսݗ> /7H'iW~_|߽vʫ7/ ^|is)>J8#r3dV<+-4QS<7S`Fu}qfmLjul jq-S2L lчA q3}kSx]rf8# eL>>Ó"~{=s=sn}_toM/u_%|b}Cbw/zdS
8j^nÜKQsafR}.bE6Y.ba5oV߭9Ym; B3ΰ-3[VW2LQzl7QZԚ/cʺFʺ fx1bm7 <)z;ޱowu<?N˹z?c W>Z$ ^v]^tW0MxvÜ#$9 63МϗLlCfͩ,!qn1q_#D_ =<r4fuk`EY.]lͬ 3S#d6[m.9Z hYlwI}
~q)#_tcJYW\0q!)e? ]OۢoqXc {н};3
J)d-qCHShc(\`*B|93sMO{i]:Qb:'n" .(m1rnZâMe@ P_ Ĥ ҢqKrVkfai=JX@3[~` к<6}3D?mQƽ5<5}?| }-EwŦ?Fk/YGʺʺXiJyṵLlx1\OG<gpV_kGq.a'RG9l>Gʺ.w H )|bNZTgoxy
\u-b-*G_u sP\ joD8*1gO9BjO?1"xp!3;kg=MnD쓻5?5|TuAN>z~\/1$Fd*FfrfS9Ɨt%
ZJ11C[i\OM^hkk[x$:6\#KFAeeŗxf-{f& Ofo)?c2[l)١DŠ L8 coQv3YNH).(ޮ5OqFSau
{SJ@Aq
T > VJ284arMWªJՙ~ءW]x}38WaLAXk~1*YuXO -:G͢>Uuu#Q)lo3[62bxh<c2֥7TG T5*zy 5A z>?W^h>xԨ/~2; {D{a:Ux|7wȑ%XF2q/ ecLUwFuVG_\loC=h;e bS2cj~hضoˏXb |CW e}PGC" rLɀ!G0Tl1V1NuF ؈Si,à?XsQ ?)c>jk^BTzʵ8vb%(6݂Ceҿf]?kW{QV 56lGŦtѯd.VW=sh-IgP>}vy^nuYն` :lU53s_錯͍xī#g
}NNwbF^zSw/}n(1'KZ뮙7F|ޛ0f 30_cg3`̀0f \%nX)3`̀0f` nư3`̀0f*pctZ|sڵ2s:}q dB̛٢3sb{o y<rψoD,̙M_>240/fW)Kc(@oq#^ }V #~7s<%vkMIb3M,Ljul jqeO|luPZ3}YIF8g1Sx]rPF^[y l 3}r #`mf1 0OmÌqя8Q e}ӎLf,6c~CZvPhlї2kL=f8-[ _f5>1964a`_8<Y rU}>,7. QV9<7e9rL멄YeUf+F%X7-Q[k^Kqq/~a 6QZő0 #_q ꣯Ȼ}43H(!"O . X=( .KD
&"4a$15P02sJ_/T:M1JkFLl5=0`ӹ3ԟgYoiTch3A6BJX(+r-j$ K!hb*?cDGY sc((G[n 嚘cXqf6> 9X#rZ2[V:戶 }>%;L9Zw-~Seq l1.L6Et`TR{&jK{-%>/1x;lJ8X}Z:Aq֗6n-gckD(/kzZէ?4H(6jT L#ʕ iὔWkXu$6_.UJW,0ESe k 'U!)-l5wso Mb^5^ @R{*_<]~H os,uf#1;VCkcCFY7v̅;vcⰇ) Sc1D6^DGl-q#^1C }"P,>&KDU=u^fz[X'bEzbAA }:9hS }ּf1^7kqKP)tIK-Gm#ʌF?9lGbbѯd." vOF}XG[sh-j_~u ŀj|-j v510b2i:z |:ksc4#*BӝXï?<^ K [{eJ ɒֺkf5f̀0f b`|=!;3`̀0af5f 3`pcǐf 3`fpcƯ6
m*s|Mp_ŴڥB,2E_g%Z>3<xp.~ÈX3 ch#a^9QN 63[
/+ 3ї>6 vDw%6%p_ibgø%fVk[Q=l_[k<1裳SOFڬģ6^'ȫD9[^'}b4-5D<F#bmm C\|cl@cj f kULf,6cU謞V1qV?8-[ZLf0k Mtu ^æcmCb{>6s>ڗόEcD`ϵ371g|-3y[l=:qOٲ#e{N%R- }5z>f`s .^°O̦~5
w>D}PFY!
#D!hR0m:#g;ڲ|E[2J"ح,.LEhD}I&c(kʡ6a ebG=Cgհ2[_ Zq#&[r!7l:`?[NѼb9~~6e/47 k 6BJX(+r-j$ K!hLrv }Z15wm)ڙ;LY DPc((G[n 嚘cXqf3}+lYnumfC1cl\-WK8Zc`SQva)ҦgcRj\D-vdᵔ#A)RWO% ;ΰ:j#:jx&2۹p}Dޢ\.E7~\SԻeM5F8hj>YAB!Q{GנZ`" Q:aRr_;R\U3@u$6_.UJW,fDș䯺Z>d6tZn9#L#7#}S֦h*r{qX@߫& To v
U5p#S+BW1gR osrflg:?[lxƍ/ֱ <u8M'-=%>bkv b(4\*%32|իNX؈O(E D_a 9h69y
P-aMτ]mhKP)tIG:(t :K-Q ;mQf,g5Ƙ%1Qf9KVچu`ƈ93̛㿳=~fi- l1Z! cWۂ 301u3s_ЍW!G rC] /x;̗>t x%ùk>] 3`̀&zCv6f 3`6À 7j̀0f 1ƨ!̀0f 0p1 fN5f 3`e`U_Xǚ~j{ΣxK}R 6f 3pi ѹolP
mbCAf\=d f 3`@U4FYS:ݲTrznڹ0f lQ_S61qxSY:૱Q=tQ`vXm8ݳ0f 2pƨ] cm X d'Vf5hںZ5ne3`̀0[b?|͏vlZ@Ly`5ȕխ3?!ub]pSym̀0f6F( ݼimM5gcY>}f 3`*~Q+~k|oHs5ķ H.m㦈Lx6f 3Pf?cK⍛sM f@jj sj?1#VĢ.C Qf<N 3`VXUcC8&@bbluC\k3f 3vV%
MGl2c.e\
3`U5F82 3`̀U\30f 3`0h[5f 3`7FW}ޜ0f 30э~s 3`̀0@՚S~~(y
,YѶ&y:kg3`̀0@1Zv 5=K}ϔu8p 3`̀0@1ʚ6'!S6sֹ%Xv3`̀"ǨSmdF=uuC¸hW=c|)r2y18juh|,k3`̀0f` dF3{(Le]Ie@jS=%t9Ʊ<_;g 3`̀g
S~` m;էTu|sjx|(c63`̀08j^k.&
LKsJ0G9.<ػ1̀0f @ MzƁ
{8bk7Ed߹̀0fYހ9-MIɖvRhS{i Qx k u7 7kLAn9 0f 3@nh,P(sÒ0f 3hjbS̀0f 3piuf 3`%2OMd IENDB` | PNG
IHDR F )!}
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 ;IDATx}],uU {D~PR"_ğCH b; BX)RD xJĀHQhdc{Wouk sSݵo}=<̀0f 3`́0f 3`
0f 3`̀0f 3`Ȁ?J#+ <x1 3`x"+
f^Q}> / ֫]DBf* >\J31瘯 w|}8f 3`.jco}i b1StJ+@Gc?3`̀0kdQov=*<<Xp2Qc0f KaZSTipG)3
we}O1>ӟ6SGG;c 뺐P &nw
{r
f 3`j =1~p<ՊJ,68M @>L:F,:8#om®qͭj^:3`̀0#0FF
Z";ti<
ĺ3p0t
gW_̀0f E?X\,ݑϸ'`mͺZ]0f \#OOH1,r][2&D ` é_Tڦ1̀0f 1Bku#4ΰqY>E;6(4Y<mR\-O5&Z-).ߊg?3`̀0kdWO53`̀0ga,80f 3`Ȁ3f 3`pcp5f 3`pctF 3`̀Xnu 3`̀8#nHS3`̀0b mJ]3Gtsp*u.{v0f kc-}h(HpM )1ν'3`̀0 Rjs 9){f 36}uŧ&DmSY ¸hW=c|)r2y18juh|v 0f 30dyG&u
'M\5bZǚJPLk#~v.ײ0f 30'7-1(~h|m=ķ1Tu|3esQƎmf 3`e1hRPii.ZI<hVì0f@ ?#Oic&f
lbN5)X40f a k
7g}-!^ȫѦh8E;c58n<n٩ט yWl̀0f HҞƂ
|̀0f 2pe}3`̀00p470f 3`(+3`̀0f l7F9k 3`̀aQA63`̀0av;5f 3`z= m6lF-uK7G5f 3Vh:4CCPe6
ͥC-X>Ͼf 3`*%.հrϥss45f -0p1ʚ"}&Fu<}O8+6}TG|51>jW 1Θ˱Wx6f 3`8kcݼq 6n0KvbjX毭KX5a}-3`̀0]w >`"Ok͑+Ssg~jC ĺHY 3`@gmPb 6mUk2ơODbʏ)R66f 3*~͑]j:w6@uiE 7Ed³0f gbM }K̀61|8榽FcFE]3xȑ?x6f 3`XUcV 84,RqQ}N3`̀05F$6@riܻ^3`̀.ms3`̀0f`nVsof 3`̀haQ K1f 3`6M 7ì0f 0ƨ%3`̀0`|}NKSU yp uaqx K8ԛd>w'<nu\2fs8t} o~SZ\#/:O!^ `-w&})j,}k0f` l1ZKS7 ]Iz f` ls7ECO$bD=h5 1TO8?1zF[ă\j6U48!d`ЇxO %L?I=fTWZ+n)F9tl0{3`NbцwD ȥ? *c|)ay!OmAZ/b X5}͏:|W[m
,)v\G?u]vbGʺ.at.X[)OElأ.c 3kW:3` #2C!62[-U_8b<Ѿ9ߘ=%pA|yl=_:l1vl̀ ja^(nCo͘R{)̑oSt쥿̀3 fsTeȿPK-:mRϦrm`ͧg\KZK)Zt{ /-ubfXCe8jSvSr}f"[zC-:RѲat%Rm">W{ѧ636QhaQXQV,2 e3qԧ'1ӧfF=k Nf)AF;ƒשj60f`ӍѺfp7/f0]l0f`K 1i7Eygg;4f pcT3`̀0f`c l7vޮ0f 3ȀFf̀0f \?nC3`̀0f7FD]nnp^X 9.Xk# kkf̀0'1oV|ʧ=
_g#g/mq?0siᣄ vXJKyZ Ŝ ~ esJk mZV Z>aNf lQ|Co%16g?o [6 P7#XRzro<qX#gs--T8-c6dc6f|J9Lqؙ ols{6sX5Q'tsɿ3^CX̀0 lڛ+GaXǧ?j]GfSq]:w DhV#C oeR -&%KSGLFa}*9Cy3Q9a_ʁb`XSSa m2({3Fs͐ʺePfkJPWr[TAI>R@yE,4ʱ($mQ2ܶ>Hn(D >̀0} l18iG$;~Ŏ,r$zxzS㭄l(Tc\oHn3p= l1±i_Q, 6;L!o(Q.[Ja=([.NQ,4Z0[|v0c`sozҦhˀG{aZŭM{ D zDŽ ?t MZ/qKỳ8?Odj)Q[xz7a GS?p-Zҟ~F{+ cO
E`W[)'1Ҷ-J4+^´ 31(#fնY̶j\0kbʅa`ct,4ڼ6S1=-*q̀0ʀ)^3`̀0fO6}0f 3 1R66f 3`6̀M 7ò0f (n+_?IiW φEn")✸ y\ /IԘ g`_Hf1^]G#balwͲɏ@ x\ι=tF jx-zŅ?}x6gϿ01?-ϪOs9"GεXGZf` l7RCċ'g?ԑzl6g G\Č %;p!YhYރ8lxϖO08B%avvU5φ X 9 t
eWm[g`s (p!0 #_q8nPGȻʈr4+䑡AwSh;
\́Y*yXwC :A?!zQ;g2Q/gaQ`-B&U& 5_ŦEe6"NC 1:A?!zQ;Ĝ
oL
1kd`SdjohnRY8Dm2[Ӂޝb嶨 |X
.ɇ90k?ڣ\È}17j& rLRRbq+
5bUρ8#7u#ԷZ b !s17 07 l1iӳER{4tR\!*]H565>.`,1Q_AD95m*-뤊^Le^zH+Cj%=΅]g6@&P{3Ч?4HٻwT L#ʗp!U# X guP Sk)*hX:7)-2ŷŧ%OK.kc`?|7&MbBJb|;gگa
t K~joY+F)G |5f2?$Gs
krK%8bYRkG1J9jqQ86 l?oDGl-4ΧN}"P,>&%BaFsbcAhz/}zMF35bR&`RNb4
vڨ5gƨTy\O 34VmGW"n.|g[0 7kb5kD6Q% ԾfB8/ì8i 5aO6sި0f 3ǀ1d0f 3m樽Q3`̀0f7F} ǹ0f l7F9jo 3`̀c`s|෭opt3 ٣ |Q̰5F_헴
Ne9 [ߘ Y 2[x;5% >{mگ9b,>11 /D}1z n-&jV\{h?ԏowI{6~װDK:RЭ}\/}Wd
Zj={kkP?<}}qO @vÇѭ'nͻC: ݇wr(D`{@gRjg*dجvr ƣDEs\I{Twk\4SW=/u>
9ݙ躯hcwf]}=u;AA}sOҮ݈>ԫ:Fyؔ9 ǻevEP_]33)TO8 Y`hܘ= %y5@>;:3P8 QO d]#r hy c 2sb,NmG}ȧ xGmZ q?}39ڈU^hי/}f]Wڨa¿_K=|c8 >鿗wO;ow?c~κwOB ) &Xa'Nԕbh?(ma 朧h. x{яt~ɵ̀0f ,[[ X
wv_v?x> fz6.pU9D #F3 oHwfHy+Ԟf+) 3`.绯]{|{駻'x9ucbg,fK>݉!M)M^tc|xR>c}/to?|u";W [9b{{5*zm j~q-զk+Г+1ߍZlԫ,w^[[ûFdsuQfl3hSY[#^1&OU9,K:e6'G %}r ;"FfW_]g1eE[M_3u۟|}:|?({go7V[oe<v._~vz^|/Qʺ b&c|(ɌsRYs*֓a_i c*Q&Fʺ9 e97Eߘf.ƩRhW|8UiKr_\3s~:bOV:ØV4o _ާs?=s'G{[lK? Ne]l ~VsLnv ݯ?_?SGCk{tkb,=>ve7o
Q}EJ㩃OMO>;q%ӕ|"&W}_K[XbRF\EY}f3}Ԯ6ӗ_3ٜŕlyՎZK=4~c*KqGcìC}WlG^EN8Ǹv5skb®6Gm-:4X@c?S7OٮVw{?yTB|f> Fя2p#ts"v.'{Wԟ~;߹_gO8 c C( ,q (/Qs)=
?}O}rk{_۽=vz'|Ԧmc.gWqA#~H
M ;fOv/w?nk}=u/ ݗ?r=|;㯏 <0ܿ tϰ{E7F \D}~Y1[< 9p\뾖8*sαh >!ǭk4Dn̾(4،?xyv 3` {ftrdS9ƨ9Ѝì0f b K5f 3`eѼ
?yUŹ^xn{.́| Wk#b_/.9*ט eщ< C~ݍelG| M~2LOs.Eᣄ uffСx|Fl$7c"yH(߸Q AgF =S=Z]5[Md^kl)Y\f+aE cl9ejKZ ^>1{" of~3 9]-ֶy[zSumBh食m
XtK mƲY-S"DŽY12[
,.ei}ql9e 2$־c`_8}mαrGߛ6xn/z/}RfˮV1.#Sqw);KΥ}7<.}Vxqd( GmlW\+FyJyAY^!R^O}4p1&K ։5u{\ڃZz
A#E`%],.LEhD}I&c(kʡ6a ebG=k2[K3[ z2jXΥQ76. 5X/F!u#F(5 g }E.EMTRuI>
X́n 7 {g-Q \J@ ڢ 1ne2kbRV>[bu"Δr7jqcpkQØ16 pWar l1.L6E,r WJ핫Ŏ,r$ܪ~ptƏ)6#qj].rҶtSjݵz3)9[cjf21/kZէ?4H(6jT L#ʕncͣtP}(@u$܁6_.ju[+]}m}8J~V] ->k\cC Rߔ)ZB`}h/lP~Do@5 ry}r}ka$wf#v?lt&}q`euj `AI#Z7B ŧDlڪ_ZY f|WD%P1\3bӖa¿4ǙXs)~=rAZY1) D2nkgq1`,*kʘ.1yt֜:їJq>2|x-dփYqJXY-sJ5-U^6F8xAJG5Vº8R*N&|Q+?6[ Y遲j~5\s͙Qs^3n\ g83T)J}6W96s, ݷ1xYM7FP<ajB &òt{ {~K jo֞kdO֫z-kgOH[Up:ݩf`@vSK ckq0cG/|Ӂg^}hÇcm˽xà0 ]ݯد>sh|pb.1Cv ?K~~==3݃ >NssA 0f 3FvM-oFC@싋no[ӿ s3`̀0s3 = 釛YϙpBy# wer3`̀033_gy'z{' ; ~.g+9y[oսݗ> /7H'iW~_|߽vʫ7/ ^|is)>J8#r3dV<+-4QS<7S`Fu}qfmLjul jq-S2L lчA q3}kSx]rf8# eL>>Ó"~{=s=sn}_toM/u_%|b}Cbw/zdS
8j^nÜKQsafR}.bE6Y.ba5oV߭9Ym; B3ΰ-3[VW2LQzl7QZԚ/cʺFʺ fx1bm7 <)z;ޱowu<?N˹z?c W>Z$ ^v]^tW0MxvÜ#$9 63МϗLlCfͩ,!qn1q_#D_ =<r4fuk`EY.]lͬ 3S#d6[m.9Z hYlwI}
~q)#_tcJYW\0q!)e? ]OۢoqXc {н};3
J)d-qCHShc(\`*B|93sMO{i]:Qb:'n" .(m1rnZâMe@ P_ Ĥ ҢqKrVkfai=JX@3[~` к<6}3D?mQƽ5<5}?| }-EwŦ?Fk/YGʺʺXiJyṵLlx1\OG<gpV_kGq.a'RG9l>Gʺ.w H )|bNZTgoxy
\u-b-*G_u sP\ joD8*1gO9BjO?1"xp!3;kg=MnD쓻5?5|TuAN>z~\/1$Fd*FfrfS9Ɨt%
ZJ11C[i\OM^hkk[x$:6\#KFAeeŗxf-{f& Ofo)?c2[l)١DŠ L8 coQv3YNH).(ޮ5OqFSau
{SJ@Aq
T > VJ284arMWªJՙ~ءW]x}38WaLAXk~1*YuXO -:G͢>Uuu#Q)lo3[62bxh<c2֥7TG T5*zy 5A z>?W^h>xԨ/~2; {D{a:Ux|7wȑ%XF2q/ ecLUwFuVG_\loC=h;e bS2cj~hضoˏXb |CW e}PGC" rLɀ!G0Tl1V1NuF ؈Si,à?XsQ ?)c>jk^BTzʵ8vb%(6݂Ceҿf]?kW{QV 56lGŦtѯd.VW=sh-IgP>}vy^nuYն` :lU53s_錯͍xī#g
}NNwbF^zSw/}n(1'KZ뮙7F|ޛ0f 30_cg3`̀0f \%nX)3`̀0f` nư3`̀0f*pctZ|sڵ2s:}q dB̛٢3sb{o y<rψoD,̙M_>240/fW)Kc(@oq#^ }V #~7s<%vkMIb3M,Ljul jqeO|luPZ3}YIF8g1Sx]rPF^[y l 3}r #`mf1 0OmÌqя8Q e}ӎLf,6c~CZvPhlї2kL=f8-[ _f5>1964a`_8<Y rU}>,7. QV9<7e9rL멄YeUf+F%X7-Q[k^Kqq/~a 6QZő0 #_q ꣯Ȼ}43H(!"O . X=( .KD
&"4a$15P02sJ_/T:M1JkFLl5=0`ӹ3ԟgYoiTch3A6BJX(+r-j$ K!hb*?cDGY sc((G[n 嚘cXqf6> 9X#rZ2[V:戶 }>%;L9Zw-~Seq l1.L6Et`TR{&jK{-%>/1x;lJ8X}Z:Aq֗6n-gckD(/kzZէ?4H(6jT L#ʕ iὔWkXu$6_.UJW,0ESe k 'U!)-l5wso Mb^5^ @R{*_<]~H os,uf#1;VCkcCFY7v̅;vcⰇ) Sc1D6^DGl-q#^1C }"P,>&KDU=u^fz[X'bEzbAA }:9hS }ּf1^7kqKP)tIK-Gm#ʌF?9lGbbѯd." vOF}XG[sh-j_~u ŀj|-j v510b2i:z |:ksc4#*BӝXï?<^ K [{eJ ɒֺkf5f̀0f b`|=!;3`̀0af5f 3`pcǐf 3`fpcƯ6
m*s|Mp_ŴڥB,2E_g%Z>3<xp.~ÈX3 ch#a^9QN 63[
/+ 3ї>6 vDw%6%p_ibgø%fVk[Q=l_[k<1裳SOFڬģ6^'ȫD9[^'}b4-5D<F#bmm C\|cl@cj f kULf,6cU謞V1qV?8-[ZLf0k Mtu ^æcmCb{>6s>ڗόEcD`ϵ371g|-3y[l=:qOٲ#e{N%R- }5z>f`s .^°O̦~5
w>D}PFY!
#D!hR0m:#g;ڲ|E[2J"ح,.LEhD}I&c(kʡ6a ebG=Cgհ2[_ Zq#&[r!7l:`?[NѼb9~~6e/47 k 6BJX(+r-j$ K!hLrv }Z15wm)ڙ;LY DPc((G[n 嚘cXqf3}+lYnumfC1cl\-WK8Zc`SQva)ҦgcRj\D-vdᵔ#A)RWO% ;ΰ:j#:jx&2۹p}Dޢ\.E7~\SԻeM5F8hj>YAB!Q{GנZ`" Q:aRr_;R\U3@u$6_.UJW,fDș䯺Z>d6tZn9#L#7#}S֦h*r{qX@߫& To v
U5p#S+BW1gR osrflg:?[lxƍ/ֱ <u8M'-=%>bkv b(4\*%32|իNX؈O(E D_a 9h69y
P-aMτ]mhKP)tIG:(t :K-Q ;mQf,g5Ƙ%1Qf9KVچu`ƈ93̛㿳=~fi- l1Z! cWۂ 301u3s_ЍW!G rC] /x;̗>t x%ùk>] 3`̀&zCv6f 3`6À 7j̀0f 1ƨ!̀0f 0p1 fN5f 3`e`U_Xǚ~j{ΣxK}R 6f 3pi ѹolP
mbCAf\=d f 3`@U4FYS:ݲTrznڹ0f lQ_S61qxSY:૱Q=tQ`vXm8ݳ0f 2pƨ] cm X d'Vf5hںZ5ne3`̀0[b?|͏vlZ@Ly`5ȕխ3?!ub]pSym̀0f6F( ݼimM5gcY>}f 3`*~Q+~k|oHs5ķ H.m㦈Lx6f 3Pf?cK⍛sM f@jj sj?1#VĢ.C Qf<N 3`VXUcC8&@bbluC\k3f 3vV%
MGl2c.e\
3`U5F82 3`̀U\30f 3`0h[5f 3`7FW}ޜ0f 30э~s 3`̀0@՚S~~(y
,YѶ&y:kg3`̀0@1Zv 5=K}ϔu8p 3`̀0@1ʚ6'!S6sֹ%Xv3`̀"ǨSmdF=uuC¸hW=c|)r2y18juh|,k3`̀0f` dF3{(Le]Ie@jS=%t9Ʊ<_;g 3`̀g
S~` m;էTu|sjx|(c63`̀08j^k.&
LKsJ0G9.<ػ1̀0f @ MzƁ
{8bk7Ed߹̀0fYހ9-MIɖvRhS{i Qx k u7 7kLAn9 0f 3@nh,P(sÒ0f 3hjbS̀0f 3piuf 3`%2OMd IENDB` | -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/listener/ConfigPublishEvent.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.listener;
import com.ctrip.framework.apollo.portal.environment.Env;
import org.springframework.context.ApplicationEvent;
public class ConfigPublishEvent extends ApplicationEvent {
private ConfigPublishInfo configPublishInfo;
public ConfigPublishEvent(Object source) {
super(source);
configPublishInfo = (ConfigPublishInfo) source;
}
public static ConfigPublishEvent instance() {
ConfigPublishInfo info = new ConfigPublishInfo();
return new ConfigPublishEvent(info);
}
public ConfigPublishInfo getConfigPublishInfo(){
return configPublishInfo;
}
public ConfigPublishEvent withAppId(String appId) {
configPublishInfo.setAppId(appId);
return this;
}
public ConfigPublishEvent withCluster(String clusterName) {
configPublishInfo.setClusterName(clusterName);
return this;
}
public ConfigPublishEvent withNamespace(String namespaceName) {
configPublishInfo.setNamespaceName(namespaceName);
return this;
}
public ConfigPublishEvent withReleaseId(long releaseId){
configPublishInfo.setReleaseId(releaseId);
return this;
}
public ConfigPublishEvent withPreviousReleaseId(long previousReleaseId){
configPublishInfo.setPreviousReleaseId(previousReleaseId);
return this;
}
public ConfigPublishEvent setNormalPublishEvent(boolean isNormalPublishEvent) {
configPublishInfo.setNormalPublishEvent(isNormalPublishEvent);
return this;
}
public ConfigPublishEvent setGrayPublishEvent(boolean isGrayPublishEvent) {
configPublishInfo.setGrayPublishEvent(isGrayPublishEvent);
return this;
}
public ConfigPublishEvent setRollbackEvent(boolean isRollbackEvent) {
configPublishInfo.setRollbackEvent(isRollbackEvent);
return this;
}
public ConfigPublishEvent setMergeEvent(boolean isMergeEvent) {
configPublishInfo.setMergeEvent(isMergeEvent);
return this;
}
public ConfigPublishEvent setEnv(Env env) {
configPublishInfo.setEnv(env);
return this;
}
public static class ConfigPublishInfo {
private String env;
private String appId;
private String clusterName;
private String namespaceName;
private long releaseId;
private long previousReleaseId;
private boolean isRollbackEvent;
private boolean isMergeEvent;
private boolean isNormalPublishEvent;
private boolean isGrayPublishEvent;
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(Env env) {
this.env = env.toString();
}
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 getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
public long getReleaseId() {
return releaseId;
}
public void setReleaseId(long releaseId) {
this.releaseId = releaseId;
}
public long getPreviousReleaseId() {
return previousReleaseId;
}
public void setPreviousReleaseId(long previousReleaseId) {
this.previousReleaseId = previousReleaseId;
}
public boolean isRollbackEvent() {
return isRollbackEvent;
}
public void setRollbackEvent(boolean rollbackEvent) {
isRollbackEvent = rollbackEvent;
}
public boolean isMergeEvent() {
return isMergeEvent;
}
public void setMergeEvent(boolean mergeEvent) {
isMergeEvent = mergeEvent;
}
public boolean isNormalPublishEvent() {
return isNormalPublishEvent;
}
public void setNormalPublishEvent(boolean normalPublishEvent) {
isNormalPublishEvent = normalPublishEvent;
}
public boolean isGrayPublishEvent() {
return isGrayPublishEvent;
}
public void setGrayPublishEvent(boolean grayPublishEvent) {
isGrayPublishEvent = grayPublishEvent;
}
}
}
| /*
* 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.listener;
import com.ctrip.framework.apollo.portal.environment.Env;
import org.springframework.context.ApplicationEvent;
public class ConfigPublishEvent extends ApplicationEvent {
private ConfigPublishInfo configPublishInfo;
public ConfigPublishEvent(Object source) {
super(source);
configPublishInfo = (ConfigPublishInfo) source;
}
public static ConfigPublishEvent instance() {
ConfigPublishInfo info = new ConfigPublishInfo();
return new ConfigPublishEvent(info);
}
public ConfigPublishInfo getConfigPublishInfo(){
return configPublishInfo;
}
public ConfigPublishEvent withAppId(String appId) {
configPublishInfo.setAppId(appId);
return this;
}
public ConfigPublishEvent withCluster(String clusterName) {
configPublishInfo.setClusterName(clusterName);
return this;
}
public ConfigPublishEvent withNamespace(String namespaceName) {
configPublishInfo.setNamespaceName(namespaceName);
return this;
}
public ConfigPublishEvent withReleaseId(long releaseId){
configPublishInfo.setReleaseId(releaseId);
return this;
}
public ConfigPublishEvent withPreviousReleaseId(long previousReleaseId){
configPublishInfo.setPreviousReleaseId(previousReleaseId);
return this;
}
public ConfigPublishEvent setNormalPublishEvent(boolean isNormalPublishEvent) {
configPublishInfo.setNormalPublishEvent(isNormalPublishEvent);
return this;
}
public ConfigPublishEvent setGrayPublishEvent(boolean isGrayPublishEvent) {
configPublishInfo.setGrayPublishEvent(isGrayPublishEvent);
return this;
}
public ConfigPublishEvent setRollbackEvent(boolean isRollbackEvent) {
configPublishInfo.setRollbackEvent(isRollbackEvent);
return this;
}
public ConfigPublishEvent setMergeEvent(boolean isMergeEvent) {
configPublishInfo.setMergeEvent(isMergeEvent);
return this;
}
public ConfigPublishEvent setEnv(Env env) {
configPublishInfo.setEnv(env);
return this;
}
public static class ConfigPublishInfo {
private String env;
private String appId;
private String clusterName;
private String namespaceName;
private long releaseId;
private long previousReleaseId;
private boolean isRollbackEvent;
private boolean isMergeEvent;
private boolean isNormalPublishEvent;
private boolean isGrayPublishEvent;
public Env getEnv() {
return Env.valueOf(env);
}
public void setEnv(Env env) {
this.env = env.toString();
}
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 getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
public long getReleaseId() {
return releaseId;
}
public void setReleaseId(long releaseId) {
this.releaseId = releaseId;
}
public long getPreviousReleaseId() {
return previousReleaseId;
}
public void setPreviousReleaseId(long previousReleaseId) {
this.previousReleaseId = previousReleaseId;
}
public boolean isRollbackEvent() {
return isRollbackEvent;
}
public void setRollbackEvent(boolean rollbackEvent) {
isRollbackEvent = rollbackEvent;
}
public boolean isMergeEvent() {
return isMergeEvent;
}
public void setMergeEvent(boolean mergeEvent) {
isMergeEvent = mergeEvent;
}
public boolean isNormalPublishEvent() {
return isNormalPublishEvent;
}
public void setNormalPublishEvent(boolean normalPublishEvent) {
isNormalPublishEvent = normalPublishEvent;
}
public boolean isGrayPublishEvent() {
return isGrayPublishEvent;
}
public void setGrayPublishEvent(boolean grayPublishEvent) {
isGrayPublishEvent = grayPublishEvent;
}
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/bo/NamespaceBO.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.bo;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import java.util.List;
public class NamespaceBO {
private NamespaceDTO baseInfo;
private int itemModifiedCnt;
private List<ItemBO> items;
private String format;
private boolean isPublic;
private String parentAppId;
private String comment;
// is the configs hidden to current user?
private boolean isConfigHidden;
public NamespaceDTO getBaseInfo() {
return baseInfo;
}
public void setBaseInfo(NamespaceDTO baseInfo) {
this.baseInfo = baseInfo;
}
public int getItemModifiedCnt() {
return itemModifiedCnt;
}
public void setItemModifiedCnt(int itemModifiedCnt) {
this.itemModifiedCnt = itemModifiedCnt;
}
public List<ItemBO> getItems() {
return items;
}
public void setItems(List<ItemBO> items) {
this.items = items;
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public String getParentAppId() {
return parentAppId;
}
public void setParentAppId(String parentAppId) {
this.parentAppId = parentAppId;
}
public String getComment() {
return comment;
}
public void setComment(String comment) {
this.comment = comment;
}
public boolean isConfigHidden() {
return isConfigHidden;
}
public void setConfigHidden(boolean hidden) {
isConfigHidden = hidden;
}
public void hideItems() {
setConfigHidden(true);
items.clear();
setItemModifiedCnt(0);
}
}
| /*
* 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.bo;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import java.util.List;
public class NamespaceBO {
private NamespaceDTO baseInfo;
private int itemModifiedCnt;
private List<ItemBO> items;
private String format;
private boolean isPublic;
private String parentAppId;
private String comment;
// is the configs hidden to current user?
private boolean isConfigHidden;
public NamespaceDTO getBaseInfo() {
return baseInfo;
}
public void setBaseInfo(NamespaceDTO baseInfo) {
this.baseInfo = baseInfo;
}
public int getItemModifiedCnt() {
return itemModifiedCnt;
}
public void setItemModifiedCnt(int itemModifiedCnt) {
this.itemModifiedCnt = itemModifiedCnt;
}
public List<ItemBO> getItems() {
return items;
}
public void setItems(List<ItemBO> items) {
this.items = items;
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public String getParentAppId() {
return parentAppId;
}
public void setParentAppId(String parentAppId) {
this.parentAppId = parentAppId;
}
public String getComment() {
return comment;
}
public void setComment(String comment) {
this.comment = comment;
}
public boolean isConfigHidden() {
return isConfigHidden;
}
public void setConfigHidden(boolean hidden) {
isConfigHidden = hidden;
}
public void hideItems() {
setConfigHidden(true);
items.clear();
setItemModifiedCnt(0);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/integration/ConfigFileControllerIntegrationTest.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.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.netflix.servo.util.Strings;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigFileControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String somePublicAppId;
private String someCluster;
private String someNamespace;
private String somePublicNamespace;
private String someDC;
private String someDefaultCluster;
private String grayClientIp;
private String nonGrayClientIp;
private static final Gson GSON = new Gson();
private ExecutorService executorService;
private Type mapResponseType = new TypeToken<Map<String, String>>(){}.getType();
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someDefaultCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
someAppId = "someAppId";
somePublicAppId = "somePublicAppId";
someCluster = "someCluster";
someNamespace = "someNamespace";
somePublicNamespace = "somePublicNamespace";
someDC = "someDC";
grayClientIp = "1.1.1.1";
nonGrayClientIp = "2.2.2.2";
executorService = Executors.newFixedThreadPool(1);
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsPropertiesWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, nonGrayClientIp);
String result = response.getBody();
String anotherResult = anotherResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-gray"));
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertFalse(anotherResult.contains("k1=v1-gray"));
assertTrue(anotherResult.contains("k1=v1"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=override-someDC-v1"));
assertTrue(result.contains("k2=someDC-v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace.toUpperCase());
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayReleaseAndIncorrectCase() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConfigChanged() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
String someReleaseName = "someReleaseName";
String someReleaseComment = "someReleaseComment";
Namespace namespace = new Namespace();
namespace.setAppId(someAppId);
namespace.setClusterName(someCluster);
namespace.setNamespaceName(someNamespace);
String someOwner = "someOwner";
Map<String, String> newConfigurations = ImmutableMap.of("k1", "v1-changed", "k2", "v2-changed");
buildRelease(someReleaseName, someReleaseComment, namespace, newConfigurations, someOwner);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
assertEquals(response.getBody(), anotherResponse.getBody());
List<String> keys = Lists.newArrayList(someAppId, someCluster, someNamespace);
String message = Strings.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keys.iterator());
sendReleaseMessage(message);
TimeUnit.MILLISECONDS.sleep(500);
ResponseEntity<String> newResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
result = newResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-changed"));
assertTrue(result.contains("k2=v2-changed"));
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| /*
* 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.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.netflix.servo.util.Strings;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigFileControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String somePublicAppId;
private String someCluster;
private String someNamespace;
private String somePublicNamespace;
private String someDC;
private String someDefaultCluster;
private String grayClientIp;
private String nonGrayClientIp;
private static final Gson GSON = new Gson();
private ExecutorService executorService;
private Type mapResponseType = new TypeToken<Map<String, String>>(){}.getType();
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someDefaultCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
someAppId = "someAppId";
somePublicAppId = "somePublicAppId";
someCluster = "someCluster";
someNamespace = "someNamespace";
somePublicNamespace = "somePublicNamespace";
someDC = "someDC";
grayClientIp = "1.1.1.1";
nonGrayClientIp = "2.2.2.2";
executorService = Executors.newFixedThreadPool(1);
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsPropertiesWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, nonGrayClientIp);
String result = response.getBody();
String anotherResult = anotherResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-gray"));
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertFalse(anotherResult.contains("k1=v1-gray"));
assertTrue(anotherResult.contains("k1=v1"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=override-someDC-v1"));
assertTrue(result.contains("k2=someDC-v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace.toUpperCase());
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayReleaseAndIncorrectCase() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConfigChanged() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
String someReleaseName = "someReleaseName";
String someReleaseComment = "someReleaseComment";
Namespace namespace = new Namespace();
namespace.setAppId(someAppId);
namespace.setClusterName(someCluster);
namespace.setNamespaceName(someNamespace);
String someOwner = "someOwner";
Map<String, String> newConfigurations = ImmutableMap.of("k1", "v1-changed", "k2", "v2-changed");
buildRelease(someReleaseName, someReleaseComment, namespace, newConfigurations, someOwner);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
assertEquals(response.getBody(), anotherResponse.getBody());
List<String> keys = Lists.newArrayList(someAppId, someCluster, someNamespace);
String message = Strings.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keys.iterator());
sendReleaseMessage(message);
TimeUnit.MILLISECONDS.sleep(500);
ResponseEntity<String> newResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
result = newResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-changed"));
assertTrue(result.contains("k2=v2-changed"));
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/refs/remotes/origin/HEAD | ref: refs/remotes/origin/master
| ref: refs/remotes/origin/master
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/local-development/ConfigAdminApplication-VM-Options.png | PNG
IHDR \ i iCCPICC Profile HWXS[R -)7At{6B AŎ,*TDQTtUĶ@֊ >QYY XPy}s3ɹ lFU }ILR7@
4ӉzGE(mh况$ֿWQD (S"N 59| Po4;?W VB q NaM N Rh_Y l0 % of' Qpp@`s!~Y+!6O.Nbdǰ,l [rţkAEKruۛ5+TFDBe>Wj/3Aqr~ 0 lPu f؞-B{4 +ǩYh ;"L gy/xWD16i`a
3bd< neń} fFKDl0 h^
-] ψ
b<Qb(._qrn.hoInv eF Čv{5 +ㆣ ?b8R, m
l& kF=3Ox@4#2=At@Ak㞸; ,8quԏ<*џG "-xp l8ot̓IFsAxBE"4j&Hs&]0Z<To7 q q
I0o 3qV ד> ^RQ"u 1w5w菖r(ւî`'`X+vJ:ᩴFWr˂q6u}X-__R/Q>oNc;WOgzݘ pl&0m-Cg#tygp-o: '@ 3z}
9baL'َP2* 00 { bA+r `>XJ@X6` h '9p \x ` #BBh B
G\O C$$IG,Eʐrd3E~EN +HrF7'C:Q
Ech:*A9z B_1fYc./%ci[bX
vk
>D3qk؛Ax J|3/7n| JtV7B0!NM(!Tv.聯0D$D33.yĕĭCijbqD"iH HO*!m"'!uzI Ȋd}=9L}NsBWaj]
M
z)3%IYB \<UTT4TtUW\XxXbGՒKFSWQPRQh4SL˧ >(ѕlJ:^)+(({+P.TP>|]_EATWPJ AUjjJ}WT_Lոjj;Ϋ1ݗΡ/_ԃ3hiL҈טQqJ1LljmƧqƭwp\5Y<RC4?i1j5h=Ƶ-h֮־?^}xGAu,uui
ݤ{^_[wZO_Fӛͬd^`
v 2|dD1r1J3Zol4`o n<߸IFf LL_iՙ=4{טߴ ZXdYlhD- -3,,[VNV|V \'&LcM.a4ؼh<1yډ-:f}`fbWddҞc_eӁȡ$IIՓ: 96;~qrv: ts6vNq|E%eeW"ד ݜݎndɼɻ&xz=vxty2=S<{vyxjX\nso Lޯ|l}>}.=o ` P08/l!(4hmН``Npm@sȂ И͡O,ÄaMhxH&H .QYT^oSSTMym=?% 33f_POqqxi'&.HOjL&%'N ?uiJݞn6}+3gd85Sy&{BJBʾHv
{058uK Ǘ<xi ii/=ץexeTd}32eϊړ5}(sB&\7kά\ܒܮ<
yPn".jWǜV'qwgAUQ#:r
ko0 v,D.l^dxQ{Pd-ȶ҄Mźŋ{~
DDXrgmm+ VlZ[z̶Jʫ?\ȪUmVW!kru3חa+*mlo ldiͦϛ36ߪ:Egˊ-rvVnVv;wטT$,lW_\~ݭl==]{^uݧou Z'?m88Tv ה_o =|c&Ƕ /G4d4t5&5v9t748YuJӔŧG<{\'yaʅ/_
tŻe']9qj5kwxS[uM ;NwzuwnE wiwrﾸ}?$<,}XPSשn'1O pz^>=[/N1ޗ/KTs+Wb:8ZzʷZoy0jPZ ~t)ٟI+X|iHH.[Ȗ 08д4 Pdw/ e38@b -9zDz 06"JsŢ [] HM | o <ٝO"Dxn!Amk3 pHYs % %IR$ @ IDATxip\יb!@;Bl $AfR$%Kl-j\eS&:b#&cb" SUrr[RQdQ,QD\`.. NĚ Msnf%7d&rA|{<$K HHHHHHHHHHH`ش$@$@$@$@$@$@$@$@$@$@$` @HHHHHHHHHH`C! 9@$@$@$@$@$@$@$@$@$@$!lxA:$ 4WK K^FIHHHHHHHHH, ے:8:$H$@$@$@$@$&f`g$@$@$7(xPf`n xHfgf_ $@$@$@4< (xoad'HHHHHHHHHH(xs l70$@$@$@$@$@$@$@$@$@$@\sHHHHHH^ ~-)^¦MؼR$>ǍV Xm̈́gHHHHHHH`CX^^· Az myyA lţ2>c@$;}ǚ- H^/}M App06 olOmxlY4P\ lH</Ofc$@$@$@$@$@$@$@H./"@ݩvTdUSRRߏ.# |Uup~5["
c͖<H :c/g!9)0|
6U!IJLMlߜ@( @jxms2z w;8HxD$@$@$@$V!0ٶmA4{2~/)vwbb{(D _JaJtet[my!; 4
Y,,EvK :WC''KKh[U`bHt m3(-^"^ECeO=_]J+xH
)(ȐFMv)EHh<Q{+- ܄% 5xD鲑)# cpPح" y1h\.W]" A@#""tۃUZ۴i16>nh-;,
KA
߬1c:A[Ƅ$e`wTC
:+%_(z>C+QVG`={ މ(:
rM Sګ
(U#_v3ZƩ#P\MxԹ>ȕ{;FI:! E!ۨjTޞW^z JL E9^}B}h?˾6GoSŲhijݫ+ː %E[
_M%%VVrI^D٨ ttO&>ѡɳvǓƊ|qVӯkmsA1v k "RĬ(, 98ZZ/[]xD :o.=ߋy 0$!ap N9/ш6 @/Gx` eI7Mgh%(S#vKt*G˃~يu'G 9:kPLlHHHH@
-GqĒAYQYՖ&~Zc}cvEW|CoU X_^aD\c0>r 3LZf8ގMlj巻$h1 d$' )5] 1b>N`JlHoz XKrBbFjzorU5GFz26T6gA$@$@$@$/$/lh<p\C!3?YH
X͉:%1vtuuJf/7$:\ ]{ XF$-d!XrG٫CS(*Oltq
m
ظ j U˦pn*9I۹Vp{pw:y2n%|)[6?mP$ pO=Wu^$"&Bujq]#vK@k,><K`Ϗ T]UŶjg.߭՟
0 삗8)xb7kDBÑ3 T*ґX>#(8PZSlKA͍ ]
rtqfxCk qf ޤ|.FLhXQ5 MYyͰt0F#҃f!<\mbqPZQP??ށ&Z@vGF IF[n<SߛHAK1߅w0l[%dEQF<_ÃkqCQ hA 0GJ[54g!fga .->Av/c _Ί5
if؝-o[\dGAö$ݒ +ϬJ1;pWɤd|6Sx pinLx=ꗫ;5JLiw8")
En 1?M+iH]th64;eVP8y1x?V>7gq iؕ;=H> bT"Gxn9 ђ >>PgHHHH`к8-3ߌeuQ;A}-*X̳ ~] ;W4
A~" Ö-hvl}O3?lJZ'S1E93J s»wYX8s<eom% EeEHO,~.@?56 :0ć*f'` +nm[j"iS%ܽB5~ψ-EQ߹g{=<
,Ġ<Z٤my} =3ΖՆ`o6B_nX+U< j8ԒC8ZkmY8'9rPZ/? սz̃_CbA ɱGߟ l*~xHe. s|c{501t, Q?{P2yWN 1Ԯo旂wFNaMk
?q~$Yװ+#JpZ%n6Zd0_r%8f
d֥#?;
_ $նO R1w<tn7
MmގE+SJN=VbufV6'C\[6=3-zy{cul:kM6EVLJq>^hm`)ٱh4Bήٛ <ˢxݯ$#+Rto ߣRu:dd#|Uy ͯ2Np4i B<5t:態٦-/7`oo^5Gc2 ?r u; 9.eѷ^>x˥Ÿ\+}{aMHmu %G+L@`p EIHHH# ՖΕZ\b(j e K8(B"4DPd0/ Ԙ^Ѱ};vW W#W, T۽煼N+u\W^zWӈ.1OW*^?Qݝ'B馐=eQơy%<gT0D6:$N[D4X-lO(?R
!|ZM8Qe`v +vDt) KBgϏ#8s&̬< W뗿oΘ}`<,:/(k
ϊu!m;O qYƿ-xZMVgD+wF9
Ǒ"*J'`G[_<6.oi8tD>R0MG'ް圉E87?[Vb!Ň S>4퓅@3ح AW+* o-!
rHDnWw⑽GJ.bP?z5vP_ NB\㢴i=-_ JAyE|GORBێl;bh?DXpҡXva,ϴ
͝uòkG5K<1g0?qS0:Ɏ1m?s
߃W}|J3^M{m8j2]Z;Q"ԌrpymGmqL"~=Qe.X!ڹ5ѡ!jGCl5\1 ڽFf&HHHH)髏S'~kӤNM{gC4=W䖛R#syBw0jn'7?-F{=#7 {#0Q-}zkhy.1B3DŽ8 CY[0D}o[c}`cZӢaYs{D,g$N?%Vy VNԣNVC k,,-i|D
*g5Nsv0xZQqG\x]qM ă4w^ACgq58* ,kdC66Z4'BRҥq5"C?Ҏ Ǜ'D!>Z',8&ry뭻/2g 9
]#!<N"@1H
3Z)Vl.+̌uK2p D7V~ Ss;t%8sZxb?:C<[qmBͽh܌8H>Rắ 0#zc۶ +6l 8fƕ_)GJA >(^Ulj^T(G OD^ߎtH0M-n4?9ڂ/.^D "$8PQh2W
9L<m7в>x:Ǧ֜7wR~7y#FON[xrymQj<j\ ҋp GVcP B gwJmFxݺJQ
P <O QY7 56uzLv(Næ7'#vBy[郿7"SzQ,o~ D6ZsA<M$@$@$@$\FF[S?/?Fkn3y)9ױnQ4o3(o' WѠYn?PwVV;(&2OGH?8Vė^DuqJa fq-_i.I:$DΣJb]ܽm N7s!u׀g[|3 Q25|uѨ%JDZ"s)T G+QuMwq:<c?8 !~lޜa]V>SЎB6L,dƠ|ٰO.TV5)lϕ<@[h躺è04;3Vn ^ xu6O*+ Fs _"FҸF3q2Zr:EN͗izb:{}瓫r-~:8 QJz (bk ~qJ
*2#[ƿ{mj 5J~!MjOEzzjJBqZCVy:Dk7/u~.-E,luQt4TzB.
Lu% SՇ.R)4ܭS}ҮI^~c - 7 5|k"Fhf3h/4:te<Jԣ$pW#Bt9P0#s2/lo]G4y>ԈRNܳ=z
)b[,6Y۪GaU)1[ y>%C" H=F$@$@$@$<UZӴs*фsXhgJ N /;
_3TXB |a4 <W_ \>65GqGwp̥m~8"=Jb]T5R; w?GFOsԾ? WDn'+ҩ!4<:
'c
/n$!U[֕~Ros%{Qm[+tMsz ?Pnɖjw/ QtB*e\aQͪ7t9ͯ9jfq-
xmHZ( ?yL^E{/7<D膅WVg }Vz0 J!V#cG
#*Ev> _};S_1_f7 1;j饻h U&VqΉSёJ.}Wn
25);E.z_vih뒳}m-D+y$,3\ qh\$^& _|v腮۽/,N&V;r4UVぇ9$-ʩ G3 xXizpTi;\>]wvP4 :$0Q~;T2>U!JjlkÞJh~oj ux;Ӝ\͋;}ÑmΟhƵN-Lbҁ`ᔿ W@H7"j&J3bus[Vf
vܻd;.ehU{w[[6UZAsEKChjQ1wfBv
d6"bv2\e TˋF&61ĦrT_lFrv%!:< "w@8 +n"( y|WE忂Е#X֠oʁ1 H:IDGJ~*GNӧO7L2l=)O;$/c_oعS"X +[L@=g֗ɦ{xXZ aKݵ Um3-N[)x(mu.GY690+FS7с}5"[5Fr aӰc۪õsv4^37 g^fuC ly)
ufjfSU)wq6Ë6?k']rBWq?5. h58b NkZDl)}ZPF;q4g3( 3:- PxHWZ >A,ch@fX8f8V<P__RWm+C
I>}Cq} ^VXqͯw 3NW,` Ov\앥qVoَ-ԧS9o&
˾bWxiݢsz͵vym.l6_p + ] +HӈהO"u&Uq$\"SSI<5`ŊVya6G9.|#E)n8o5ms?]#>ı۳Wv4TX tyyXr )8ʉ5*jM:
l^a[|c6`*#\?]sTKjE
9{FϿ'ٿ31 S\_3Թ!rzlY<Y8j]iMkzVV:7q-H29NgFvᔘbʖ&+UmX=~ݩS݉8|e?7Dn/?<[(" Z=}"l<*\]7je0-NaV60ߧE8gBdRXR Y7ڻɢ.MmqE[" j-Ҋv3 \2DZmmZ$<qu0Ԗ煳[^mG; Wᣖ1texpRx؉LjY}HHHk28}EYx-*>ήyi'W Y!v|^[ӭ~ֲ(.EjY*y|-Xǫz^o
xY7+AQ[J͝--.5RH\&Dي#5 Uz]7oq==GdwxddM; v_ >j혭~P43]⟋O)SDo
!@Znwq|0͝!m01J6ՋE W #ՏmضݎY%"|=:-, YB78y{_i_XG 3E-oUtb i$AA";}gڊzmkX1 tӍuڞ!w^uwG#6? [Y_Qqmb(@{:ꩍ1\ gAPPjJygĂ]DbX8־5 aؚR$R P+Ozq?^ߌC%7D FJAlVwSU]pK*vӦ8,jmjw!/U-D0Fƅb-5;WdGL&+1}3EqkEV>q'^qMhAi*mr7^{>xgUOcpX5#*[lN:$B&,Hݻ* ӅIOCNq<q~WJ
vܴ\ z63 Y,/I& >(C\w҄SQ4dSsQµGC}X7.|./fU}3 ':ڎH[uו Úicm[z drg߇ .PI\~X"Nks
eY̥w
S[k?}F q3bꖗc 3zgΐۃf/|[8-m+$:fr} UyvNHo^{GbN!xI-9TB-V)WRyQoŽH/O [kZէ8#.QG Q$;(V?k"Q\q?zBƭWKcSj2dÙ'Vyb'R
^(ΈǎxTGmzۛ$TSK][4Њ&k[fz4 qȂgJǷ(*:6S ibu:%&/qmq݇Zj
d'CCNɅagAn5F|=2^m| s K@[ͽ{tQq AXL<`m]AޜrvÑ5-!
omcQPv RU0l2
Nqz%Qy<j)f` <64Zl ^X>6+
Qrѥ+¡4ؔ,/GLgCO;:=Phjbrn{xKuܬĭ ԭJFaDf :-)'FD|k d/;P]Ƒ*e j1<!; d R?| {NF`v{:2QOzfet~37oBph$E $?ᆻ/DI=6{X6$.DyFj콇o[[:2q@govFd [a؍Zy&+܃^dŤ [ Fo"L alNCf恄,;kj $GnG/QZb18 .eF\rny"g=wp1 rL WmD [C'{9\5k=~o DlA 3cI}8-xcr wstq}φ>IHHH@R*^.+N)kGgO1:>$-A#Tن^ mRk8? lĽlTB"* ̰NOr>u"G:ىALmAj^1d :;Ah~?L,c7ϡU3b<jspC ԣs`v">1Y)hG|tbK8 K$1BAijoCczɫjvŇc.V)Ps69-|&ve>4
|9O+rט{
.oۼ|dc:iL xY&QqJ|
0l-_}>8(LR?$d1|ڽE{e
t ;9|WyL|~*N;|@k9N-ij9jKx$4X8BT5U RveC=dO3_rO7'!4d< SؔK[kZe89 h>_ G qptt%ʛ{HWl#/V/@~İE"\.g l{
-x9/4' 3-8
meh5K$@$@$@$`g<lml~nqq/I{U4YRqJL^(5^9k/n+RE`ߛ+YwpggZk8a[zxk,eDi8hzk8juϝqi>)5Wku]Jcf0rO(o{ "NWuFFo ob ²(T{fJ k^ 'g#_YbeТg gM<njG@5ËUg\j̮fd7Zz9-7\iѼa>އ>" ᕀ=WP,,h^{0U19'^ b-7/?j!Tj-zզRJ?gu/P,:xü8WzW=SM4
L!"~M5 q4d)˚|^ rǼfX qYeyñ툅*} >r[<ӎ~/. Zr+DD &ElkV S? F f< ^" 躨xzLHڷޫFC[6ӏo< x^G% Ow[ёOWy|}>j+?Usowť+̯K
ޕNؽ2IHHH0@>+h:>>nEnץ*f14`,o~ o|~ΎuL攊5 oJX<N KUoiGkiڛ
o.#!Q AsЉ2
ZD|i ?|eTy .5 ߭^oWd0ϸxQ
lW/iw&o"l="FͧLgiP 鶲%"F@O/V)ҡ#Ǽ\}LwUD74:|ZALx=h5S:R%2xfغyQ,0 kcvfᨩ ۃ@# .&Swwrl8æ9l(z;z1uy[Cuq}=mJ GZ,"1m xHd&X.oڊ < L< ;ȏ4 7U FFMfh0Sx"g&"f{w˛U h|OMd7?T<`ONjMjosƜ2y^<:,G=b!Z
}`<I$@$@$R%]}O1;cEoa12VUappP-v̬-,1߁r~i .ߪOPj*wPƇz? /5 |F06_Ӻ o^̣ NI~1-LB8[zС]M2>mܺ4 %vD2RXHo3uC>xx -xLKk#x{O / @mX¯ڶ8 S5xcl}mӧw+EkVw;lHHHH|H9lI
܊am6Z,n^buGsss_k`E`qqIxy߫|uֲLC&ၽucm7mĸ^-@' 1ź k!J䀰^(>Nla[&f FaOI)Pʢm<sWHHHHHE 0/BF a`` R
o@hX1<b/}_\~U^Zz + ?v ݽ cA< Eˠz66Ɏ7Wk>Dπȓvo4yGQxӇ=r;LlAHc+Vm{%x~-8\QwP=/ XkMMLN!<< /l'7)\ʖ-[ID{X?ύQg.Wso5{چ̵gϓ7 /4-B*ZbeܿP&F'kh7 ߯ŵN;9xcA@PW4+V$@$@$@$@$BB.[ o%-Z955UG7Fqe~86,/N;fG:n5.Ӽ|˛%"^jkscJ=1=0)G'cgX(n
;`&gnb
o5 x cxG, 1_zIa{x[\\ C> p~xfb)\ݺm6!`2fQX Cv62 SC̾ H+33A6 p~N \H<Hk=U
kǞ- x odU$@$@$@$@$@$@$@$@$@$@kGڱg$@$@$@$@$@$@$@$@$@$@ $E+=WUeg)C$@$@$@$@$@$@$@$@$@ =PP {%:~v]h{v% @{ٙuj9& `Hpe$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ xfTkёx^ QQ+NJxxl}e' quV@$@$@$@$@$@$@^"@o/e$@$@$@$@$@$@$@$@$@$@%os c \_yYE~7&HHHHHH9>eSDII#0r3{L$@$@$@$@$@$@$@$@>$U[!Fۇʦ|_FcI' ?gLNK3eHHHHHH֒ cx%}M$@$@$@$@$@$@$@$@$@$1= %
kIm xWcx{
PQ. 光HIf%L=PG;> =dHHHHHHHHHH`m ;QܴX$D#x[ `E=,F&08 τG[Za!~\ZhH pZ;
et) 9," 0'wD^-BQs MG>? җ5b tMb $sK¢p| 9AFZnO {cD IHHHHHHHH` ;g( >##^ #4B6߶ QĘl`_{Ӗ&cyQsnY~aXC^ WNBm
d#i($DrR<Ұ͖C3=n9
{B!I+C CsnG6&'Pɩ0T9 i]
tI$@$@$@$@$@$@$@$n 9P,pܯǷ ;Ύ^xdڞZX0w-opkmM]%!T9iONZڅĘn⢈w/>cj|CAǐ/Ĥa 8lM[+ @.a
Cke % p_
a: rԮ<S!(x9P!Q [$&fe$Qܿ<nxH$Ju
UMC47I,aRV;jAM*"9
!LjE;E A/c
_{ٹi";qͺ((v)
bff_XTs:ť)HV1q pD!(hNa)~My(M F\q!OD
? 94=zhfv[E6|~ Nm?~ 2{&Ӓ cQ o뀏9Qtbe5PT
Cvs K;3=V[OܢFK[.]TݬCIU/jQ)/5 1 3[ILOm&)YpUAZ6 olގE+
<ufRY؝6 \[ފf }kC58Tg{B4]\Tqʁ|qVT; P /AD+NY%7GSrZlZc ˬcucj Q{h_^ H>^\ @ IDAT 4 K>:{$@$@$@$@$@$@$e~y 2dm}S).'sʍO㙥H3 AQ8y [n sI(ϫ؏<4A18{[
' $,GA1ԗV2~\iP,9 0b-YyЪ[_3[V 1msZAW99rNe/yS+v12,#J~ 8Ffco{]&[j wjhk-0AԤ$eB'FXq֔pIpC JPތ@5s%J }-brnX.v8 i&h4|&ە)gǟ h @ɑ=GspNd\Rދ7ǟ?~gR !7 ڹ-b 5}~Ƒ}+Z~.'gEǨnE@6
B07Zu4v8xGM.;0x=j?=jEq]g oq 1si \S\nLɉ0>Xa&v7߹sWm>:
z|6[$@$@$@$@$@$@$@$`Ҧ^}^
wg'[ޗt%8]jM( /o
hɤ7&ZD+H5
I
O6ƏvnSs1'%bcIT~h;٭Ǐ.FDo<} 5t(|B6DޱSӜA, BV:㽒m]ƿ<S1(*Gzb4)0ׁ:a9& GK`ɾ,bu4n[6m KG $FCj~X4pi'Zm
מO
f#D <;ܳ 3=) S14fbEOĢIbE}NĠpX [ox'##I @5@jn8.wQL,^ƻ qfsv]Us
CQY %,@?56<hsՏ14 A/ozKHU @[T1]:DĦPSVlxW+>шrJё~TinI .+<k!v;he~م )jwmegOΐ ڭbrn2pPā~k\3 fān)~\ʳ[jǢie)8$8*Nb g\֞O<N}G1nKk* ,c|Z:fņQ 5¨|,fh.!AiITj/ӺW"17t馱 Ge-p_6#7gW
J
8ih G > ԓDbk#:L'o?~HRuh/Q92Ou^ż.+:9>b Vm1)I(߃Δoϊ+鈳c6x; $Fn߮dwH^ʡˉW˳b@ FԺSpz "-B
`*J+W3ح AWXUޢRc?iBCXV,-|X[d[-âZrnҊb]h1 9+{?G 5Hּh p{\:11+4E$@$@$@$@$@$@ &Jc[aV] 4ViͲ9q
YТܬMo6mZ\8l?\ҭ+qıG"[PYN>uy TƳz^햍3EjN\"njggC4(%Q~XS~Qxcja=PqD#*Ml ;ﭻ/20 8sIRpq\v w:MVv -3xpPt䖅sfq;vR=˥n?Pwb07)\tA};Ms( oネÃQ¸D| ė^D) .G:=ռgeQ { 5I'b߇sQeܴ$lh3pO$@$@$@$@$@$@ zx*G%D\hBknKiʫeՖܬ<%oшz<{svqZ\oa5kCl-@Bd*PyENU=]NG iyV\݊9/[>!bzJLѾ #u-]o7U.7+&]} f|Ц8y!#[f4>yӕ~46*iOr!>t }hmjBY.s_Z'PuI h8M=uS$vK9:j~6Zvu>r+楥M$ze[:51P'9+$@$@$@$@$@$@$-~OE -( E,@BC>I,&oY~_(w>bq9wC>YSȁ.|WqQ/ҕ6xij0I}G;,<
{6
S$ĉHMTZPϊ &g5ǚd\tr$\G'wYŌV
X;>}hiW{]FvfB =ވZ}O4
M?_RSL1ҋIuZd'FtmXSGrVȫK6&J3b3ܓ C@}O=ii^7k_&J ~nOchr3N)^*'EB! `sOr@&;.+w:Q71^/@Vt n7+rTSǁRw= BD[^(2+7x+ r)-EL6#dDDі{-W38
d 쌎6="}&J5UiRCWrϠ$pXLb(v|(70JGvvz2t£]BoU:9.Jٕ$f,=
W$"R3^:6= hoE>*kW vlHHHHHH<K/=L-7 W9L^@J=#mݣa@
UORcY(8wuYKr
"^aBx/m9Jeжj`F#Bb xЈbR @1#cvd>++ l^-fUuڲK56(ޤژ+g})OAXزIi^}C5hU#+@&L<ʑ 6QY<eSU
|8YiHMD.o3tkr,{wn_gؙ%b < 33HHHHHH6\iFZ~d řT<] hz2 l Lآv.< y
wsvaoq1jǛCE,<OpuXpш] (O5x`6,Jց"c3 Լ$
.ԫͪ>* x|b (] {Tר=qYYxkrfqm3vfP{ȕ(!RZ6iaxRN2mB[V kGcT=V{ .y?|$k[[:Q3 5-B+6,Ԡ˨VhBČ =}B<*\SiV[MaaȬE~ֲ(.Ej Q϶` {yHHHHHH֖
|?~6^=[G{Ncw3 ._AwKc`Nߓ=6J?Ņ+
kʢ!lIGZ:*wb-^+BYV8V-]e`SSxԃdө 3qv*a ,tdX^-+
B6T{}bL{O\iCqNI|DNi 3Cvxn|Jz<ahb[ ׄނFzK1%.&Lq=m.h8cϥ1Kp;*EwOlؓ"\ɩ<H/BzͶf%mLx0>X
}u!UbbE<\8mk"p\Bvm2}$>ռuw.Cb^3,h*OCN<"
D@uN
O7@!u=-8j(1MXm]sh;wVӄxXкIU5 4*ƌ6\w !(W^5q ڻO? 5'eZR{t_`nDŽi[\8}@7ˇmL>ݪչ:m#r(v\f~]2GS:aw } k^XpΆ! R.A!Iʉ961cJ:LK%xP2v#6J=TSRSg6# Xg2N} ߵhQ~U#vK4A } R,YHks
*vၻ\mwcA"5.ų$@$@$@$@$@$@$ h'!}t)HF`jz [6ca9&Ǧ=j坭vh UWA]:q.?غ4A Y ri||hk?ݍùG9юV7X&+B Sw ꚻP @6v}nŽH]1,ߟC,vhjsSȏN gKbЀw;%c'zzY;n %bC?/|IG
N%\>O o<Lҟ*{@gGoRpQ[T(7#i0]ELyÖXe8)+9W5 c*lԵ`AXx <ub/6W7&b,uޖճZq1<("ީ N8 5-8*؏4m4{9en!4 4QҐKNq>rq+Qubo}ԫ
y> .ougGUQ߬z+"㜶#·|O"ngӈu~6ĵ۟F⨯vr ߂.{ح8rH}'~>$,
1 HJ1
JwP]X)FOv^Ƨ>Py/ƑTCUPok@Y"uq#;EڭF/QBu]&N Uڢ_~Ft Ob{G"1Yԭ_G-b (65m XbJ~/r?YY 2 31 7>hĽlTd&]TN->^]Sc`ڌ ,Jr>\s98:ЉNbbnR Ŀ к HHHHHHH +̤ҲRUx &cai#bPP ) S@x'PZIYE>v7M. Go $f EfCI4.O𤮺pXIS,h6ҍ)H2h V_ gQe2 * GnCޏ̗O Ÿ>u
;M9<T-Sbײ^)vv䗧.E!oV$x ?3<l<y
3lyxk,eb9lYmjeQv`aP/q[]}; b[բFV# N %Mz3W2k]֛]u'R㑓ND6K}-qx&jֈ+Z/d3ým -bl);#ph[7A35/ ^
EtlZUG[.㉈6c
w5|w%(r8*l+(FBtvmGy &: bX!,F e ]}hl첎/7fs|d]0`'\j s9_
صg7L6CSuÝ=އ.IWlE2"qZ<闾]Ęxl M8Ǿa*;6[a5RJyځ"˃d1g}*fܼDUsȨD>1jmw"-su{ʉƘHHHHHH<@CG}zlV1:2b8 -6sxiEgCxTʆa*d.XxVohS/dÓ.^ܓs zL[x;jL+b`~[.N
Jc[d( ]huY7|E-("y}IQ4E%kَqNgh4`0= `y@ zNHNb'cǖȲeɲ%Y)"^n"R$Uȼ_ݺ֭{)~KS|R~u YB#'} fgaTe~cK(O'Je}Dž M[@Ysں\ktYdn/jx~u%ٔZuʵ9x+McjGSk yې)Ŷ 2Rhj\S 8Cog8 l*n:qb:2V 8uĨ]
_wd9u[˙γ^=`EiY4&1US % XS*+1pŒUVjT -~_m، .as^% Dwv%:n=Zcn5p)HHHHHH`{53J$@H꘎M`R[wY&X?>Jɼ $
މ"tIH`wEvgFݸv3+Hz"@ЏHHHHHH#@wtH<o{q9rb=R-cn|;<#; 5! +<xF$@$!~7# ` Q1 x+ cçnktZ%xEϺۊ ے9ەF`\$@$@$@$@$@$@$':ÛF
K=g% $+PR vf0j'ѐd }E AHHHHHHHH YqIk YZ "@*nfHHHHHHHHH ]!4QM+t0g$@$@$@$@$@$@$@$@$@$@"lVԲ&ᝨRd$@$@$@$@$@$@$@$@$@$@QF$@$@$@$@$@$@$@$@$@$(4x'<% p
ގ0 D;Q. hv' $
މ"tIHHHHHHHHH %@8)HHHHHHHHHH QhNyK$@$@$@$@$@$@$@$@$@$( Ia$@$@$@$@$@$@$@$@$@$@">Q 3] <0C *m ]} {1lHMEjz[|sEpBw2u !*mٙH][=6>)䧖4 $@+A
HHHHHHH !PVTh)XYssPfS'ۡ:Oۼ6z KiN"$@$@$@$@$@$@$@$@$@k=0|w i<FoedY$I"b$@$@$@$@$@$@$@$@$@$?ʚ17?nEGeܜ=$$(@$@$@$@$@$@$@$@$@$@d٭j˭$ƚ4xKn UKU[tTHHHHHHHHHHLo3
IHHHHHHHHHV-WmQq 34& Xh^EGIHHHHHHHHH֛ONv8QTd) wN&ԏHH dW z3"f ǽ۟ے@C9L ;tu<0 p#/LX/s2_ɔDBNϴIH3xؽyST3;Іg%
P%KK{:G [O$#a$A-(iDmWk4x'AP E`~6`Y7?*t|:^<qoF6NwtpUFYW4x{P*)5fk|gʽ!M7 r; wq< =@2jN^HH M'E|RM0pgQk
u 6qaI[ ̑Xe#8K8K[ Ã. $#PCeVϹbvhh6'{3u_\a}Mce'$>2q wѠ"5sds(vbV n<9 | E0nSRUo;ye @` 0Kq|bfݵc|eSBc҈IHLLI~d ۼwM%iB$@kkwح廋ֿ@ĘGc
A%ܸ(Y z <VsuCw>vՉ;5hz]Hivg\VIYxHH!Pw8Rλq&&:18oFƕBV6qnIH 2QY]nQ|O#rLD6.J>}s E`
c
yGU%؆@3QU.Vm(
I}8k#& <8 ˞c>xEv$3&N$@!$@$@(̟Q7CZ! Y 7HEɨNC$@$v[fw{5˱ vhBx1tج*Tb|~ -y SC}pV^p͵HKURX>\~3Խ5Uݲ,=??1t]"jvx
g`Q,,bfjC}l\u8#ӳFD7. J%C S>ލ|lN]i<ăӘ /%qH <<ou hO$_NiM lGuzX~p?E"wN ꋳχzԣ)J}EՒNٌrʅ'PB]Go[#a7={PxlgM8EQ<l5Boێ cnr [ Eؖjb[v&6mw bf7?NX{7K}Ȩ=;J[nSݸY/a{'kKq*or
GzsOW^m:kmv^iZuUn[E7eCy;x Wb.gv=~Ab;~f ;L}òt3؝NtDZDHuڹ'YU{4'/\X˄ ?-G[W];jn,qrQZ wDrt ̥k-Cnv ;qQHjX JTKm _25HH'oc6BFq_ښR Cw^ơjürNk9>GmZirjyFck5Us\
aǽ(;yDv m=@0. Kty( Y4iG@x%;;=ϴ[/C:H >c(L,gfYvS8tcT6qO.}Wİk=uCGм_T֣m~ ߃VA(݅OZ" u UZ/y*WӼ&n<i3jq6-Cz>k8M+oe QZ\~U/?rb'pQ/s =Dž'^˭*YXo d jxGO<l]!uU_cLrjt7 ֏O k7v5H1jOr8n+jT=_<o}ۙr[`}rLҿ XXm4xۍȌ=)=ʴs-j<r,A^ﳉzn WЩlPYi<O "QPQ[ܴ]+ ) Zьo?Ը)dyRڣў|֠F^*}{OgL @@۴Z4o]2X} ﾁezw#[s ¨9xz9 9ٳW&T
}+E?u_p %__-3F1n? u<\j C'vY%-* k @%okrdS]
9{|d OGZ)+ i(ֽ4y%q }ح_߃/ O0vaQw𐘎;η2<1Ez U1F9R$+2vkJ?OпfeM-ze[d\*牧R4ˏG}P%{v& ڷTX;E:\>!ߥK.lW>;3 e}47ЁV&T2bq {)N` ęrSc>oC7}\]h6i~8%n^qxRiO&n禤PXق.ܒ ii~ӬND;P
:6t;2~w-Ds
04nz|IFø(N+' T!͇Ko B`gT6rUS#sV9j2fXkTr]XhDE#W[Zq
u蟉/<F R" ａ>[t^F*
x&K+gp+eLܱN'?ɣe _}g;B}y1Ov'g7HZ^̙{-:чH@Ől>ZNٲ<EAVyahU='L&ٙe7l);Ogם8W6 ׯ\{O=>3/s/~k(x+8_]Hۆ -: }G}WGEWFݞ ARYx
^on^@'hpcz>= |Ȓ$_]Twxw]<X8
>#9%hu%^2pδڜcXsRGZOj Rv'qBLr1i/0x-/GPֻB Ӗ^rR ߲Ma &n*+gP{d|ڍ9W
xԼ*j\7/U=G9 ~d$/{6\q#%bLiuД[}{2txD^W|::,lF5(sKמh>#k-t@Qm\ݦ~5r #v[C
ǩњ+,rb~|}ĸȥSoHT\S-%G_տ@*D\w I ,zнNNGYi^@9vTzݲf!TZmæۯwӹM)/Q ުQ=l Xxk*?=9ʳgmj^yp#+%!{=ԄLGfV&ekTO |WZtIt ĉ@ձLJ;gP'Ƈ
?d<cO̲ts
we!Q{sA*-ӟk'Q#oA[ <҂w兛u|ڊ]l }{c\\{D,-NӔu ^ř˝DteWNY[ >"働{ucȮ݉ /#] ;-a Hg !?#8kLYՕw+/KsŠO2Ep>K}k[Io<X$_YYϯ TshUrU3{j('ە[Bm2[ xRgq/L[h K#x
S ]}mr]ly;9حHf N{2~?PAͳ=#GP}otvzq}+~T߅}Q{S_ K~eW>c It(wX 1#9yo7Qdb5wMBGo]EIw\LH Xz<@[[G_!;Y+rՓ۰e( cl!Cw^/Ln-x K#,K;f[o( 2sqXN|>dƯxHL` #1VWfj\U|z;V[` 3kG:Caz>48gӘٹ|K{GK&Sw-n-[ iA~C[g%L,[YX#;99ށ$?~WXQ-i 7 ,H
lח(G~,T6˧PQsW@q;Ћ^r&NH&~k<_|Ո^hY7r>;/<y&4P\S%Nȋ2ȥxS 5nID[|[vK1:觐L -{^y`5п;ꪍdgD}H&ՙ;Bdѷ4-ў;71 1S|9U)Y[7C̣L:IH{wX͍уUiv,oRxXI[>mzuPC%;e漬,o)Y53@-R)N+k`>oNT<%z'ۅCh~/ks|G OIEYF3>gNo$Jwe=o㌜<'ف :IYhRHU ^r[#XL 1(+H]ֈdˋEs>(mlɮ}/9i^(@} G_Ru)e܃nDZ/xf֤'ګ%CΉvI9(9uS 'f2)a 3.+~T\n˚u p
=Ԏ/p%V<I,뎪~/FYI} Fj}cor&Q߯Q^ hKmY<a0|1~ UW~:O4G=C#r0sY9 DS'Uo'=,m'A 1wY߀{)zU 6x3hLrDZ#xu:/Rdͳb=-haE58*{o_pviK$ovg--Usat-%% uru<Çqԑas*f@C Ov1<%.P=@?_/l6pko-R:@jWceE^ \ĝ; s hm| f=VyeW$sbe`K\hFD9O\Z}<WV"}{\Gpװ{=Pr_=WW߂ ！.?#xfJ:'%pev_>K"[ NY6f}gGvNP&< _(۪Q)/F[G?+ #Gz*h,i^Fhz1BH /O.Xr%*8Y8 e֮vrdAusI_3P ӗ<쎖.
ʧ8\Z(A+{< i͏Vx gt |{Qk|/_߽`cN Ó !`YF9rx9X +~b$+# ʒ ?4R}>rV`{|隭lEl`ueh
&85xπ̠ܭV kN=doe3;+ [26Knf=Vj}F{x8bG乢b<?+ 6yFߞgQk
^f|?_m͒E Q'C_)uۍAe۸#Yed̡*MUz]}atUlr?+ t#?!BZg4㛘`Do{eƐ$@$@&eɒkFY#
Ϝ Or&_h'A~3C{
uoFr 3ދE6C#7R~}(
p~{ ersnI$ͦ͌lV 9L&1Xdd35 ՕtJeZYʮ (Be2qp_a w;fl.} PMYX'.kLTFfl$&lN =^1i̭yߓ=ܦvћxXdP/<; e9`}N ?Zwkו BÞ(syii5\e #C{I3aWdLjC}Vn{b~!l6,YA/(GPU4!eɅO xp| H??8˧zr0];q'o?q$ 5Owf$Z-j5l]y'@wg S7/'C[ H{`t0 W<N(,xG#' k7^P@$L\ڈzY!1{ʊQ/4k'_x5 fL?K>o5 {gyYYp((/u)Lfqwd@yi |dV<M/IVgR P qʓ2;}D]w^ͭ wV&4ȪCmz\\Dp^mZ%x ùr>'ZN9W!cU@wK{
ף_톻[\xB^$i*jj{Nc]JQ3x.&:cO?98gI˺ @ IDAT.r sqQ '& X M.مM"}kag!'0(aw46E 5tCԎt wФy0gyd<ܟY4<vy%nw`pA$ mmYh|ؑ k36`r*n>S5 ~AO|/~x??e$5U4++9eM>sCN*fv棡981)1 9$kJLV}ta)j4) $ 0-F/{ C ;FϋĵeJhNM ޙT Ʃr>'J%5UU媒ASC[ٌK{hWۺ<YerFYE.vG[7,/*e q=mc=-h7~)_!D:s_;.$@$@$|bm'م ]7"*Ť}s/B06jԗPQT׀HЁgqe'iUo_B CؘY|wM)Z? ~u@(yr'n719]{q0G{-ڍ)
ryHa V1 2kp18:-d#RT+ o~}hK>N7wdMȯiFsscs\w`shvit̷Gf[{'/f}lLGcJQgvx/KvC}XJ/E()f4p0t¹δ,vmrHAvTYyU
2ҸN R_P:5|\wƤҷ"#3 y(Ї =nܝ<"5`kYF`pܦj܄x4ݓL/capKϱ(8UD=puU?cH71,_%L?XÕ8mW7 v!dJ?hW]@_5-C 6f=zҍ+0j#&UJ2벵h=2;a.ǒ~2qf?s㛘uEԌHHd _ gd@ Z/!5QR<ֆd5 nap#
O po1Y۲
Exi w 7D{\x[ӿڃJ.v |J= O>-r({5e\S0vM$?_z _FC4@_[$.Ҿ2*=kʋ*/p a35offG |m)SuV]:* l+Q? F4 =- u?Gwt}|f[3Au\
g?흨Eu_yA;9?yc\/_q,V"~&6oTz۪Y#>c 1x
QXbpm%S'սmAYNy9-ʵk`&|Gu8
} WzLkm?截>ǟ_Pn }cO?x{UC!:O0R7tn{
ꎶɏ~EϩzĞRӨ<fS&*֯sYh>]hzB ._tj!7^TQM?8dZ9 q
=Gysf\d
ޡ뗄fs6!. GfŜ"y
LE(jf뇿۟˜ cb 97 Y9(|~ \:u 5%O `'O/!E|LLMÃP15:!c^-}w W~|oTƓCߥR
H f˭nPM`z߈T Nqsuo-O.cko^~%-.9ӯzb6 V؏wy='sY?UHé{~NmhsvgpفV8DYY+\y)?}\mRZ>)~SVn,^~$zv#?YWd21;{~u`| C V#}
6?F+ Ϟ38Y߾[o엳ZYǕ_n{C >NS7xn<|cm}`?#}F[ o-7cGBoViͷQSy} Aֺ^r't|SսvWr4F9X= w]I<MLS"WneF6Lfݗ C#ǟc쎍ʧOa^K*GSV,<X)Ӹ6kMw=odJ˅zYcs,SdgWU<2]ۆL SRnp8=K0u&O@ݎ*=BlK6*FlNYLtb`퓊lo15KSoxx>bwj'ja1;ڇp b9,Ʊ kxg|M*k4`~y,r :fGsʱõ 2j]]nC\ʕɺx0އ!IrȒ*a~n bz MTصn.gs+zkd ۶a4EmZY?l7!$E{} b/ƥ
aЋ~e#t}9;Vw&(7v Oտ`" UEУo[Gwk(=ɞ'u m~=O6x
`ׂK\+#h
\-Eϼ/nb u3ؔ1䢝|ۉcv[cE% cA$˵`ׂD`WL<G$sX9h~J.ש _ԇx=>cۤZ\=vz2V{9پ@+XP%ʱǓhiYū3 5L`Ŗ4YÌu @ *˵HBmV2C IHHH`m{m;sM$@$$x#N`}v#$@}CwHQ"f+'ۗ3ck|grA)$@$@$@~ @\ ,i〛05}
'' >;IAEz= 76/r53 M+CWIH`pnU G 74ҩM+9`J *&@*.<N$@$@$@$@$@$@$@$@$@$``A *&@*.<N$@$@$@$@$@$@$@$@$@"1ռ?&JtiCB Xy .yݼi' e=6z..,F;~O4% 8M@۽iG$@$@$@$@$@$@$x `iy=/sW* cS֭ÇXX; &z %,{ؖ1znIjʌ{c-iI]e :HHHHHHH`
x`#شq#֯OI /.>2#=
,P1 H@=;7 sie)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&>f @$@$wu; H .K=6"5u=֭K9XXXEd8;J: HCLO~ӭb RҔ]SKTTHOo5$@$@$@$@$@$@$@v ~ѭ)XYssPfS'ۡ:Oۼ6z KiN"$@$i# P$@$@$@$@$@$@$@?7;M7z .a(?&Wey[ &i @(kv+|R ssc8? hyf-Lkm.!IHHHHHHHHHV-WmQq 34& Xh^EGIHHHHHHHHHh6ӠHHHHHHHHHH`Xj5$@$@$@$@$@$@$@$@$@$F qo+%"tHHV1 }ImI-Op{ʔpMA I z?[b0; ,.bv]? `9s9Ѽ8x
Ҕ\ph7wk ,Vc$K]XI=V[96}Õe N> ]Ѱ[R"ϭݸ9bN? Į9t]!oQE@'HJ0K{:G !19/Ub$ޖ<F993CH@e}rO%G.]r
}jvdz ]G J2ynTc~7sG) LB+b^[k3*<ą܊:o_>ˢ#{J e [<Jcq<F)L43R,45bOWPo̜ .?;K(@CM\.deaӆ
X/åLn;ԏ5IniA45#/c(\Xݾ.\:}1x@Y|};ĿۿqDN]Y *fs"ܝc"\3_A'<ijO7EMiG g,jMna &GY}&>><<jy|ʉy H@ ǞFjw .\־aW[e@Gzi_pcJ M~\ CJVW %<c11x[( l%WNF?UhjԹ 1Շ]F]9^N),ۅk<bg:?a ۏqme4"/^8NZ8;"o,po0} .?[D/ً.(+ۿ U,Z{O~'5C+&Ք߾^T4OO /t8n^w
<^ ϊݕ^c70} esl.-3ؾbV©3H^,W&&FOM_V ڱZ3_ "P#4xˋF+-2u DH$yz={ͼ,~_`rؚ~ W\՚Z"W<7[ SS
)c!P^NWF i m؍gH+8y fS
۵/mӊ1w"v71v{ w<9ʳJZ)x7`ݚd}YTzk_?*'q7x]DǑFsQU \R<+;agfGծ:1xYjj=gzӵҿE u[N_ 4Fz3"˽,ahb<@z @z.~)lR )둖r((i< HSWcOBW.Mb$ ƨ :&do4oxM}*x+4G OUЮzloD'ӯ<Tf3 8G68w$ƳIp>8}o-yKJ0BԵX(7kg6njz|ϡRyM>|}~On5 *Tׂ`X˫Qw% 5vwTUbm$+U5ꣳ> (̪z0O=1og^t @ ̎NNeI<qc]O+=]Cu( h<) o
N @~cB$ ㇅ؒclG^2& }\dҏb%(~7xw#͊xg$}~e>.;̱Avx kÏПe':?5J"Sxt꛲ߠWTpy349 eiz G rz 9߳ۻ:GPs Hk3;kΠ% 5r kqno˱ v{#~*<M;LrtUEyبl ;Ѝ6Kf
33x "gSj
Qp֗ : (DAV*ډ@җ,͠b %V:Ch-DCY,F>gIa(qeYLM`3ᐲKA&qmDF Xۗ?o'vjŶ,G^VlN@Iiwpӫʖe© 7?\lL]1;>3C~ަl Ұ^`})րieӏ 4=ـҼLlͥoٶ1(QU9H/fȐY0-`0}64Due`s
<u'e2&zŹ/<rq. KR;pj'
]
:A@I*(j-D~]Z}pj_T?GCuߕQ2vuL
j-:?:زfE$.^em_|FDN@0QMxI]|0I ߹Y?~vl }^()fs(w s'*jXR<?hoQɷh}1G/{#ھ-So;C 4BuKm,i M# W&ߖ ̉i: C12K e=vBeIڇZ꡷_i:R:\Z`7.P +5"}] GGh&q8RncbnmE?BchA)Y`E_"5r& [L o\|9CVN"ύTC bE>h~yCxɸI
ag<
/ j/[f?'7<9(V P]YxMwӑ-Nى[CW䍪Z1NW,Sq*ڍ*g+ U;qm5pz_mo892#y]Ď]8D#>z=i5Z7l fkB.U|8Ӧ(܉iWqaӼ&2]ݚNM+G˩i <gKh5ؽ
o"(^~h@Jv4x+ yZ0~o6]$\k*H_]VZyyqTS7O}E<!\jوdw>@n&# ,GEVܛo\Pbȫ;O @2F9*D.;s,\1|riBDWpi'5&ZZ8$>#oO}hJCFpWaOa(+qu)~h5gUW}) 5u-eVOa oMPXVdzpCI .åt엥P._BC]9{M6p{iڪ:[PCǏymǰ{uVJ| uJIYO œOg}Z>
a6i==}Qlʶzb>^iW}.6St-zjNƌ}[K[zH8qI| ,{|[mٴthM+ v<@iOZc֏Qp d\] Hm:o0XTsV ;P8u]alHWp nj=kj> :hXKWNUxi =)@Qa FOٹ1dSeE_~\O ;@ħ2_{Lb,=j/*F&~v}%ee0\Kd^(ZQɌow nԭĔR_t$LYc m]]z:;+`0Uh
8 |:U2(%Ux
Vc zLO|8_ͦWI,G?حR6yǂ es:K8Gz9:qT˔ׅG! FBS D6\+VV5ۀ-x`edc&e#' 2yNq^ߺ'8KoNV6_F7h $ ~\Od]}Gҏ%[M NqQf]E{ʃ1Toc~F)Dy|=&e#G7v+f,ApKU = _C =en[?mq%\#}=!߰V!T68v?K .PU2_Q_b!y.),Y `{QBlܟA77=o#N[xN;6eEܦ: `ڏ5vsr8?o<m|حHCQ9ma{Y_ ֡kVf,/[# uXS/o ~QŶ|9 }X< AsG0veQ/MJ/-JA=^z>Yef$ -`o,j}kn)qpV\K +-YхUդr WϹ=gu%z.G.7\5E'Y娕E|3`Ʋ(]XhإǎQ7Q&xݷqS}ͪ>Txf}.Fp)ر6h|ٷ/?}'jԷ >5^v7}(3>ａ>[8T^PzI_P\}f oଗ!2eb4 ^u.=/. t ě;e4z8`J b˛|4{Ǽ3Kӷe{ j7bzn|/e41!iUA<S3T(Kb\ RC' 7ObokE3:̲' Kv]NߪwܬW?7^6ɘ VFsw{^~JMb oCo kzǬ`GAV;N],ñb?^ufGf
iZ Lg?Z+:hO:M
yo/J6 ±C2+;뎔?\ /I{V y;> ~2<a wj TD.}q[.o h@3_
\^,:6.x d䠦+'v y}_W5.ǁCFX|k
Y~`~<ytOѵ{t]ol"};yN1JJ=?ԾY9%|ACu객ڛp y?e 2&3f3=/i/_Eb/˗c _/duf<Ҳ-uj{713.
;spu0t6cvO9geyޯMfvYE٭w6sE~z}0,[Y2Nݔ\it;;/hx0ڋ5ȱ{SӺ3<3ɄK`EY I? î/7ttl$7]_;`M_ ?
lޢ P{::@~Zjkv [_>&uwM,zϽ뱯Lf7yY^t\Be7wC${!~b߿_;^uhdq
oi链~1n rmCӇpurfa Ob |>3 o5T{9g"GZPy݊v\ |WZ3 )! e %o!3>$;oGߵ }g-_Ik9;wᓫhF`#߿.p'=ow^ƣh?i
գf3\g.
qŚRF[LDqOOM5ZRꁾ
حD}?+wߍg୭YXh|2 AR>A˲( =d|mY{<~=?s(=y ҂ o~sQئhLmG#1 ICIfVғi1W#vNq_ķW<;Co/#I3v+O7}AڕS4͎|Qf_^wO7/Nf< twXs93P#}'\z %ջmgo_M^6k5h+GOmoܖsPx
*˒ 2qc v{peb99Uc4 h6۵egJ 7ߐ*)~~ٟ[Տ,l;e4Hk A~OTͳF[
H^%}
7n6u5]'o2y$3YFGXQʍPqӭGY"/kK{Eo饯9!vȌWT~? '7ӈ{z _g7!#CmIaΝxd֒ C (7.k'o`_wdE/ #DDK1(L-n-5c3lQl٪,.hb ^F{̶.,BGԌOsC?cru+gR:w3q">#ͺpO6}YNGǔiY4ߖ#2ݗ[K*] o!5ba^y4=FnĻ,( ?JH7+|~9\ \Vn̏Ucv㚏;ؘ`B ,%}'\zNh) \|+/T caVg0~<ӲYhLJEf ` -nٮ.'C!.xf~{;8|ťޅ}w}6V v>ю|dCʻM*n94w> G
!L$*6ۼq'tJ okQ9bQq,W kDg\kprWU.vYbhsc`::
5.^ MeQo[E"rc7,.yghgy60M2-6XOtC*| t2 hߍ.yב-]x{@;Z_]Ha
N8fG˱N 1ѤI^E=j
5BJfUMr{TXsG=pD}qY"x z%:}RQq3:'}cDWi4 A2NGxfC?7ɋ@eYQl c~tw3W*MK:1O,9Io
w̖/V5M/óߔrd-8{ݭ^p_Ļ _l툵]tҔA;&ΪX_E,;sxR[ԽqOl*sO_/vn Ys յlsBq>vC]ʠvd?#X߸OoxVz<ƏjUn,l;vel 3_EUZ݉ƽu/q]xe9Wp!`5tfV/kOV_Y?O"b)N)P\%k] ̽i7!Y$oo=rUQ(.gV[e mהz[ț.-9?m>Ř4(.ιXp \ʯ߂V<J 7ޯxH :QudCajWwգe T4djsw 0?cf?,:u؍ɟ?UWOmuuz%VU.EyU s`DV?Io _Ut*
Z0X '9Z9Lٷۮ{m՛Hyg@b7Nsx$;{-X#KŹNh?P"c/T0%07F}VYQscE,:.ȳW|
rZo5 dB9s|_Z<ث>j8~z-KQ߭Q?; =}1lzǷTuAɢ^UiT&bGt\gP+u'_|
\}~)ikkm s~.rIEMo0S dtH$L ` E%8tpԕ7^,˙tD"&Dxl5#KT
(s#}!G)1ճ
?3Tt=2Z:t !pN>t,/]%zAfxofr O3^d!ܖeH&;-߹ :tMdww(#{P%)s,˅O̒~t
k"Zg1㧃ؐb528)8Ḳj4[\)I 2)Z֖X< L t'CxDZ[m)1(3}Û7աEIgG뽹-g+G_o,C<)wRċ?TDs./6cvuӢL~ B]vWg@iE߮ecv ?و; ;Ivw1pǜ ;<T=N VE\Qg Yy.o, /}e#Z
oL2E}I·eٖG 7=t
ŻN&cE:nY.#ңm Q岬3'ډE'f*y`CtǨO"̇Rl0
57ﳂ@އWpGm^h=@
DL`-z 6` v5O~~A{^M&2+7,LflS^JY$gdDob](=@50v6IMFe2sLgěRDK#>nw)@; &O y(6vgRV?>Bi~4ۋ .;
b3tv9o_J6+2 ,}rF~f_$_(;nh[r[ne$|G)~BK\
O٭ ;ցQx~l5*hy^r
Wu
;a64Ŷ$Bu٭w~ى#V V"x>Tмydd)?=|YN9.cO Lϋ [
q=ܬ,x_/-=7{&#Uی15bKrjڎ]O1Ant\lT# _۴a~iȍ1=0qv- ) ^-dyYvP]1~wynz5ؙR4-^å=ZNaG "U]y$W$ !
^tfV.tFUOtDDL GuLtODtuj*3ˮ, &1cB d!Њ6Ϲﾻ}{Y~w>gy甿K"Typ_waalJg얊pVj{izFnv8숃 f%'#fbDԳ ~tdkMK8s(GiysJ CxgO7z{1~>E,P(nGy9Jw1}5?7v#TZpd#7: ViVg;۶
Y7&(N49GT`MSCqd dR</l7ɗ4vn|=.{߿a\TƈWލ \{G'Ԧc-Խqv`quZ><|[lVƲv8'k-\)˙Vt>t֚y;y|;[S oyyNYL: ^թIHN~j!5YON(i z;,[5It'5gf$<]q64ubA+qZ[BXG:K j1]*rEyجYY91PV 6Et
7 5u9
#*EI!N< W- -Y_݇ F"{?`'e6L%. ͒NQ#ƴvmf݃E1 $d"+l(-R>hRIjoO5ⷡ8rrj/h{ܢֱ+MI (sgUmvWMs 3 ZQu~W(aUb'Bb:^Iި ?uS6Kv -uyb$UZ_sߝpmDm|"+bjݐLڧ|]
vCd
Qh {.)z:'EO˳>; F1Dg懪R7;NR16S8^tP
]PԨ7{n|1.ikWqu$>>mޑ 9R< զҹ5;jGrVO% @ IDAT Qn}/w"x,;NӍvgz[ .}+|uޝXYfJ kד9$'Fzj4pX]{N'Bvy<t[ O=yRbZJQ{xⷠE|Ky%r.(ݎڪsB^]SXnټ,>Ցt^y?̤̬O] e6ngv(oMH͕+hyA%M{E_ܪ
H^6)^{Rb
k6\E.NZlں hڬ--@vf4ܭz:ёfm}b@;dh½yi AX0**-8C=-hni3z12"ӵ6+ai;___ >m $@ G 9 / (X3( 4
(r%gpG#kzL) < !dn[Lo&T*ۇ
UW`k+PYXRycmW#5HRE^J%kzU_Q]nJ:g@)3=~ wG˟zbmD$6!)yBpT93
6FtR|<e7!! 'ΡM1Į藩 ':aHn}.}>{>箿_rvr0چ~<},?VKQ@dVwu_MYà Ҵ^L
8 OH3 f^}?<iŸՔK P:* /gHxqFF#QM[kb\x<w$c㔧@d\r~$Ϥ`'z[w1J?ڬRV~z%IH2Oti:[
?9㹝b[ KS\ 9k_%/Rp]'u]<؎Aa Pk.I ?x/_B@$
+rV<P'W)~wM0] aV[i1x `n{!k4KVC/̋5V3:M/U1.8Fa(0O)RI ǟ; {u1 Q fGQyɓɎ1:[q/cBP$oHkg`w <,PL$N>+>t;x҆u((SWAvI(7o dw>o 2cL']^bv(8 2Ynn}
Ryz5mu 顏[`~/ǜ{gX2vgBL&v GOGǰKV.A+>b1iz<'nR#IxsSgrԡlhWd
hŲ^w}bK?~ލV>Ś꾏*W I_-3kx v eRb*ܼwgK݊4J8;d~ջ'soe?o0c} *3%}(g syBYE;o\|\*?Io9Nyp$_/C7954c&y)fZ:&e szn 'i2=IX_o94qy;T_nK$z0,EŠxg$_śR:?o,3
l7+
i,ǪU WLxeY[{?B& gid9
/}<gҼ"#s÷&hRp*~4M }s5B+b;ޱZ.5Ξ-Q xi* Ggt|aZWGh|/Q)7`gmY;K(x&L'{9 v6μ8e-qOGQyWcAFӆ!6ܽnD7}JLGpqAnKwΡvT/lZ( 3,8 ߜ'P.E'/73~m q. ҪԘ{`U7~.ol5W OjD?§sbV&ۅrW$3? gliLIUu^ZoO
S8}[LH0 s{O4]A] ?_cOޛ#_{`Lڃp"-vў,gq}˭oq}A=WO.7O{n .*DKlR2 O-Os^ۨ}
g IIsOہ6X^tٕ@vj_,Mڠk6_;Яs:!UY"r&
J]yHkI:r < }{<ip{PnX3ۿ ⯸'wOxBwx^Q7w&uYGk&-U} ؼ'U VH='5WuFBk!tv -uas_ V!- މP6kiQP`1fiBOI&6D#3n#JC({д~6dЋV( yZ]C/q/Q ibHpl^̢ 7i+
bGn~
͓G.UHC11 "Q<{(8$#ILyg{# x `%^xy
`-s}Yw?}i DN}ְy K}:Yiq :Zџ\PrX;:LO7a=.Q"c 0g Z-x9 /,_{iŦĺ
^ Sn^aKRwҠ2ۂ.- ZnxRhc |;up hX`W~ :!j[VOIxE3{h E~aoDGËgƛo N74A o9h#SI1|) Ko; шItĘ ~y^/6*AXh|j5"BgVvg [# ؔlJمɉI\g< qX4E MInwR>7Hn_٣mc#ںJ9H^ӫ W.P%?-+ڊ3҇fA$@hސJ"j1j܉y 7_/6bv17i3hzU-("N]_yؔ+~Lĉ`Y<u^13ئW<Q+WىOI"y? ( k@vM|<> {K;jN\ox3.;Au{C;}>/hʇ |L[CxV =$ yw[mwJKi-3:.3U]*uۈ؛qΔ}6p4F0gl
<.]-SNxzx^w5^ܯa˗h%M" +zqT k/e]Ѡ+9}/h~Zх'bYDژ l+u)[a%bٗeT,J@X'˓܂V7brQUYBl'8%DXrqX\2RuĤ=e/Ei KO} %hN,"ҐcGHyln±)wcO_ܔ^|/O˥ /R uQ,6Ǖ>IL^^%Z5 .lVDYs{ij'؇zN/n p؍D*L6p{LWa< X1 76wZ]pIl[ޏ9 [ncdhPcޖ6<W-鷢,~v. &E9/ɲKA ] =ri Wɦߺp.mt! p[QdnZ*E!Xݦ˷X2p@\R6DE"44Hlի052f.IHF^RTuQ%K )X ` 3;&֣mT /BQq Xi@)asJ=
IHHH`nG?m+ݯ:g(<HHV[E@.~yX~HHHHHHHHHH`{T$A$@$@$@$@$@$@$@$@$@+
+$@$@$@$@$@$@$@$@$@$իdwy?IhWJ% Ι⇭]Vňj*zL,
6 KO $zQ) L={y#!.SS [V,ghf$ K`^
ch;$d]@FdhВ& Mʑ LIE X^=Fo ֮Yࠀ-,d` M mK$@$@$@$@$@$@$,H3'&ߓ䦕Pc #@wU "
ޞPc #@wU "
ޞPc #@wU "
ޞPc #@wU "
ޞPc #@wU " @'HH`a d-l̍HHHHHHH`54ZjBCBիo<g0=3c;.hZ$@$@$@$@$@$@$@$@$@$ C
Q |ӭd \]S TTH xJnifw̆haN̢4:iyxXBCCL
4xLUP p@XxkHHHHHHH`I~ONLb5&c zwOGǐ g2zK˯& LV!# 얎ɩ6vK:J3'&'%mr (yftV[ 5i$@$@$@$@$@$@$@$@$@$@K
K8
zt ,Y4x/٪$@$@$@$@$@$@$@$@$@$@z4xiM$@$@$@$@$@$@$@$@$@$d /Yͩ8 P'_>ᗒ=w/rJ(
E ,Iq;{{.Rぉ `fcFtl\e$ D>$K/M˨ % XSqaA019>4YӇHH@z xV-p;QXN/(A~[x@N5f8>()tWܫurc J#o'r[SPrD8)pn߹n9` 7 G:pyA <
$avp4\ v+W Uͬx\ہ{=^M$@$@$@$ ,[>)P;3xGh:">7Vzݰ$3Q<
"A -qfC6ЁUV3`0/ٽc^ql y#ܫorc &p?^~UrX0 X7J
^ Öh5J (ZՇ O8s\bJZs |T!I 9>71 t4}X,4B묖sLj$@$@$@$@+ǟlxkq#TX맡z+I`1.`օ3q#K\ ہ{H^bl Xy}~M({3?W\d3|z.{5BxU6ko2f AH<v (FfbB_rMN^<J"+%kVٌŴ¡|$n|~f
}mpƛ&]&~UZ3:5 ٩HBxZ&9ΗwlhXpE.yr9 D8=A@秞TxzR /(݁$DX׳XG< fFuqeH1`1#t\q
tK2M>iGۆ<mBRṭSQLIQ[QS(D;B f&0>:FT5Ygh_Sg# $ܒbWs Mad +EMH1(YL[6 6yKۉ$9cbUW+Fa{V "6jcⰵ4N\[
qnFYl|o~鬬5cmA,
vs̳ L1jv "ɜoy * pƠdw!>tN2LM*<L2GM<E & 7kw zODmXpa_ߛQ-5'6Zj\V=Anzf0
*D?_u}榆PsW{%t%YKW/7.˰/HHHHVE1x#<.eeF
v6
Cɖ(0O4Q% ĉc{I 9[gW}~W
r-RfKxh 6h^&זm2 g= @wUx {u@Wn>vg ۪l)Q~ͥ)߃rDTO%M )ҝ-|ʦuk'J v!Y`|J䉝6f\lߒx
U{E_C\y($xk{cN9 ǏkQ+p(^Sw
9E';Rz4xK ;,3^o/Vqn0v u w18.o *CZ_ڜ][qeܨ47y<`$ 1e⩏P5 %\c<cבxTu5coң8~pDYRX+7KF2cd z壻m27®;H|/ nmT6mBqv:>=w5rˡԭ]ȓ3E&(tjUSV;@\]U)=h4ʷ~yu
3x2u3;g ᮍjH/9G;R#ֲjM!|Z$f'㷿x6L!Y\+
l{]~F_fIHHH`y8{Wl+aX*%'~$ͪL]+k4vKdҗNv~GWK5,
?0vtvb<]:V5vK4z#0zz0 Y#" TԳ^~ѓn%fJ ^ɏ[v#Gt ՟[bRyQ|֣)~m< z=ns|n ٯ%9<0=Dmh GiJ4'91͛ , aq-f&
bxFWrH=nq;<{_^,0d fȫn%0< {+Wxbc륗[neMGj.-ǰ.7Ы$E+qs{bP<5?Rd^FEj}yʌn)xbSV68"!lZ{F//ۋ5 pXQod A}ww +ͥ=>I.*桯'JԤmx7[=;Y4m};W~#spa]ƢHHHH`^[cy@ ,gjh߶"x]$[DH (b Fٚ]ǟGf e}h@)f! ݪ ogy҃8r@̎1s\Kd3 SO-ţQu 1܍h2|j3eK> oJN͓'Q(K̐ m;und >gFlDb*,@;SV;y8, @(GGU|rkӲ+{[ 3VynsC I()^+m?ʼ6/?A0)+ۤf"vN\~ QczL,Cf
rc#2V(1> Ch
/Ui%e -9= ƞt#mr"*GMgđeh>2cwV7ۏ VgF$$f-K/H,<wg&p߮`hMFY yZ6\:ww=,=eHע\X|tKt 1MKFhAw6pz.\܉oC;*%biv]Zk㪯GD`*$ o$ RGlJNA|EY|;,pE
x6*OGhk7/ _ 7 \ȣp`<?R,[wVԮ;
3)x fhcܺbR]hċvآ82ܕkJ~Wo,[IHHH`X4v
Ql3Wl}6Eӟo
]+F!-;
9[_0 +XYQs|th|+8\܃g:cpm{_<o^N" %GP{$V\;-i4j_7g
2]4zSv V]#~Em $am֕Ajv
_## %,z
UW @Mc߽/ VݒNÍ_i^ Z(Ssxk5mn׆^GL2sP8" jjcZSj>C1vK^"~}P%[s
Xxt
m `hG{|pYz, -0劽}ӏ Fէ͕S~tlDl_o[z ~wWW?@V9}zl9x*˺IY EloWe8sӕ7Ή'ta'/b-PA#RRƣ fO>@5vK6W)~<2emUaVaX{4>h &cgXZ&[ԍ{QMti ;=m/,c
:t762V6`0xHQ1H~KڞC-E {8\Fms?~⨻'s >oeq~w jn<B\l6}Eҝ o}HHHHVE1xo9C ln g*l/!fY%)1b#-onR%VLxX4(-M|)x#\m1/FTz===mHռiF
צU<ь(-C-bEu; _w曨k_6熆v iᦳ-P-|3v+PañA!DIb< @ fz&ڤҘW$As-lY6㖅A]bΔq]Mlv 7i[ wDI9.fq7tn5`t(H{<Yدh 7n͇ mR) wbXM߈ᦳ-w׃+n)u7Ŭx٨if$
]Rtu%GPm(/G6Fmob|ښa?0`ݩeJ3vg mc-;lk .7ΐWdq # !_9,ea^l:Q-`Zc-7,<>R4/ԡ$iW67!MhBlRG1rBv7".:҄h$ؽ pb<]6w+a+O} *|vjU.d/No%i㑻M=t9uDVUɚ{\X&
%/ϏluYkJm.}b7h;uKI9RɘK5Z%{"6
11e4ljn;J<apQ9f݂1 =Uuv7j\nTI,A 'DpBNno|D'ǯԂ^a0O.c2ś&jۤ>nrݽZ*]M'. >|eg
$$ ;%<dR,*D~ \o8</ %(2(zQlAggMO%85 Rgޮ` {zJ
mIԌɝ^:oJZ/uj.,^9B}?"⯿/ݐ⳽.cT+k~.1qӞj!-Zs@i_nn(&q]n\L:Ȣ\tj9g?/'zR,uyZJ#n["w46PǭeH0,\m" o:Ƈk$] z;Liy2Mn/?M/+ X y8?Z,.N3q,P[bBboF^" XX-MLω=yvZ^s̜)(k+ׁ~O*lz]yKNXXwk0W<qs&hiB{gXQ3 ^,ՅCeYaM/ ĆFF34r:|
ǰ b5K4 N8;wg tu5˛0C1a|H+2u0>[Oh\-DSYJ\kF%5j'
Y߯DϷ6 Q1|gF $^
ٽIސ3&?0Umz{J%-a< z^|Y^oۿY7^-/=c7[!nJ{a{4wk1VY- g:0HHHHA`Q ޫ j2ˢkLJFb'bm7FAuSIć~Kx(#c0[b߄˗w[CdAYNlI4#rQ77Z aHUiLN0V2V涵VQiPFnVזYMfMWz}q茶1 ʱk\~(K(ݱ 9,lݙvs! qztUJ7DfQ6f3|UkOۋ U*}$ߩ3hw?_Ԗ
EMпv ]Ɍ^u˒$@$@$@$@ N`6LӦkG0rIX%Oi'_/ KLw}vcڔjgMx&E7F:'Oߗ sQO3O^{U +劀a\3vKto;a֒R<Yo kk
lۊf@q.h)锌hZW\ 0(SEl*vyC϶c^iɈQmzH)N=pnS<ߧNBaziv؛Gsය
Y٘<j\]ubV⣯|o&U2;Pu?!,Li#-ega#TM4́nOe~cY˵X$@$@$@$@+20x-ͭZ%`_yvmvb25-j;-zxGGY^
SPT~?ƎLmvM6/1q]S۴Rl @/k5?tl_nVߩnP&@DW}MQ)%"8J OOuF9%#'CxCR^.jtñI1h nooCYivmvmYBqU~h/x{'=; cPP ?MVOY5#ElK3G OL?ǶS#}4]Ld۩ˠ7\o/t~,8 I6>E{ )gu{io$cEI/:zc._lq7.˵,vc$@$@$@$HVGAt> ~{g>1}z }x݁TwuY%MUYper£?ƚ
WQ XM[s
ܸJCeml.6ǿ/>Z
{tE6)y|GBEreYtX ; COV2<)=I]EܽLʇhu1)iځ~) <ΐFFqyaSmI߅7PO [Zыjf6h"mk ~U zppa.72K?+ !x0;uJyVpm* Q*+8}
wzĸi[<KQ:v6+<`7^Gusvg1Y8zR|\T09w;^9}}mhmmCgw?> ˟Z-F
V@Lv~xܼ_QDԆ8$%oBZhN\Mw\rجQ! ,Ty].o"&)8rLVڈgAyzH:[л3]5h bpoLD>UH]
kr7 X062n}|?:u3rJm5?ʐ|ؓ7j_]7yX u&2'E.yI
e7c5F*V/CRr-D؞(^!L>WY|\!3L/eR b؟k+6 _ )P C/R>
oWa0˹F`q) _xalDxtV!8#;*'PdA}(oyD|v%*0XO_Z+L!eNza~<8]z&e FqAMb>l^ k^ls1}D|,e g1&F6a?|hEm1ʙ| iyu((SAvmH;o+ݯϣk
7oYjr<;dsg
6;l wZev8gcZI$@$@$@+a8ǪpMJ<}Rv;=gθ i/̨Z5R~תt룍UiTbt &44Jzܯp<un7}Sop'n_x?],ZOk\x]eyhu0 ˇ?֔?^1>К-p{x4|inB?>RI+av?՝s0:+3L[.5Ξ0+)7\ hPo~ 54kgt㋏~V#b kgy 7 4ڹB:OqW;P;x6ɛQZ.شMcZ7Jf &uI5 G~.oV Ojn
V̉YDؓ><7s].~ZrkϾ3KC ΉJy"[ Cm}-+=l/𤼚f調qڸ)w#j#Uoũkc[z2z)as0ޚ9'Wide:;,\qo 27j XV;x;[ @b!< ~Қ u C{K zm]+Jt1;0ޯNֱ3P Ŭ1ThqDXQuQ#29؎/֤Ƶz_1MF5h/7LdMLjL#4xVl0 ev|$, ũ!8}h֯*EGfFD7P ~^I,2 khBXxo.$#t~œfa mAB9iMXSPy\loDtbr}AgAz_cnӳ1\;tdmݶ̡D"4k}lX>R<ԔŃv-+
C25ԉݖpjF Mܲr߸7Ί_VfY5fHHH`9ؔl*^kg&'&>rtt ǝcݛ}죿7C2s'Uܙ{&?K諗#}ee^Kz;[g(; ԵǻŌXcʞmSU 3JY++t\xbvsl1,'b7PlI>4/AX~iݨv7"[Ei8i/b#Ƕ Dxs5֡"t]y 5^aL<ghG~v]-~v陀HHHH`Xoj8^
hn8faqQRVLm><jxAL ;0 L`q4? b֎.<~Ym;.m.
ԥ 2Cb^
*
2-^u\ş*9 OSrLG$- r>z.T{7۞l J!@c`Zp6>4fj':$@nct %C`dhPlB^%VyA$@$@$@$@$@$@P$rHCkIH@Lz CFyL5CX2fV$@ J9H4lDhh~ s@m]|A)23 p
z;Za#@ ,0vӶԙ c )v X2h^2UEEIHHHH-a @ IDATHHHHH $zl^;IbPg$@$@$@$@$@$@$@$@$@$`A`vvvEH]Z
aᲞ33 7 "$@$@^NHA$@$@$@$@$@$@$$ L={y#!.SSY[V,ghȊR$@$@$@$@$@$@$@$@$@$X慱06n6CB-*.+H24hIvH@]C@XxꦃHHHHHHH`yxl}Xf
p33f[Ew6*F$@ LNL/ O*VzBiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH$b %27 XB ڮZ
!! Ձ7w~~ 31\,ur,ƙŠ<IHHHHHHHHB D7nBHp>%0TK] Z_$0̖H@ԑ: B|#Z !A'' ͦCu }&@@$@n s#6 ' V5kL9 ? Cb|--"-oM P$@$@$@$@$@$@$@$@$@KftLNM[Qy>19)9MFoʰ
ދ]̟HHHHHHHHHyfr+k.ue\h7
M
~J$@$@$@$@$@$@$@$@$@$@ M&HHHHHHHHHHB@^/)HHHHHHHHHH~ӟEEr S> {A03 &.Bٱ}Ȉ ~n q)ʉ"9\z2oZ"Z9ϒ %ˑN'Gg
T4h8 EHHHHHk~7x(/C8j+j0lK<%HFuEXO֡c,됒[-f7
ޙ;$8wgV}g jf4Bo]egXfa ,8@UZ$4ks' DAI."$itV~.}{sA bITբ"|e\:)ÅIls 8:qtyXh*< pƽ=]?{y/
> $q#neMGw
yTY.*$@$@$@^Xj2(:OZ ?b.0 E,*܅) L
[vQ~)J7kڻoa\y;p1DQ GCoK3Hc4kzv"; _EK@\6ppIن}ݮ) }G@~7/`עJ.^aWny ]\Nj)Gg cVkӺ_]y,scO{yxSЇHHHS 4NjIqEh$f(s┩Ӓw"3u3 )@GgY2T{q/3:/i&
;zi[+XeM #=\>ttXxIiK_gg<13%8Lp
ä|}lto=˲rLx ӓ $C' Oc: >ûs[rev|rФB4ħ>C%ŚHT&R֭YR:ք! z* g閿rj.?VtSA@jj,-+pF+s @G3ڇ[fK^| /lM2]^~ T9wzYևs)|s?>яRHHHH` 2#^&wwG0\
ޱII`9;6.ʷghڦTtu=`)|u|\R.0~I ,MibYY<} Gqr~ܟv*Я{pJ佇_x % @pd1<Pk-0ruMnORZkwwsg
Rqؔ! -҅|8C0h
ީiplSs<"K[,2?fTߨ/3l؋2 X/qFnב !1dbkGlZii=(ݒG &mt$[\g`I>7F@0?3%f?h82ѴQ$oU;c!V"9jk^0kw;\VTa[YQYWs90Ղoܱ[r~QY 055A4ݺ+s.jRJ{tJ>vG6A7a^j 0OŒb} wmzvLw<#,u,t$b9y AG$
K!#)kCVcnn 3&096ޮǨi BdKs!\Z=6ܽQePo،^lJ8݅HB{ :%?/i+299q#,|R DM 1(Y &k%1 ݭxPaRgy;Q$W7&W+ nx*g(ucl".f
^ix]ge![zr($FSUNڂb!eTUVjD-ܒNy>1''hV6uS/C C<wMrF>FԯTZ[welkWx|gVy=[=ӚHHH=c8
W'y vt hHH4%O5RGD gRD>na-/<b\$݊=pVci3nX-Qd%4ݑYwo|lqj0xydi1p̼m.fܿJˢH/գ% J-[+gfa\os%v"^}Z`,ɟqRI.c~=RSK䉝h9efb |SoO|~xt?2MmQK1! ނK| ? Wj^QMX1g; f(DO\\ZGy]桇_o<m/l~gfn|c}v9^>ieޞ;HGbӦ,gsgQ3k܌nZfFNt=`Qڴ{18ؕSTIv.+¥?]6)G\ =Tfn6g[qeP (J9^ CL 6/Ēw
2pG2ԓCpczQ ?ͼ&"'7YAo49h0x̌z7LGj+9L|*KWή 'đ!9&0g(=Cli!G<)*ڇW23Q= 7ΞÍQ;eQ]i?ޝ;gj @#`i<jhaYn3]̅v5ZMWn|rn-HHCmG20 ٩b|1օݴҗNvjy"" _kR,lu5`-R&i),\;=x vE$c>bBաף0vDdБV3_O/Fn~a 7M،5l4[l W?'䏡O4 |IQyì(e= ŗiJiRw_ ߡe -198g#")ݿ{s 2rݯA20i/*IĴx])߽Ztk2pൿˢ *锳t r2r Yٖ`7uj )Rg|y10Dμ>R'N36# Ơ aZ E&O.y ?y9lT {t7ɗlg8o*ǖZޒz)gyJs
EĆa N:jr$=_e.u
hz`ω"yMk}z_D-RgYg_>m K
c 2ZNg{Viq
ӎԮj9a`HWߪn//Kt>|K^ }݉iD" . ㉾cMW½F" ^$/DY:|yx4y;;YO{мv$ q&bV83RY}]ygv7Qe8yyuFT j)l*淭^P.
!E($I=ˆX$o[_}9 TTQwv ?=2$lZ%0t{@x .O2K~1;Z+ {8<gPeE ewjƵk[5zá4=:ܟFAy|WVYt!|.~*R!^e2nZq 5 Ε?~ 5">
1kzAK>v-/ x\h'i`} 앗Ŗx4XLcO+F"֩
bzL &t>DyDyؼ)Q1%:Ċ
t<42i mQ"wxz%!x´̝xU<O(Kht\U7PQׁLI ꥪ:|sF.OPSWƺv(%7Ϝظd{P b
W|
sݬ,BKǨWKm1Q{?XHHaz8@DsmTzn-fey@Khm *P-ϴo <Bi DI̮oג7p mKqNӒ#cI^L/Jh}p5
2Wc[q *uN
;j^mD/ A@EX nzu1KMhMfÈx驍❝ {[%cؐgۂ(x1:UŚ=|=4,H#gfclJ%M ]H83-qW~*Dc7s
9t\?}ҕjf 13B
Lʑ cT%ӿx ʷbTcLjX#" |MSe ri VRƯqF*~WjCb~N6{Xm҉sόKv4WvrIig_aV<jhǿ:YR;X<~C bMTvvD9ffmƆ<{<j7[%2^LQ u\ވB ث&*e5˖,KqnI6z7eǻI6:[$[իU,Q"+QH4 z33gڝ[q!9;3sqs8ѐZVuxn_E:Cح.ރvWྫ.["x[[;?{/0no'ų
W'!kD6$fpCQ"X!|ڝ4.ʃ[7G`up/td=v[ F}ni64q\}s^Ȳ4^xRnӹ ?Eqޝ940(_CAA(i$4-5;ָ>zr Z<xƼo{/w\K4J\\d2u? ) PBqx BBP0GU$@$@$@[ = nzC|7eoC.BY'NLOk@Fn+_sK~YR[ϋpx/ISV}8R -3钂GWn]ٸޛɞ-"O G΄Zm,KNlQC
RC1̺o-\6\-\$+,-nL47% Ck<Q{ D6Ο\cD¢9NrcCTFK6yK<<z9:mc%l؛e.[-^},d|<c ,%_rK >}>7
LI^6ƾ{>Jt~Iu[s1.ĩӍh˞kCoQqc0$8SR߇7fq[.[;} 'K}u^Bz[=* HAMG <)-Gvc v$xG
Gz o_pf'ҀHHH`Vp
y5cF=mΠgNO0 և64*2jy D 0V~b~<c*+d5 FK[:U$XhmgM*l8uܘ] [(.8Jؚle
E| 5yn/ J}LLТwZsg |%^<4_a bMa*y!K𭟜H͗Xz:(]bk ϟeoU^*Uz$ >w Af3un
މ\
yZ&:c6w nr3.p;H\ƃg5X^- m^V綣/ơ:7J':(Y-#b%e0Eq,\y)NƱ090 oW#[/7ÞV?+ DOvc- hnⷦT% &Z1 ݎיwRYZ b) Ess;V.1ܒE|(qƘm r1< ߽uӜن>4*q3TUCX햤˾#2z ^'ޑ8x[ŞKs% Iǩn}A;H6I?1 Q{D _^ ޔXd
k c54Wf\8 t{氼ֆ r kzOQy
k_a߬PUyn۫ulm1SX\ a@tUa,f;<dz\u?]oNSr5;Na"'nQ-RYg=>V>8ׁ+ɠxE wI.d S4" -~ό ofw4.q9iP} ZsbхvMVd] 3e 4 ^vlq <TO.ZkV|v|ٽ]lv$ZH)>v}GHv~3~n'
p^LDa؉TY7x jF#
wV }GM3;cعʺ `,X+a*mϝ1
l.,6CRSa] E!.Z}ڼ58(RC^f'SnƵ+QY(ֹe+q/d`Ϣv|מUpLBfu;V07w,Rb;}q۪t <sXWO_m,b >z/K9q|7p8|G4hK+9hGS UiT8x9GX9 s qK $x v\$k-kQLJh @|_¯[{3>H^cHHH&},{BᲳ18%8qC>%_s=.#)Ʌq-wdÒ|-B|Zdt2zL.gA &(+HJ%?/u뺘^y *K}cvLCsQb ␅DzM{dVk=l;yrڸn]fK?ZN⍟ AO Sw S*]6; ák7aCkS0B6uܓ jdnKk.PG !W}h^O:wdϡ~VnWb|+ܥX{ލ>ci}i1&u O_[O6 7mՂT?' {yLlgb ]wՂHbk8qz$竅4B> !1?9[ X e ߮H\/ء'9ߠD`z@HHH'0SonM&rnu
rZMQh@}Ԙ
d""_Zq6߳
2O$LO\pa5Nca4?oO_CYİe5 <#o~i mҀ-+1p?8hǥvg-f\= _Ur hmw<^%fO밥&f&#Aӷղ>}ZQYf?URDy_pY 9B7/SXJB`muԟ. n.v55nSwL pȳ <aky][Gݤr*,s㗈 xyz[syֳ;.ح\7wݭ¥
- cUWTg<T,(K{E46,XUvJT{o2_ g>IyոrWXW,v#w(Uei@r.O^;ٯ>TL @h/i$U&}ǘ]$WTtՙŦv\@[n4Յty#
\{e۷cgO @M ;<<ΨIֶ/-D!mgef-g V.DXՍl^\
wBkNMq"%nx:sOMr3pf-o}zډwma[[!w
t/Y>sNAF\*|,ᑃ'4 ǮCe̟t#Pj :h˳9M-^V:ҖuYBܴtP2PB tJR}|ss2w1c6`rz2([%?bD;7҄[?&uض)-rֺV֝r
"8~|~W?{7)C<{܇+#-'r|p8wﶾ { 1 sfn g5ؼڹtX DTZ$:oz}% 4t'sOGXs
45tnnj'f]w
U>ލ6aڛ DV[sFM
8[ pf:?q?x"_e
}OC~Jt7sQknFv8 )?><X KSʏٝX*G Džmն^8V D[<H+Dӱ jf;>stc
;k)@,_w kQn9(*%XYǿ0TiUy%.ݿkX6u!eUذ
G^:'E[7iَGLrdit}95'+ᐜ\<~r pN
0EȾrko
oҘ3@Y%J\fscW3&y Z"7_{_! =V]
민#=ʗ_;_k[pl,w҂\ۗ:Igߍ}5[_*jqy(,'ElO { Z7^Q ϟ"W ǥ}$S=I7]?'F_
4T-Jw)jV"̃ Gˑ=طv=6Yo^Y{e UqEÇ}ęBYwW x 8 W/Z)^ ۱.%?61KG x#˱cB|_DޣkFf~!ȷ,ı s]WY<ٹ]/8pN{[^%nێ%be.}%'D_;w|K?>KHHHH`z:dGn}RI8 破J{Z;xLT|`,gRb
:3"ZNc,,h֣393-n! P (>JY|,/l[ ['9 "ۿ3H u]*y0\,쳈m'.}9
TZjw:4WaMU:Z瑗}]nd)U~wxx -3JA ; ȇ"bOɏT iQF%WyޅVX|aQ<<Ό_ĵ;M@K' ,YkY\:8a?[;Y9Xqbx㘳ۦTn* wN_8\9{/#7\]cŋqN-6=_ !H\]"<-(n ˸hkP{ Vo[\VWn3W^}Vk vm/ω/ 9K6.Zۆưx9|%q/![u;(I kv/#<Ώ
bzm7ɏ|s(s?MՖh/=ݲ] X6>Kv^
ԏ]b'&v] Muov9=K*x £=E +wTܤJ{k?3vNԝuլ09[Jt O)לF8[7!m308nJB]Aɷ{]"f :83٣GzS ]\ 3ǿG_ޅCpŁk<*\bwO;Ϭm;1 櫸 3mÞ/Z-x'oGsH"FwV7 ^}ud.o+}Ͼ7ArWCxB÷<y:r >"k,ڏ::^{ >oVZېo]L&0Uz-:Fdsxp.Tv5Cￊ́-
p{qx7ᬄr̮8.wE8oz NnhJ-xΝk~o
Ծ ^0,'?|/(F`8 <w w<>8E \~0Gʟ?C<M38}F¡? ^;.?VcGڰ~G^ S\1OBv1N|\y z;~><J&x1'< L}n{Gn陰ֆw`'ȳl䱘LYh>2{05C];s &!q2(\s rsx ĉ""C `5ދp!NBBiX ^Yޞd
rEi,1`ΟD}l4tLKqb4ny@䞇+o{n9< 'Bmjp8 8xW?e}}ӻhV\"YlTF-)zAc/A"˷U++h?`jYc{>rs+6\P0e%jN/;;Q:m4T]s{CWs̎A5_V@yh{#NwKd ˱#4?=>nw1c QW {No> [aOOGw[#ε'ueG,n|ÓlB$PRۿC<q*Dɐ˺pؙ2 uxݔ&0w4 L1<Hq]МyVVEA rgT/=1 c$'xڊ;1F_6 ]Z
h4QE
8x5|5OXg 9mYm@nu3 &(8 g {"ce9yxÆlu)vsgmJsrv'89m8'?cΝ<scq6bh\a-&&w~ vZp(xQw$\]<#G%3 D/,)W8 LX
P[*Nd ڙD؍K
!ֿ c@.xuSc? )տ'fHHH`jYcfͩ>;ut$&{JI=w[w~'p\=.`ph9zWaING`5XL n `O(ZɲRg\3'4Yl<]KxfwÀ87W^{;n^Ox~U6m"izTbe
5$C=Ǖ" N@ r1͗b˾ߑlgb]T{JAkf=BYeC<,YWnpWIyfá;zfmW,CZ^ Vy\C:O@"`fp4j3*- >'cbQOcǠR{Z5~6╃cV/`>/S4;9*fx;N|N($hM$@$@$@qП5%x s
!-!U%zrDւ%jwY ~?/wq %Prsm*GB 9@` U&>Xx ܅ t1AtQ >\=Mw[ _ f}_|'5qs6 =5RgF HHHH` Dg97{ɑǂx|"l:"GzgE(.*@fV<L *:KM8x2U7m&@#_㙉= "PދP?e(*Gffߥ!5u} 8rwzs>xu?6`( _w(IMcv k#`#'PVɉr:ᙄ45E>/1S hPjLݑ LZv2a5>F7 < om y<-.lq$ ~"L)zOr",i2YA&&pS؞ܣIHHHHHHH*qDAjA;I)nOѓ $N@ 0qlI$@$@$@$@$@HIjظ?SXg&C@)y42M?OM/OSOpP|ꟀjW: W$@$@$@$@$@$@$@$@$0>܂T$^X| E|wCCF6';]<%J5 4bO4;v\
۬? ! L5K&WvI$@$@$@$@$@$,93y"
3g{cxdXP:}}AMz!v(! tJ (x&N?;qMHHHHHHHHp3U}%4~1:}q}R;wFƜDNH;5cֽp?!Тt2wlc;
ϸ $@@؉Sv/99v O`L+Oz-'HYYHOOKۤ U'=a䋻c%HiG$0δ!q<$@$@$@$@$@$0$W >fnecLGk@jtO< 9F# G) ɉ5\4,' ѐ t%߸>V Ĥpj@OOcҧ\X .5u4qq%wF$@$@$@$@$@$@$@$0DҢ"A
:qcXV=ݓHAhPq
:~QRٷ06ĐLIfoE$@$@$@$@$@$@$@$,qK u 7Ŧ7 w\Xz҃?DBai@ F[V#Oh!R; +W2i%qx]1O$@$@$@$@$@$@$@$0Iq\Ɓ= Y Pij {jxXfvP41H6t1
5=2 @->~$ﴉ7+oI^ss<Oq
HHHHHHHH@ jrÊ6rYD씔T"U~$-TU5· kJsx]Mo'xPͭ!̝[[ʍW`媕XXQf,# @hhlı aϞt i f}7 TC%: z,$ x34Z}B֘%J qםwbݺ oSᚳHHHHHHHHH`aQu5/Zo4>{yKHOϐiZ' bpd /n[u8!!NRoNY !~Bך9 B@ ۫dkנrB<c(zصn#'$Knj$!c;]
S16[-c248(b¹ L]JSZ4>A o^wL&#$d2;1[ӷ ?}zfHHHH`:4:8c# Qڞ+"%##& <ѳ**@Cbz-i|
!ֱ[Tdq# Nl?8~ w]wPw&$O'Hq5s.v @ IDAT^T2FCF QOȨoL#x0)nٲ+W&5 %0>@P 8
k.n''Y~b2Ws ncm>vJnn<qB;ЙM-P@fw0֯[g֔$@$@$@$0M$b} a# GtM$@$@$0!LM2<[-!FWW,k cnL6 {ګ"%sfL2훒 #68&3 (tV~`ҥ #7 |g1IHH`6PԬєcg-QGDQ\>ƫ2[n,({hhM-SZoم譖_*˛3?H ~lA.HHH
S0$ I!4?9"7r>b\՚jN%j Y}N^!zO[_NQdgg
9}#aa4]ˆ.(C5HݴK$x uwwҥK,qENL/8Νx&Xg- @]O#; EʭEp]UX<i} '4?Svk: <jFDXE\zKnTh6Tg >'!UqFΝSObݘ'q.䕙}hmF+gď*}^V/rbTOOf EEESkUߠ< uuu())
+㘀wf#[cNZ{wt u ÷ 7ͻ_"Y:ѱ pp<~\(cHHHf7_VP+cpPܳn
/x{'Yd #?{
<l/V DUz6DUJ0tOŇz->fP__oꉵ.*4fv3 >J,X0K<uyS ._7?cZZė9yb7w;>{ W>W~gr !C~߸qYK L[4#.y*|E"g#Q6c#t@|s^|%E@,B0~X *%Uf1*>H^YrJV˗K([ zJ=aUV_Q3o%|s; C~e4?>~VVŖ"
_ۦťv|>IHH`|doA֚c<cX(+oow%2Џ=?zZ~ GeXث?B [mjtd!v>8m
2jǥ L%uBGN]W|~qNh=~)'뽶0G^)vΓӹQ{߮]M7kä[ZZ [-O!O {ՉN9U[%z7774)qi'O_xJK|RB nt*,/M~1g=e,$ I #o.E= 7| 7 e卖 `qsE6eI43Ǹ:Ȃmѷsx ;ռ{0z)b1"˧=蛸ܗMyGW(nz[X
KMӽ3l '-
2>:ԇ:~?21{ (#" ;h[1`Dֹ Έ`-kL+[mvG`7Rh>mVn_W 5jgpk[{wAe^U/ d} "2Ds{w*fL1*~ը[ ! Skn7;8x3X839zɮwl^ׯnBds?¡kpeq\Z4 xm58 S*5шwѯ_7;_{ z߅Uː汘ǍQ Wgj *fkIiCm o*ԇߏkh.xvr*C= ,$>[D:AJ#k'P&\:K1~(Ky(_3~'Uelҏ Grl3LoS e˘gv+<ڻ7u+ި6EoJ^(-& YH +m1;G8z$ޭ0-<VF_}W ZkrO-=#[YZB̘},3f 'd'y5bUhOF]_>TD'zw@17p>}(N^Џ;ݻQ<nN03_3-zˋ)cns3gR-~ǰݗ.]ҥK=cgZVatAAN:1>}
+e60Ҭ^4ʽL|@R*c=B~mRI,[m 2kSOP~} \* 65
sʰoxmy)",_ ϹIK^o۽ƚAGS00l-
* e]Tl،w ea% ^EG22a5ٱɃ;sş1AtI 03sAmQbJT϶鸈>xZ `I<c'3U=dz\h+-3%(c_$@$@$@$0((M]z5bZ xy '\oO&KV|tq> @}PR( R $Ӻ*ӯ#*_E=VX$U|A 2ezU|M.kQ+~2fpoSe&>U))QIU.O囂 $@$@3~ 2e 6ݷo<O܃ 3Ӂ*߀-bzUo :GBb];jf ;;(3ϟ
=])ͯ <Q 97<6FZ߸5Ŏz||+kbao _=[z+އ< <7 ?xBq 4|o v.*
\[ʿx .%-;bS]kׁJfHHHH`0t$E_kP𭮂chk_&q%ch+jB@ocaOFSe wƾ&ѲG#'G>(ڗ.~#)GG?y,]]]3'L ,҇ (AmcK|q&?ۗf){TۻgͅJUǍHHf7ܪ[ C8nZ%dV`q<[PfbkGPiU_!ei3|}u-ŋTFT,_ڃ0pq*k߸_x >;[jZ}<eK6i -{4=gͦZcHIuP W>wmݹ=O WWP E< |QnģŖXu5|c_!L-Gglo {+~*j>=̐ !`\Zb\am{ v,Q)ƝA,Zڹ? ykbˍ47kw~\I'FR*< RN}vDoo/Νk| kPnWTu^w{ t
=1b{gC k|N@L %Z -[ME }~ j~{k8e!]zsIc{E} 7^k+Bg {lU7oOLV<߁{T@dc~T>xo7pmZ|wmY&K _} 2
_(,|t~ _ߦx|WO-à|#-5+tׯ_ݷR(o+r7~Z֢87
]ʏ oZC¾ և~7o1si~nYIa L$" М<zSlK-ci&*t0'gu7'oq܆eG>(~Wʧ=mXmLsVQ>n Cu<T@Kŧ|s# D@q|t\ڱkÁ c<+m^v,To
uã2c|J/`W~/TK_gm#;~ކEss rS> nx K;X } oWl_g~×vmw'8gJIGfz:e۾e Ldff"]6zo2hް6/BN_C Uf-e6~.RWocn Eq3mK#ϊQ1`= ۱C~d1vɼ(M>HHH`.oȵy2roFN{k{'h _$A X61lQ8{u?773mtlM$@$@^Jor2yøc30^\-c3"۷C|+=
&|WM~
mgxWғ6/}V^)NLv8Gv _<.177Uv~4 e
7x˔}f%n]sǛY[ z :k]5r^hLW-5o xcěz(vv#v9 u= ȯhn><thxaS8ܰ
WTI)
Y-=R&HHHH`Зwk} 2xf,3>$ WA;hWk&50!9n 6\t~>d3.3){ DLlI%J/_ ^ 6\0 ,tϲc+WO k|uH+ rqԵJ>Nu]ՖZYdQ3"+e^Y IŻQsz8z/IluXtix K-1[]7To_"xqi1o5nd'zn Ua>wȡ"FfЀl*яaoebvwU Q^fs^K*Q^Z,KD_O 7 A tW.jD7vzHbfN*cO--.]WOu_Ŋ
ކqݓ D >J*;;K}Vm++{|*~Q .ÉF!VPJ.lbhp+ = L~7F5ڼ i珛W/2z|t~֣6' R5$EqPm+ycwlGzy
J ~ibg_R㡐z'*K1Q)kvz ŅYmG oh~ۇ\{0$~T4e^^]lv:LmqGoi=ۛ'^n8 Go˷܁;ډs}^ڀ{ W@RXܤ/6Q gK[^'KgM40SSi|6p
ӱǓ]Z cfpu:|S 떗g<\2 %`2z`=튂u1}p,]u.[Ua2SF$@$@Y#-Z ll{;n;w^~dε!~ CGG K۫m۶. |n+Btja\!3oݼo#/ryAg}nvf<v'\}w<SMqoQcM||?~ۿܲ]f{ڽ/_<^{[3G$@$@$@Ӌ*4vu"^{w~5 &hӸޮҕ ">BWOr^(YG>
wLoFU02.o߫Ny/ˢ455 .Xk ˖- P}[ݺG0:oD ?f"dm7փ[ _YN$@$@Ӓ@l]xQ־]W!P*yc[*Y]cIgޭeح|M֮^5W_E Ɛ^49Gur]n:zCtHW3*/j1- Gδᦥ1viG,YPd,ş댟<z:RW}{ l[_'?[ #t9Ck
KNΤ("^{ݫ*ޗni /z`D Z_^^jo7 NTVad :"QC~;ȃb^q%/^6|oWPԲ#|2*:ֱk[ d,i4g1voOPX<o̦@@YAQY˗: wct 3E$@$@3@FY7uR@<58hr1PYf5_ 2B[<}j{T5w8 :jOHA <ՎU o[Y";di끛kg%Xۿ8vp0gjgڶF"̸2 CE^(oF@h-x:(f.BV.RkڌȲs$edJjKAN^ۊV-A^Sŵ<T-7 k&}!
=Nu}%sll ݱ6{ =]p}\Q̻7mDs#w߃]]5
~u(6W2mć|&k?>Z[[gZHhW?ʇ|&kRmG⧐)c n|(_'7 mLqT +r/`oy
S @?Z|{nѶ,Z^+}\##}X<vl߃^xvކZ1 |{vgZ>q2!ϑK:xҩϫuV<I %ȃ6q,m3V \~ ]}
_yNewiխc?Z^9}<^ / T$\88ɵy2r'ҟޗEBy7ܰfx;'>VNcWNZ{A`[EF t>c%<%e/%(4˔چy5*>ufeeBeHJJJ!3~6-V{JCR>}xgW7 A&33ͅ*įi{hhKLV|!}HH5B߱/H/k G hƼ,d-M湦'DlU~|P?~wX=.6~+p`GRڷM7nވB}^|o9;Fo JjϾ䠨l
W?6
>hݱs҆CV,=ų/\A_'|O]%yil>w/kBŚ%U:mIHH<-.TbV*Y6 ONuQ )^WeHҜ1uu߀vY?W?W6ɖ 0E_=Jf&+OaD|ETavj9~KH>jOJVB{i1&(mᖟ_ʨcCf5[{(PµclN$@$@3@يM"Өرɚ nx&{cm
7"P.uLidXf4[uC;L\ů?~j%>³c'qW +%m٧Gw4 L)ZEA~ ݿq a\ek| _gOm ~(.jH:06y/^o=H Q
6}ٰHHHfuTƖ<)iF ;Qjں{ t֥/ x o4X3͓*|)m픝+Y5#wߍ|\z'YCMo
sbyPe4ÔF<FvL,X`ލC,ީF|m Px"JKK)RPRo }~)!|.8e P)2qwm ^HHH`YH.X6W,
[GG&m^.Ҕkeծ`fܼJ:{ٍX_ <%z܌(} dfn?Dz^Jׯ wv * ~,6=/<0tWpύk% a97s?s*[! J+J3ܶ6?K:wݸnC%2<<SPTq4֚WJAr+^+??-]7^}%O9֟ 7^AU6}eHHHfuj\ Y;|ց(
tB)\ws
`^: ^:lXrNr#?~nDJC=M}(-\:"4ay,+\..LV---]\\,˜Y
K|j^C.,,4n5{"Sgȅ#8ٹy2]T|CC|↢Ųci} L~\A<{D};sj? o~bD_g 5j191"7śq5"7cleｌTd5H*5bpv1'o^!@HHHH`/ [t4y8%w{Zw.@x;0 [ݑEWi 9Ruh1`9Ѧ .'fGdxye+vN&$;'6[ lBLC
yJ\ C#94 er3i:JcdٰՉu`+%\WVVbyR!|+\ jS²jܔpߖ>N`a4]@%#Y +7cY҉ } %`_MXJ&I1r]Ngʺ܆(C"{9LةB:InAzf ݸb3{ HHH`
P^]n'BU S
y^WLrv !`; uf̌ 2HZr
#uSg$lJԎex24욜%P?XJ1 ~b- L<':̽, ۱`HHHH`0%##$۹D(m7 -:vn LO7aou287͒r
S$@$@$@$0] xE:=:<d;j
rFgxGgD E@i\h"d^7 t**crjat6oN[%B&L YVK_Ȃ,aJgȨ8 h
P
N\h"Xi8ğ]3It 3]ouf\ \WVs&f= t',-tT)ٸDIU@& F|b&Mjɑm zKMҘz!kǕKVN6kJokAF$@$@$@$@$`HHH`&P
WKڹDG#ClTcX Rj Lkfy;ᯗVٞIHHHHHHHHf St! 0mB!\9q 6;ǯ5s3N.zFY#$
p9F X AdhpZlڭ;k;_4!Z֯i`lVλ -՛_ٴXqG$@$@$@$@$@$@$@$@3VTTh]l-QU \o73
Zml>{| 1}twvJyNݔ{ D@4@%n̮荜ȓ +` p:1E*@P7ALۈ:8VyBx! a&sЄ3x)rbƛʝ4Lg ou-Du\0E$@$@$@$@$@$@$@$@$0C@Me9FpRvqtzm kMnvSBwXenԚ6`HHHHHHHHH`&tCN8Єc$)%fa E6ҿOE XYأԅ5:cHHHHHHHHH`A#aQڹHu33ottiL}zu%Zd4$@$@$@$@$@$@$@$@$@0? НXrhر1rA}lmK 5ŔGB{
'0gmxYV{s$%Rڡ^C r0 I=
LaL Rі03}8Q+MеnNHEv]g'*o"Zz熆!dgrgה N,m8808ebo9qԹ#j\[VXv# ^ļ ے L"+مn^ SYcEs0g ;})ӽ.L *Kď#Z[NAǻ__?GFobƥDT
a`pJ ގb+';oS$ u
( J L&#jݽ}t_xIFeEpnP]PY8ه+W"R )ɨv-2D9F}/u!Flhޖ +j ٦qPXbz<f[ qrEG X44S:nk܉a}s_NJCv*Tb>w^ MbJYL~܊,Uo2
AHW7 Җ /
SnbWV
RN [ r(KɜFoK5NN퀼FMTBif \16ʘdhWX'(fzNPo31:7)l #!]Xǚʔ5r#gv
v$@$@$@$@$@$@$@$@$#[]ͨMO@K@#atYr_] M{ǟۖGYi S9)w^kv Hy(OU-IHHHHHHHH`3:uJ]Tٿj*'dJ#t:'g7Nk s!~r{`z<lD ;-æL|R`}#HHHHHHHHLqW=ԏ)%, ~`1dzvHݘ l
P%LH9YoJN8^ tʥWS߸d,ibzVǟRy)w- ,Ȼ=+wS2 YL\z~).Ycg+_ 卬STNIy(vam O7ƻ 5sӛ!tp?a]n gu
{ٝR! 2XTeOk3AH: [Wro̎ oyD k'%x
wLC2@dnn$@$@$@$@$@$@$@$@$@ ^l8Xo {G42N7 [;e'|uFv6?3wRFõ . hK
Zz?Д$@$@$@$@$@$@$@$@$0m}pr;pA`bʉ*)T Sh*!Sब1[N
1O')HHHHHHHHH` \pzۘp4QC:FΙ݆X qQ,6ڻFI+;,9'`g.;2S`HHHHHHHHH`:NrF-srNJzsZLFq8:.\8=|8qg;OA[5.YP6} 檵[&.D[ 0=[bPe#rsL2^[+7&K&m%b0#zb% !mmvB&NI` szO y EPYYĎC% YC
CC~P̗2UY& ^ۭtslw;<s= # KI,oi㲔o/jmOF®v#[)h#J%xr
|B-& "h*#TIElJ! R<u;'6|ly
RGP 9
9Z˔ɈJm5Vr> -'? qW=ټ& fIHHHHHH l-Ph<Q `iF؈,b3,QY)NqgI諓'h|E )Xt(I ٰKvRS Zpӳx*jbyO|w9ꉎzNF:Ⱥ|HWX!k;N:99DJO6?֑ @iJ;4t FcSK{}ghP[5x,sd_u7܈U58ɇu.t3r" q:^q bl;6r ?(
q|}Mo6;Ct('d< - fu2푻]e,2;e'\EQ
5d $ %
)kWQ.S]s}Sj f*E}B1P{-ƃX93 G$@$@$@$@$@$@DTw}F)֗5*ʜcL1$m:V?`͝6N{^g:h#7wÂj,-} Un/
/4Ɉ'@y(=u9PBkiԵ;r~5wl =O-7 ~Q<Yƈ% #tA-^"&6
99'\ysFMuC > Ǚ@-=6@Λ3wwO+낅o;#uqٓ@rƱF`pp=۩/;4 M$@$@$@$@$@$@SڂTTox6w~bmFk=Cfjbw)m[LD*u5S^SéśuW{˾/Ҋ2-@Nn6Lin]-
轏WYC
;fz,.TGϥ| h`5ҮZ G8p`Nd&r m_+YBdf Mvm.0q/
jJW^()+@w:@hwV'V:.+P>78wRG~
>K`b\n[q ʹX_?::{a*,y˰es숊Wba Ʊ&McsU[nY9ru@>zs|ņ+PS/H]y
sn1lޞ: HHHHHHH`Rh P\,o# Љ̕=*pPYۡ˟]w"
b"SzA[Ѓ+u7~ X͕byr Us(݉mKJtwlXמ~=ɽ;*J뚚f9,M5u"tfyeUv/]
6Ů7_.،55}v`
Pw"XXC; n?o8 =(0[fQ\YgBHHRdZ!$Y21`Uvr۫^߾}?~kkU]Uvl0c[@#J4$ ODFdƐ88g qΎT Z0>=j5eB*U*B5"sV Dyi'PT,(`@
oOX(z.z+"!e
_p`n>!S\V#p#W9VqןKej )^H-vܯU9#p8 G#p8Jp fJg)L 4W2r.W[a]Tr馥]G "q.S<KvTĪ DX)%I/DÞ ) )L* .6[ T5W`!fwrz> {G *o+n:z[@C$|K4]NJgšF*TR k(B*;7
p(2_.^>U-x7B!aAQRiX@^yǑn{z䈔QL4@{pѯ G#p8 G#,@fl %B !YJXeVpS ÛKd{$Ш1@hlYM[j 07n^ٴB& y
/;K36mV;A~ݷ^>IAi 4lWy"M!2mܩc=Y4uJp(ݬnGѮQxt-vz㦧S|Z.}X'|CγRy ?m(YJ v+Ra ߺ3gD3 YŻplQSw =B_]ITNfA/, DOj Ž+KOun˷8NLztʟqrtCR6 (t
]mAj6 Rؼ^|
,s(yG#p8 G#pOn~f"D'7HicER'X2JX 6բqG0UMC$W Bхd+5+\D!|wޢ.ۇͤ1GP)qg:. XZoC$^J0_j u6ŋ bT (Ch5X_njx4uiZGTG 3ێ=1> S1A.|KUv A:7b`i b>xM(bY,^AM2sS2{:G<"JqQI`<[(K&@_\b_gaN;j¸8ϸp8 b @ IDAT G#p8 G PpȚn٩fiT
az
O Ԏ5͐.[hKh ҥCs7_YX.mJܵ]~R';M#ԌNٞޔ-oV);;Er)tʽn!.3}HLXw>Fz1M(fw\F\f*%j+=@G; F٭dŚ!qٻVQ^gT<#p8 G#p8IA@
&I)FŚ1tN74#v W2JK1 -巑ĒcDuxm.>'^oFᭉ[\ |YHl µ`{4PgNE#go\[0> |>ѼujK6Οn %T>h: ÷ j|YE`*7}8LY.]~ld d;; S= G#p8 G#XD3(BȉF}1,YFD;J QeUжĿC+i㞲QkVE/-f@2Ǐ) |%y_[XerY3ӖL2qSrX؊Xc i[䋏U:{ץ_>IVVN!$UpuU'+q%=j'eU=Z.g4<#p8 G#p8pX^c5D I٢95 BK_^ A{>ՠ=Tm` 1:RScGfHB0-{ܹdEG&cEX*w(T,_]^j!r) +'`+ BBώQծ^ UVZr+Sq,Z]l[G=8ox0G#p8 G#p@ u v։ NFɒG%
RxS FtJ>^M:]6s{ UTP ԍxi=%mN*ۻnWn
3fnH U(-\h'G iuz;fNL '9!m m ŋmv 5QRTh;>{9Oa b:=e/>zS9p8 G#p8 !m,.
Y(Ts^}g=-4 >6qy}7ܼu9p=֭SF%F-0D΅y%QV?|D=bCE+#BM6h'Sqg+6';MZ:.8c@ ʃ(?߆Dj 0?55H]P? a`hm^K-)+%ئt <k[$*][a]d'13" p8 G#p8 "BX"F qƩR NS6GhWocn9Z)e߳KJe,}Wq:c΄5
#r$,sh%)Ua$2+Qr=2U!Z[zly;Q_ ٫ %RA={<,vJź/Œ.vȓxp+[/6Z/=A(F| #92t8wǑz dQ( 5/@ >?"oZl
)4,ˡ>)Yc̐kg|y<G#p8 G#p⅀H/tܬu (z<*s+K,U~nS!lH,R(4̒R:sC
Pp!BȞYqe`CFS+(F0Ռ- Zv
wz1Q* z
Pk+Q/U 9Ҳ/# Uc_cߴ*3_)n
]R)_,95UFR6 N \kGwx iޘ 89d"AE\܆bHsʒD{q<ZzѮ(-GY xdz:V3_[ RR[NTΑp8 G#p8 G :g%b_^[N/h( !
!.W ;`Lt)b/ &|M!uXfCE-
6 E1=OO'Z/|n]>>#r%5 E 6Q֛$eXp=H.C ?:Ԭ [ޫg>CP&7_1OAvqRx4Rxٯ"X1_vմi슅v<O}7ҏ8Mw?Uk'
6T ";o!j^#w>Ͱa G#p8 G#XTb ۦpܚy0ila!oDmXDN+aF!<A>l
h1ή9}ݞc!47__|xCr ٛ%7s[LB |xNv #Q_&epľ g(dTynh9V<z_*qQ.E(]`lL.a+<a\<; :uɞC fr CO Tl݂4Qat
xWhQ&>k$#k /g0T4Ne]>5zty"x3yKAF0.v z _Kl_ G#p8 G#,X ۫t[% {Z}B}s$
W~_<=BK)؝8)v~~ Oa?ԏ#=ӏe§Do]L,.IvjQ\EZڪOF^H( yѶɖ0A䭣M kH={m]&;5֪p(Ac̤Gv`(b$ g삐:]aYWajjhl=9zLV XD={I,b}(` BX3. iҎ~+' ,a>qd\k1ws8 G#p8 G@F`,~w+Ϥ'9e^ n]:k.g&~5'!b %ҨaCK+ 3L RWSj.JQغG cJN Ɩ aMOdvxK
lЎWLd+e F+(z7
Q\U(EFg%}<V]V Ywr`J7b8(]JѦHT |3}ȥ6lŏɁAn!0h,B`>mI<le G#p8 G#XT!pjq%ݢDP ;-2s< I[~gs
gyꕌ@n+UlAA[OZL̺8&q:tEw_? MaL~bg (btܽXa8w G#p8 G#p2*3g.^ln 9#62*R4抌SB>'])]\khidI'llV߾3Ċ|<#p8 G#p8 #z6z3>i`KDSM]*3x*4B۠K ).!j~r fg4C#osx J8pb-BK!~l$Q:
r0 _\H9 G#p8 G#XzBM-K)㘃-ƨZn.B`а _ q"wjs.ș)H~lDjj
Udl$͢T ϔ#p8 G#p8 ش!YXzz 3́fnHxAXZiWf)$%1㳚, Γع9l~a O@BmO-ҧ.ω#X z1uKd G#p8 G#p@jj*֮M`U
n_`kƆś4Bp)<
giԒ+N%-{F63 (ƍ0>>KN14Vz+. o/ G#p8 G#p8 G`!0>1I֎ )v[۠}-9#we[ )|Q1 ˯g!ɡ}
{[){13IO_u05S Iݿv/@23]}@;e&N0r[3I#p8 G#p8 G#XLNNb6"&P$Q-įƚ $6"+1k%
K֟W⫄+XN)wT*Y
oRv? Q×c )[6nBxdtɈĕ
+ws8 G#p8 G#p8K:@#/f
?ymR$'蹐YK2s֔p8 G#p8 G#p;>ѦR4_ |N[vĤ,: 1nɔ !=ß.|.GST|^%@&jԀtĪݸΥX% &r&oUXxrF V˞sv y ,&1t{ґL:]>uUl m l lcV'Y3 j$2M$0 dT"wZZ'(ڇ| [um%bK*j[bQy7q #Z*RT w[po] )b[P1m%W">t3
-Afr{q(=O. z.4zW4Dʻ-"Vyb/I3ӏ"<
HKMw< uVbygVAMVf B zM3Ƕ Wc~nN.FG1KpSiN!Va~˜_CcX0PK݀J ,y)?z0 =KkBYX
<C%=]tg k uD㽎7O8:0
ۘ :0z ZZooL3
V%do #OHy<`IlYA(=kaknfC}]he2YnQ(gBOV> -e0?/
Jg9{Q %ВE!(c$wm7֥*
-&r-Uq*"_ C@k|)@r \(dgjny眨zʭډWdʝE(yc'Vbɝ|8&SyQT\wO&&^ɳgh*T#X^-^ "J:KF<$wjO")pԈNL»]/MG +>n ݨĶ6KHaueX ub`zyQvt~xr GT\=hUV.&i/
'w1]IZ[5= ,s<og<2q 9Bf!*wqI\.",}-LH\~YLAQPB-%nD=&Ym*}Gxux] WSZ)L<Zb;|V
E`vw"ʹm-"0>ڹjrKg?O\
062Ʌ6b<NǡG1Qn+=)U:(O╟sc4Yof 5 ϯALl!CywO5eI1kh)
O[q _}?P &fXˎCu)E~?-mՏD㽎/۪#cej ,R7D0"_%Gplt Z?Z~@<s2^D+טx,SXwT wp4n)<44D_|_byL]x3QMUcfj;&KLb0[s54aFqSįV<;Ӳ̊:aZP186_<qkWvEZOr*lc<~qV+P]wIܜOspܼ>BnWz
]m#"@ C[J8X)5Ƈ$2+8aʗ^{qW8*wqӓ3Cy)Li?vڅnJ}[)}*|u:DaY
˅Y
C@^V]I-xҺ86mų[KQ]&ÅeVt4~|%Ye7H1. /l[O^d0ڟ1 6<K"+Nx, B_%TUh5'Or{q2 eUrh YfxrѨV :53 6TtC$ln Oæ-krjJI]# ܩ8m3%
8>1^-m%z ~q :
OKPD.rE?y7ao_gC5jEe#< u6Ty ?GPcCfRp Jo6u.7qESv ߨeW.3C`vV;b*E*X (W3MzxK4E1r^xP^x GOGsc?K?qi]E/ɚpvFyPS[& ):z{;}b .k<<&Zsm%R$w<XkcB$g3r!kF-5/.Fv k⠢KxEhOliUd$]\t~)]RMJ.xfa|'WÚ4]ģ<3QY[9H[C )<Co&3^C$0LT<a_4N"}iDan6R .b[8a:>.Юt,r|0:<o_e96N;ထ<tH;{g'=v[Q܍YX&G11t -WZ2gcKz6C-!3? Ztmpn4r 6Cl0 uVSL@A1.d&['xft]Mյݚ;7>ށ2TlO71d>kNe2bO !U }Ѓ
eՕrG!1¡th*>k &謨+uv)a;~4`devsЏv([5{Q^'Y:D}A ATU4F'#s*n*+kACt3 _[֓qT'o$Z=iJ 'hC_Vt3gnx9lwD~<r 9[9K܌<ڥ砋a4:QhDgW ̝([;iyN>I᭴y?JMLݑ,c8'm)m5>=$"t㥋G8}Ӹw9?|-pn-Mls9zp2,@mMh5ĎLS|fhKxxo %eLPQtaF|3r~79:a@ݸyl72@<^^zgC>Eй7T6`r<a$ Qܮ{v۹VM[L)5=+qIE%D,2l @;W6jc)4~i\Asy1]5Ex.hb>*ۃPFd46PWGrOUO~˺C iipn@PyH f1i=?_ 8$P*[qC:Љ)_H_Bܶ K;A'RvDHp'Raaz:)"tGoݤ4蠬R2SThiLjC@;pqn$j ՛dw\<. EsUmbX|=_z vKeͥq`_Jhcf'e&ki]*1#⡕ Z^H-o`ݴ R˵ʠַ O߳
w]Y y 4;dض=gϝgQM ~{Z Ⱦz'{(- RGүcՓq4:fEـ%@7
.tݏs/x )u|v ys Nۥ }1K@mk agfĠ&05^\Jw%4ɗ4g Mz9O;)D}]4|9'e2 }g,T
J鬙/ژg5+~t>ߔxyi4nn/VuhVέ $̷UR +p>}}[ VyuIf\elyV T1'S o4m}Yϳx}Ö NB>v F?ttmXCuܑ>-.OXL{vyOxLR14Fq, ɋ濜<[}oIҼ#4r[ r) lux L4Rv)\ ٓv4+G1@b]r`[eǾU5@tn!M'j4^l| G.:i߁=O 1iPvsdHGl, FSvOa S_x[j~b&u%MIh1MiE*WÞHZ,1~Gꂿ}b_C
1m:k߱q/-bvJ(_"Wj@0J WǍna0֝
{bSa
jI|8T.MĖ;$qN'&Vz?zY+\SnaZ}F*8e {wD-m.*Õ=2Y-ioSxױ9m$hÊx1fxFЋ/*鸤3:ιkwns1.p.qż8sPVRH8~6ӗJ
uɛr=6'ىؔ)Ldž KG^47~ 9ZF!Q[ ܚ(*Nk~Ԙgc{6Bh /7?4)~&f:}7^rd|{vVtZWuDBZGS ڵª m8F,^Љ+ZDVq?y{0kD:xyr2¼c>pqLucԣ}̪wKr6Zy,V\3ptHx O+{os RǸY z]ޗl-Y'C7o=
Vڡa 0YM[ R6X /O|;ǥL: ]jX[Ff+
<TѧM!if^%|{32d@+V}mj :VC:c{I<T}zWeU{^ ,̳{wjv|P ص
Tr`z{phw{db-V_wglڨ' m)L:߹g9ܵu:!i c\M62xg$: Enzt^p3ԍȲvR0WK8I+0(dny%9##}Mu4{XݮmTGFz!e(O(PiG.<k1mrȌɤvȤ -}>,^}3}#^S}q {H߀<{[;٢)Rl#%ҽVe1
ԕjuݯSO,<N,W[:VV8ݹ zEt _mAdP&-9( t|Sq|ڷgч3XQzԧXt> hY2^ӫOX
R ;j哯bI&vЗс{]7;ѥmaLoq4w'^OZ\O J9s3 ]?w;bKqTbF/>>_cdm*g0dyGu eHt`r/Sh";2*dc U} +>;%$rsuA|ϳ7l.BeURW(U$?CM $tq#Cx$u]d(-·-× gy42t'-E1L>0J|I1"f_Ģ?Y3])Ev
QA1$VQv i"ۋA\9hs[a dۓPI"J(Z/'MD} =ݤr-(-ӳIkq sS?% nWxs#( *X@vlSI(q:<Z;?o _&! w6ᜬ \'3@3p
K7e)W)@S )!Qu ;~7kw?bwV]C.ͩPT[[#gzi ,-V3+tINցfNz}e}{1ru6NmB!.o3ooR'(
W(%{%Eyo^I(Nz16Xjy DI{n@sٯ_O893eQك^1tzys\/-qUt _7l~g:A5E?MnhR;ywӧosMt Mud͠1e<6`>z|2m.?K4 = VFh S
tCSl R{͟}lϖh^08 SgV.rOKDs %G8uU {7 }Dq<0@^'EXD)7wA<cр}#ä1Rԧ; F2
.O.Rh~Νa5ˋY݈X''\iP@!~晕 /O,h%4-R9
eK2҂H}s@Nь=S[.)nw)Nq<.pQv+YJ}
`iLvw!O
s 89ӹ%/WM3IFdMrOk/+\ j-[% eR숫A#ԌNͤΦlew!] V.+K +0ՉkeUyL{L Ln7V嶕OOqq\wq:Nm0^hn9}]=8'M-Obt\
ݻ*DU ]0-R_ǻ4\@ r3Y[:g\B] ,W<ܶrxЁCd*L1 .z?A$R
Wz
2YV2JZow?#~1r̠Q 5\u8'۷_[: *[ዾm8a;4? 1a<x; hg&ؘm k]8X/
5ebv<q5ߌ?^x0_d<UuD8Oy 7=?tK\Ɠ$
XX5[6{'/2sm`&ݒt$
ƅX ]s;L1@+x٫\*i>i`NbegB ]}VkeNWޠCCwu\e$h||4PgNńR x;; cFM] ?bW(/
4beM#g=<>/6' &v3kSa&iɷ AЏ!{/,qc^n{O~T2wŷy:ܶ{cS? an26ndf'
(~=
w|kꋖ{/nBu<ǹ;-WkrKo7}qNOoKh<ד9}z CnebH@;?JEV{n;jB7
^#sFצ+CSf~P +N^V&Xpyd&*Gt~!M
->MvOߊ2vn*P}RR }ya w - ^]sWq@ě+v+d4.{gDI0a[U= }y IftK>}} y//;M㇇VcK yr 9w7ŮqsQww;O霏_ dzevK< [8)A[q!u^=}]Fɞ=]μ '3'䧘y1%E. E
V.dO5Goi k<֬(MJ& xq FIbDƺ~ڋ7K@ mӲ 9m';IaS.
!lN䴊+nwdB|=3ӑ =&
*hҬM<#w]I.V0W'gU{at.UpudvUKfrǢ䘟+U<O<xqL#*f}h Jː{Lmd S{]N^=ĵn-" "k*2-nV Ko n<U <O;O1l(E)0w~_~CHmz]d[9ckZvYMv݊!lJzQ&\rssAI?ɭ*g̺յbS/P$!WL9xç=kj l95eq p݂*:JO3dׅ݅ GK
j3r6)C2;>b˫əM}y-_7ㅇzFn=95zgӘWhRcY:\/:N[E#1G!( &C7Gė=tV.46G2{zOZr2|cŊgXq'G@AB X4xￋ/7{H *iwԡ `t2Ř#v|5{A+J>dC=6_)إ#PwQOdTQ|{ƱuG&0{d&/ (|<wntxGY1V Irʪ
ENc:::8Jh)PdvzrpX`bЧ7Ν3;)_7bчe۸+E \1/ ViyfuqO| Ĝ/?He[=>Z7Xz
Ȭ!s=xCyg
5-$ "!7RYl'./5ӮY 9sOh`~0ܜHIp[>< }Kֲr2N{7 ݷ?F{1Lɦ|tb9[d61C}ʑ\cXA'M4ハZw:VES3y^u<`ErN%D㟄y| Kfd焬;VɊוe\ -[i27/:~^KKY zNsʃ.Ih +e'Z GU*Xg˥6s ? URP ,tέ
PGn?#RUvnk
np4̹ {Y ü;s2,g,3.F ? ZTYP fLQ37m$1vO>^)-IgfF
Bzp.mx%'ttÝx،\n{؈B{#R{=
3-8 hlZQ!~ӑmrgJA$֓Ae
P J[:^{ ܶj1^ROh {xO<֘l(ƶig`|J}nβZ
ߔIc0fئl'_Gfm ӧ-dZMpI}%l֛[22ZIwDѼ%i%{nGV_zvV NyQfB'L (̃fg QnLv~h<y 类븱&Pc<IH.@{bn)#
M hC~DMGlCK|ǙYj+Ŋ{_bkQZo +ڥFľMsˆ ڎ>k1 =mM8I| &ҵivO 浴lLVZĨxU6o/E xguSXiƨvbIa8H_
HLz[,pRd¹0O۵"Xn7uAA HOV8ٽExRJד) ej
uV~ #<(@a9q ]AyP|mKhmO'Eo_ &ZdDv6Nm.NH/Yxb8RMݯ_OR$s&ҫ1: 'ty ܶr|cH:`d:7!Ye8
h˫6u*AƲ mv]}n]{- [K聴4mZ=JvCI?xD}7kZ&Ƕʭ_t:wޡ%{&䵭ajكwrDeD# f e27c1n{vNJ<>8'y0 $k >wqci#Qxuy;D2vQ6."\[9KUEwh@"8JL?fBNMMӟLiOe5~^<_hRuM(Vq WP!O2ym92J\0,PW!ۭt.C Z` }*,)H
q#r:ȒL~Qk^@ĮC(۴,<bq>Ra J-N5kXV ˍڢАW66hy+ >sd>?^795O%u?С %R[^8ڒ<yN-JfN&#tii.64}8t72
YGG; ߋ'RjGv$%NF#2 jZM" Er:Nہon6ڀB{;?UȌ*,]ד" O?
; ny ܶ;y1j[=ۗp5̗tC#!:vE]-Z[>վ"~v663:tw Jd(f wvjov GRI?يR/e[cVR7TeVJ\ _B<OJw`zB>~N szU2 jM<qN^q,{q z=h-]b
jp`r=aat @ IDATʢkC@w{O-xa<w4wtD{q&&\ƍc` IE\Ys 8"i3YTe%F*JgRH=RP?DesSiq#?9J4J)rH,RRi㐹!2hi ?
j<W}enR(ok>hÝ~ecw~,zl qseA-zl.*ՔcSXж߾S8U 9nLߴ[7
2/IR NAyo "kMcm6I z 4 $iJbݶ&4WVN^W iٗp7VjwUrF/ii/϶ xdz:XzQ""Ccg5]CA_٥8(lIfn,GۅpRQ.wd˵QZV}'W;Lgd"{c." =ۑ wRm$R: ܶ8Pso "ۿį?i6xp3u@c; V)_ǻ̀? <z}[:3A)8ݹ -`xmbl<tW͑7J<<>zICeg #fJ
w4 Ga9Ùt(ދx^l)WwӭWa'=C-szBnq
;}6Վf[:'UeZRGC|t%~<9+DC&/^۟{<z~mڏ}Fq
хjۭB)Os[OsX:' n1+y^(=7Kh]2֑9,Z3S`릢Ωo X].F<q v<)RzErHD \4%n^ǍdBK DۥzN;- DE4Pր~# |w
7{6XVWUa6ԽSPԝ;(nwͨs/6LnuQ-itЀ *`Q%R{GrEc
Z͚"$Z\j8Ч-Y2硺^Eƶ^<v9[H
-$VXsBtgRܼ9+`N3ʕBTXP >G@^h։zeו3&pbu| WHG~DAA+:o7;U.J Z(Q82p;>9m|ImtUzL\*
%b^^dAVQ);Ʈ㵛>g>CP&+Faik,k cb Q]%v1'!~OG(<) r зȲi㆞QN4-Ԓ8.IMr9H/KZbeE88ow~#zybGzC/hb?αUl wϓdt畞HMxx߉3BpP3rn#ji!z(tjd"M[{h FI;-6J8ǽ?o{'~}G0U7e;_D5*9txq@J=ׄXx{㱎2{j]6փ4 ֤Zy r* Qb'q_/x} [ƝMMmRx-KTnYR*wy 7\X }~x Otu}gEN_$ov_q5 ?# /0Y2at#-3Ku32M/HMՌL(e9) R,]7Jpm-0{
wj<IY~\<oYsT#ZT~A
`>7htXbqvB+dڅJv
I}T<Մ?c.K5 {
y.}j1^ a \gٛĴM8}>^
n{j7m8pVgdDv~q1@4I m.|BAT JY%&nwB,5@LR=<ڱœNw`v+^.vr刎"{b^ !˟}AJ nہ6E3L2mEIgJ>t w"G;K]O0s!m=F)$s&@݃^;/iE1Ů?x ܴ;y籍zzKim?g
+QW2ͬ%IJSX>&C8p\E);{JkE0NJNm ٗܝ7CKR.anD4ngI〝Zlz뿘쮣
Yk)C=p=ˈǢAf ⭾<J垿@"<>6^$|Կc[}J\i ~ {<. jMmGblcX]d{ wZo %h]
GЌiX W)f&67":@ yRB<~<
Oԏ#N&35.L}>,و,#7C EQۏc）Jm;;l #P D ZXC9q+%0Ycyݓ,ș` +H]x-dr,fșS@v3x\ 8>}Rghz5&S)n;n7bY rDLfR#un"Fc -SR{eם@mT_aYW=ã12{aS⤖ۦL 2%ׁEv7-al?"qJ/v#ɮéVxzzuzfH6kMJſ 켂焵O-I `8'cݹ c#nnC Q,uKdgd -u
Rmbj4\+& }mT
9dh H`OZ{m<D&X6myüJ@fZZ"rrD2 ʽ/NN:ǟ`
9fn壇auƞ{I@$2~螳$D?O<wDcyy: (cO>Om~%ɢ'BumI2n4H 19]d6|#}߭ >E{ ߇u plZ6|M7uO$Xq_Rd
[\7Kc& f[d"2cy>:<WN\eۄM1 ~#j;KK&)?~_nhY!oxx[ه7uy8X}yJ0 F\_)0;"Ϲf$BZD}?'hGkhАpo䁉Jk5 ĉwRMf]᱁E6= m}r[*yI("GLaIrs?N;};aF<kk sUSQ}m3tKg;!qNSS9ya1nHP[Gs{y
fwZiB0+)$rMϮ|)2s@z\_qu^6o"dh >gnpFy: 3 ,=.T3Oc'-(8#ZσlDN07#`ed2Q0QxSl ~@и} }y}xHOѧiYTį \y2 G@V^ @gp[QC1CA
xQs~woi*WR[/ݍv.#d%)%,6|<YXZq_ZRL {NjD)[d Ȉz2r}BW:w?+6/ Fes8zgoD~@悮5u Upa^C>3͐f!CSި_ĉ{9++NcGXr6>o_ƕE,1x*dًÕ㉪¦Q>+f!2֖_
o;56k9TK56C }`!do,R` GtH ʱِX8,_>`.{ ?0Oz.!nǰi[[: p
o&I+ '
jG`#Ǔ_
NYRYZ&+3\[ğN~_ε?[n;JjtxhxdlDsC+ c rؘ:2V0Z;]ژ^hq"gn
VS_ {Ks
p8 G`"+jy8IG'I\p xK6%b$?)F>3UrZ2|ZkNJ;RKĉy"">Z5W3JV= uh% wsBm~$qp8 G#>ow pĈs&Wfi
t&Mp8 G#p8 G#p8^H1ܽ/ :sp8 G#p8 G#p86n =I(5;e
p8 G#p8 G#$(Y˲6)K6mq8 G#p8 G#p8++\5˵ڵA&L9 t cܺp ȇp8 G#p8 G## INUr
sI
I/qT."y`jj #ZB*o;O-7lQe 9Al
0P3V@-s8 G#p8 G#pn7q 8(.?*_<`=}wv{\nGRQÔ0)kY]SH/ G#p8 G#p8 !x WsǯfNlx //^9~Xgh\eZ`i L[x" G#jkp8 G#p8@ vx/ɻ .v#M@#e5c l/3*zo3-8i\&0Q2B&-Q͑7X r/#XjV,/G#p8 G#8BT@Hp$TON
\YRw"C*^꾋-':X;3+D JEW+fy8 G#p8 VHLλ\G&V{pb~:CE9MmH
Q ۉ YNOfgXIuIa㙨y% bj>n~ф JsDPPln]Ŷ0tL4w̏tXhZWYӴ.t@8(4O<817FY
Wm?{蟟'=v[Q܍YX&+-b)Cm~6dWC7C-"T$~hiӵGUy}UAm·4E%`ƭV}4"W {@]T}] w ]{ۭyS e,ف<=Qߘ_ <Dg
{Sʪ>ˆ2ZnrX 8iu~-ً<=b$ԉ&jx⥪r䬧1+?Wq7KDEm."uKM4.+-/p8 G#p8 {VZz#5OnoobK\f iXKU56 IF*It?*4|S\`B4T5 g'OjC+|ZOWɦ<Tnť n?B Sv%vÿJ7(}[y奝@Q1$e?)75oaaz:)F%|awEr<_]sWeEϡ`M`{=ە1 k1s
wF
EM\ an.q 酇#W9U!c]~ v [{o/mN7
(ҬIm!PuGk6>=&PKity-7ॾ.mzZ/<n+73_uesXSӈ7k_H5TmۃxInh9nzח3f{w/%9kgW<8=G#p8 G#fZl"B5t
>9xq\o |ɮC {tp1 l0Qvd~;~ l)NG_Wv ʦ_6x V ŧ M;
A*UƲ#PՈ7u) 1:%%o6T* ˴b2*WÞ*T1 ꂿ}1;<BoQnc߱qh(o-bv1(.@
_ 7*鋇ZwzΒO{UvO7%O^Cb˥ ey4y̦sݶ_ F*Zı G( %W' e=KlPו tp8 G#p<# n͡g)TڼV~rU-n"wxېilC lj:RTYj<) >zKI}hAvEa2~h潖Kv Vgd@/Z`
]mAj6 RwHglas:AՇ ,&
Ž;bFhڊ;p;TK&`vBÁꈝ I7n^ټB& y
/;36mN~ݖoQq$e+Ɖ#tCrn7e1փϟE沊pzt^/
[.GK 8@
N~ 5&Tr @& 6o]3MV. c?r]GOpX 'gmlo[>,^f2F*!*"mpTם I d$Y dY` `C N&9IUJNL[Su^[uOթS5N݇7ys_d^LUqRN! IX +2 z~䮽w[Rmw~Zk>kR掠djLS.B㠶Y6W/|;I3R,ɻ \ϟ+O#8D @ @
XU((WݦZj'&eo`bHg+
8sg|`tdP] YI7k\\^AT=M;>lxIw U4y>P?;z2^ikӗArblT˓j ԉ7 dϙ?!}_Wcwއ- ;n#8yL NQ~=0/< ҮFӮ ]#vP|zf.|nzO7
Rpܴ<3~̗ N][ݧ7AԤO7 n7GG]W{ƅ~qkKJ\Nei_|<
Oz@dӺu7;Oe{9'km&_)MNБq֩jޞvꕗb,U#-|6)Ӟ&kK2? O~.˟+oK8F @ @ (-Yk˔ő'hJ>z=]uq$)ý+>18M} XqU7Ay:i≓ $_ L VTTҒYwϛLњwI&b2C!ͬo`^'g'yIeBNic`s.ة & x{/'UO۩G<o.x56Twhy7Fnjd;K lO3v[}_VԜeE)⽜*닕 pܬ*?# =RW%+R.1T㮼-l[$ݛxI|ŋW4dZe%Wړٯ'eM;_lFpݱfi wћvc[`sBVnK.jQnb SCl/lGW
` Xv [ʛ^k\S58dʛ,s-raOMMmv5\ZnCe~36ބ\ҥ>3vs4}imm}v-(|uo9T
Xdw`l*+`jPMUkjohjSKc+TjW_' 2njU]Ǖ7_32 )sWVd OU?Ҹ|kK;nd] _iOrgD8ϯ?FןU#7n&\I85HE]BivZ襮^W n J6[?@ @ @ ;!0csfN~v3୳Ovm|}k[xK4[O' y|786#I&46>n~YlےGXWOT 9hw51aEޜmP7ZoݪgNQu qu`{o0nB&n'<rs8禧2xRzIW{
mR {zz lܤ=9 'G9$H5^L1|ַsh_+X}f
ڞTMlzK|n0q0k_@gbR}. 1dB @ @ 9|K3˳4&l .GO;Vtsl=,vn'Xx/"ZaTxϰ8tn[4/?5_pEn CKvn_?4/$Ko7^ERx:v
L\^'vhU}f|?Hfx0*ͼ-y6Y x ]lsK`ؙu,Bڤ'KT7aVg>n|eGWxs%$C'.R~Ua瀞efXwKkj]#_g趡 ^F;5 |;og=62<@ @ @ V x+ҙ|; ھO-ҧK)b >кO{ ݣm5wVmWN)}X0罎hJIS5A /bϺо}gIЎ+?;<Uj8QnOLk2ɼcC>/hYc Z_km^nw(v_ܞ%r3~|L s+(ԖƆ0)ޓl?O]3 p x'omO?=Ϟd<ÞΓz#8.}~cMb2{Z1J f
\ƇjGY4vPg!ms''&X|HC[isдMܥfVk8 ։=n+gOsV]C 76uA}]Wzzm~I395"Bk-s?ﻙɠGiK۴)~/_}KZI Vnڽtݭ
ZsUՈz21"O^XW\fAd
ʜ^Hh.mǟЗ<ԾpRV88{;1Odn?شC
fm2pB/gzE^7＠'uL)ج] U;8I}ʴ3j^_`4;+: b_*h x7
ݥ~7O
;{<_
.R*u1祕</E5ݼ 7ccWRVêז}k{
TXʚf-zϐeऽ 3bD zA}DgV.3ߐK+i/</!E> ,6jw
oq{d۵R `B~.͟Pq &@h]zTTR,YV} r=z`ڣ˗{t%rMU.=Fz{.iɧ_%^Ġz=1?3t)VѪ:Ifkq w.h`_C<0wUQ{N7&m':kMw&tǞ]гmus*OUMjUjzn4P ޯnͩgDS t\8S;vihیGqŇ:5 ngoSK24۞~V/Tרag1SJEd8>E8z?VsmLe봩hެ^֑Ssf`U5?]>K}i**7QzN8du :~xBl?zs &U
pgzXcu/z)7$Y?S' %SIv~k{۱0{etKW ,vգz;ޓ4vlxC_O룏 loٮ9Sfbn"V~g=*ȽePk[^ףvtGd %j]zow ѻG;lmv_DN:KX֝~ϜS/}oeZrJ>yw*/:3}OiG쾻?[Ui7u9V& 8d~ ѣA߸qd*v[ͼIyt)?ǯ%ÒύR_/G/{p?{Aсsm~3Ζ}A @ @ bIHQ ?~+x CuI/ze`荫x?-|~~lu??'uDeG߾`
iZS֔6;;~tK7EN}Ҵ,W,ҭ5~'z䜙V ?_ ~^%S ^1
L9iSdVm:4Q^czO;[|G;hYN :q{aGݿ
u 5}ҕ$>ND^05ZR;+uDyY&6f֘;uȋz'O2>ށffl eˌlۓ K^1 yq|WNygݛϭ{9vmA!Y^HyBKe?WNU# p
ڳۊMնw'CC7Ufϛǒәf9MLLӭ~}uja4Z 6n]IY+U^d
UzZWz&ƪ]yE i T]Sj̚ fu]켴PLyADW~zDS]rZT8?Յ٫ͺe7k{mզ7$)3i^+깞ܠg<n͒t}m2]VK;O~uK
x0s; :4pI ɞܪ%5>>YH?Nr-vg_:9oO&f|)A3-Us\Zef?Wu@ @ X1f/-Uy׳Ok֬j *k_lw )[=. ESɜRcy$f{}+>Or N{68UyVיGc~oyӃI 7'ZkA
k8tIVޅ/Ltҙ{ /St4lHD }uNd:=$i(|g\S$Lr6ζL sޞt۽XL̽? {tKռl>VYYK # Rx
y=<M ~x.w]~0/5KaW=G>Φ /| P=@ @ @ @ XE_D-?X?Pob| pG*+UVVnVy7{Hu:ܽPw=vWi9vk6<@y&05g&^ΙܥYƚ˚|a<8s͡a394'
έgMkf͒esP
4/%Һ ѹO3R2 @
LPP [K7ٽTZJ 훱:xJ*m:y4422kovPО MA:U7dlWeE
̋!z&;ӡn5C @ @ @ })O3`r<lBG'|{_B%vk {@|qQM&&'X;S?K;h.ܹ$[/,).0(/+g_Bfw*4_(xZׄ?==i3{=l
ϵH^H@ @ @ @ W`rrJFuފvC))Ğ;0sZ;mo
TN1 ;[*msgNִNmMлnFYuf7F7k
%cVfM[Yv< @& ŀ6שjnm+JUf|5=11`w+ɭYVyg 2x V{jjZE**,ҤY*Z
vϚn\n&
B[#Tz[˱ey/B:j" YAok6kIl=>1a Ao A'P@ @ @ @ F%rr^m;W@ ?jKp&tcYM <S@ @ @ Ho[vjM^s:i@:9u{eVMVagXSfw۽;9ύ# p
ܧZ3j-Ic.:ћ^ХnO{??>h+-qg{&φ {Wi odzo ޛV0&jsaZei# ,}:~;:~iDŖF^JJ֪r}66hKF~9VПz_z.WB_Tpmqe Kը $6 cߛ<ea}#*mF_|AvGǷ^ :tO4 L
jfx :Z?:=Ewdq݊_qʴc#zZ577qMkv: {$$G+Ȕa[o^O'=XJPÆ
HNx|钼2}\SiޮG>~QzrGj*KLxyY/
_9+:/ga+V; VmE}>7g Xrn6TkMI]?\v]>Y{6WhSuiguܘ /:|ܸ٫c_sU*vbIΝͤUQ`e%:{:3?bIoev5o'٘䨆oPOSy
}ѣ'}ТG *sôewJSOzhn~ ˾5_fl'`m%Ϲ1 }':{QnpG:Ҥo,mlCnTEc&^0dPm}Jm5nQSv٪GЉޙ Zӗ>6'K_NDZQU}TĖִU;Z ۯJힶ;l19bm-j-56)ZaOO6>9kag=vsYGUʷǚR$hnїvm;NT lS~=\V@hϼ|`&{C:Ic:10_xZ>ἴ5v8TzK&~ /)]gjtWWG7:<o 3nƭܠ78Iơ2(~?g4>/ǼU8ة~GM/ 2$a}5wL;fx4wsk' p
ܷ/̬Gt'K6l XCWj`pؓ'噭j /h/~L3klm0(iГO?
{'#9U`evcu;`"W54 M`11SPk{43k'3: f{hJ(.3<F<z ;y)bfem_j]d6|!1m`%GϬ|?wMZU7^IW?ow3 /R3KTfm[z)!r.ĘYt,؝xsN@ @ @ @`w~LZ'o^nRf_}C UN#K/>d~\ v5ڹ,Y?ԟ?S~i&)N% K0שn|9L|tM>wS{otoԠafv7NA7`FlvYa> xzׂniM }_u7I 7Lv ՚o g`7Gz6Sb) 7zcG {['cciaf:3w ޯ3y˕I3KpܵCz̗|c/ו f_s ꭷyʛo?:"-ڽzN%Lc^Iy1_x\7`ct)6^3hŭ
mkj EΌ%ϹiRmm4_-Iwf,XZǗ@ @ @ @07n͙+yfo|`tdP] YI7k\\^. ަ l<ꤌ;O<Yn} =/紵)\BI[1XV5SfiO Rï1@лnwӝ`u<kw(Pk y\MiWTiiW @ IDATݮ;(>=3O>7=fvn)
8nZܡ-ΣuUWK>_)-fu wn %wm_Ro[űE.)q9-}4x. 2>?}wtjr-z{LL?ow5AZ;[/ &md]sE ܼ9fuU ;1ޒ?R]CziRD):?ekyK$I%@ @ @ K9nsAr7f~
N^|n']r~֮zϽ`P_'<" 7;I4vu#752O
ce׃?5~Y+0IL~mUgY u㗢SvY_r턌w6ޭOέ}g<YK$P+r2g$;gy="
z- R6;2>,Ս6AqK>-gjsRD'ݥX'iZ." @XD)u ڞvE:>xYLM;7"3#ڹf6mlrdimm}v-(|uo9T
Xd%ҟ1[J7ߟ}|%jS3KdY64֩BAyfY;ɨHqS<\!2`1uXZǝ}Vԛ OU?Ҹ_Τd{5$Z&o$UP,$/LksvVrYr6xsD-˙\ >鎷T%sk),Sqn2 @HGXCR3S 3
V砙k
YĄysAh͏皴v;G1l
f j=:rMOjOq |M[j`j.`&]1O_yƯSSo=3yRbOshY3b7g)t hZd>UYd
6vmK:Y!Mf9KbfiˎE>鎷T%skkjs @"w_~Ѡy1Yz;eHjCFyMhfK?ŽkGȜ5 hG80^'C`w2 xrUooz\~ga]4EШ6C<.MUwmFY"ܳysy.Cgb|̋S?0w23+e,z~V+q;bfoسjꫫTY-n<nY}̬m-:Sq
L̗i/ҏَ7g{h$Z/] y<E＝NI@ @ @ @`9Vd[1Vmi(%O@ȹl;N}`4Gh[M,]Uիd7yzǾYyp{z"罎IS5A /bϺо}gIЎ+?b[u:ǁ)?q3OSWZ' vg
rN/I2t ҶV _zQ_:~3Sȍ?>LKne_Py`ߕطTVTkފz{z<tƛ<UPZ-~åφuz?BY @ @ @ ==ԪUsgoxğ=_u}BTpU w=ɂ%ָ^}>KY$19szo7<XFɼnV7]<h6>U;⧱z= Ek< P-|`Ndkڦ
U n՚5/ 4 zVJϪ %[-:w[\z ڐuufɊdY,glS sZܷ=ygny2x6i.r0WҪERgs+-[z|XFqhݷ':܉\Y;*ic{F/eT. [\7OѾl?f&F5^~ȀF}5@ @ @xo5=YfGFFI35ʜcTf }I;ϸG*ejۘ#DPYi?P}s|;z~GOnGw^Pቓ:oVج] U;8I]ʴ3j^_`;+: b_*h 5
ݥ~7O
;{<_
.P*u1祕</̕5ݼ 7k4WRVêז}k{
T3ʚf-zϐeऽ 3"vt ;κ37$#Z_&= RZl yE3~Va/!dIi{YojN`^Ӆ! >ϹURGp@ @ @ d _{{yc+P>99d:, o^^=<X3&YZ/84aZ-zj._ѕ5ݚWC's L=?n'v~͖ncҖxLjP=Ӟm יm:hV ~]ظ
˻Ig4`wb)ֶwUQ{N7m':kMw&t۩[*nN婪IQV_t؍rj98J] w)L:nuԩ wsmƣC ͚Hq!z3_
tZ7l{YPg^-/LTX,Q ֢gb/PTV= g6²uTv4oV/ȩX93~Lڪ F }ҥ˃ƾLT[ר~wֶ̚8xv9ݫ/k]wې+:~/m[y\"f9OZ(@ @ @ XB !5U>9_NR,}vgXb_Sn 4Iu5fFٕ"=!,Jjkn-Xێ9+K[
/|7ێzTy~Vyg{R=暟.w
]s8=^oG 5? OT߲]3s0اͪE٭zUj {0ǭֶ&G .}^9JԺ1 ǻO0<:q3w UwL]cMٲ|1)ѳ Gӳu5J;&9_2xʴx|T^
uf Ҏ}w~Ңo@s^UM:pGÃq 8 (1um99ZLJ,YrU4/"A]?˗G 7xs0' d$G߫n=H
nA ݸU:xg*xh0?E, qUgкe`Ϗ-9馉 }~OꈸUG߾`
iZS֔6;;~tK7EN}Ҵ,W,ҭ5~'z䜙V
H[¥_>:W>H]
^T{sԯkzy6 ѩc_|OfqwXMձޓ:i})Z~VfSG~N^.q?{C #xvGMt%;O>xEQL8mJ ѻ7m5ypí1wtE
O+zǏLJ;pLw6#'v9awwvD}fַ3/Yj.$&q2d5xsT=
Yd߾R&K!= њػѓjxTXx:s`w۬< =9ӭ~}uja4ڵ 6n]IY+U^dp UzZWz&ƪ]ayE i T]Sj̚ fu]켴PLyADW~zDS]rZT8?Յ٫ͺeefVustYb$eF?m«~E=ǍYZնtZΎ.1<:o.)4ÌW z%'0&{fCs֗
gukzm9~v|ddFbkm-Ic%y ! *l_[Ј gsj*(g/sR S$_dcωg_ޯ([2
CtX]4fc xScc$>+Id-e7ްX<1uJUW9rSy?]oW\}SׯkSW4slwٿ@zyHJ`dP='g->=ؚāKMPn{~|5 Jgid_]D'ב2E瞽OAv܌Dᙩ'yN0E=;^"a&~3[l 2$m6- +i? $&IaaIxxoVT<M ~x.w]~0/5KaW=G>ΦU/|Fe@ @ @ @ }[&g}2] In^w=e{eu-f+Qc#O*>[g`#yK$A @ @ @ N[ ҃ML_|f[)53V`y4|s0K
Ｊ g} p| ,oi7-k)߽{l 0;[r
ꭟDo娴,~6֫LyŐyZzN plϾ=14@ @ @ P
E6ŗ&I!@; \`xB @ @ @ _NE=D,i9@ @ @ @ @ B(@;B@ @ @ @ @ 2 9@ @ @ @ @ B(@;B@ @ @ @ @ 2 9@ @ @ @ @ B(@;B@ @ @ @ @ 2Xր|.kRԉ E`I2*e."p,klybU7 @C@ @ @ @ T`\xx[ *<|ZӟWIOO&E@ @ @ @ NПW:_5}`MRdm \D @ @ @ @> #ד=(xuu~Rc ĐVX(i&." p <29 85 Z{4
GΗWW^Y
T>%C_,H@ @ @ @ esjʹݽ,i-wL ,7OY@ @ @ @ iJ/P\`e]p#:c/I* .<gfy4ds>(@ @ @ @6Vە.I3;;g;L\wMI=33e>ZV?&ߺ$-G @ @ @ @ V-ѱP֏J*../E.(
՚t3v}>c!འ?W6WԂ\@ @ @ @ @ WVT蓒J"G7Me'&4c v߸9wAP?U7nv4 oQ_*vl# ` \+Бjļ&MдXKQ~~ gn#g Zٙ<LN5Ŏ4>>aZn[/+ٜjZn;is.$٧VTTҒYw[/^655sdffV 0-P4]'OyIm4/̟ҕ-G%uC @ @ @ m1&y],X&69]--Yc oнUTyKu-4ֱwsf 'ZbTyv_Df
[3ٲ_ӦmXܰd@ @ @ @ щ3a[uMϾN;-v''>ɗ캧*r=fA3ѽ93xߙ&S* +ps&g, b/`b*> {h;t Ų:Ae}hy3{sέ[23;_$jID`uLA @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ @~*T}X* @ @ @ @ @ Cfx߇N@ @ @ @ @ {Q`.)i @#HA @ @ @ @ X^@ @ @ @ @ r$@;G ן# Hw )@ @ @ @ @`yx/?OG @ @ @ @ ȑ AR
^^ #9@ @ @ @ @ ོ< @ @ @ @ @ GsI1 +@{yy: @xb@ @ @ @ @ Wt@ @ @ @ @ $ , 9 #HA @ @ @ @ X^@ @ @ @ @ r$h{ =b@ @ @ @ @ ) @ @ @ @ @ , ݓ( @ @ @ @ @ ;(TV(3??驩> @QhZeb;>_ dt*ȟ}L<D%If S %&Y<i,[$H*2]h<}6{\(3r@ @ @ $L @v )I.`krܼ퉂n
'ע*N -٦5k)/@vێFüx:zz9=`_Z+9Jʎ )<cexvNqjb_p3/ϗd H e{S`4m͑}ܜ&&-6@ @ @ H!`7*UL/0"WyG1ggg5bfϳm5~**vm;*ײ}>yyHO6hY"/ό:w_lEOMA=j;.M-.w}^_
&,Vq_4˰Ϝi?5
H0D)ޙDz@ @ @ H-gشi
es&5of:uV0+ewaa*od
Zۓf9bllHq?_d;~) 6 Xvϛٿ3'ҝ Pa̲5EfVv;U&]$+}3cl@Q*լ-Ta|ޖux=8C @ @ @ *--gsOLu v8Κe`M
TQV@KXg͚R3nQiYai|10J-jb@x (23|W5 (ߟ`ά9rY,sbgf2nm voY˸ 2L)3\ViY=Y-p wP~A)wP9E;_r3~X$ߊ49
?+ 33#9 LZL2l63zɦDgRg%:#Dw5 "@{Yؗ%l tH ,&=<ϦϗǝX+8 ?&֢&Oi-@3Lwf^F @ @ @ 2kx[љus(UxDm -G @ @ @ @ 3C!T@ @ @ Hp&v2yN>~
k5
x&XB`v>W%&<7wt<fȁ T| MMؠMUZS9i~fZS ;縮+ b% wp5I$EJ%ReI,;Wcyʓ*9%IU<NY k<eJ,HQ"E\+
k| ~w9s?6\~钻oˍ⋽(%Knu,o-] [d5%H5!}ru pͲA;.W]ˑdT:ikrc0Ҳ,+왗%c( @ rO>*\ Wޑ[YWkb+eAwa_N~Nٹ)u[mwmX7n>W]fyԑn{Wy G);4d\4<ɲ xW3f @ P.N͙8Ҥm^yٝwN;Q[K*_ UvU64< CcԺuvbE^岼lY.}da<tez1>|B 9,: %{. @N$}@ @ @GJn6\>% ;"_ΆhJX\D\+eL
Up|x$M>1[_H1 wn>پY +ìk ~kgpqyD+o>e< @ @24ӏ>/~b֏4W^yKvv8XA: P>=v9}|3djr}*W\h$#i ޙ@ @ Olj*<OOG.IYjZJ,], [!U/;D 1p>tE[Y:J&տU|Ɲ}4/ޛrSY o -[hM푑!푫}߸JX/K[Juդܿ! 7($gSc=*n=}7%;6xiv@~Q\9- jFi
HABȟI 2x]~dv6^! x @ @ @[8OΟ9U`ڭe/l ; Y+|v bl߷_69}Pv[F"ke.YwO=&ڐLRw`l%o}R1vپn֛ex]"
Umx6=r乬;_ӏmxU# f؆ #IDAT7iR <{>$g
@B; @ @ H<VYXbWEFX(P#bwt߽+CCj<1./t Vv*}v5t/>sG{ vAzo./|9Y$\[<?-d}}U9|#ܒ/ ^ Cٴ<yCLfvet2ʖ ;ѐ @ TX{jV#s*ikLF}]Μ(.t({}^oYjR eC S˥;ղٳ_X+
@kg{OiSǬ\$wn'n~yT>l4%LGA8#?5 DGXt4yY350CZdhx$t ϛ/WLK7YI='Ϭl/xO^9~ӫ'`3 s"8 @ 4O ~> ?$[ݦ{buZɍ"GC'? 9+kSMҢO;q7 {ut[w}uk'OUٴvo[nSNNFS9>g ̵bMhҀM!x<[.ϯ+B!Ur@9Hrx
@ @ (2 Z<~I'CvhJHd y!CWtHv+]z]+WnGAݎݵ SS_ea _ fY4@@H@ @ O`a>6ѶzlXD<_Rf1f<vR/-Q':hWgv
olt@ݒrOw~{;)E-v-}Bv\F`*h{[UN@ܓdW -'=&}6T4~L @ ʆU4gDs*q%
NMC m۴G/hz GݢWr K?xk!?Ց2nWv jZǶTny=% ZrdF uܻ{ɍ??nXY^a8?.8ȉ, Pِ @ @ 'l m+VB<B#q>|tܾ#jOo7D<$ ? ڪS\DoNܥ4O[y ߑ=s}⥋eԙvowl G.3] ؽ?=F~{I۟tn){sZ{'J3O$n 3IJP`
@
7\gGvjl}l\Z3k [_ʯ_}GQZd[.}LG
jv*erߍei|\EkPpqL}66@CٶQ =<v{=/n}W.G'_c! o_ NN%8rȻP $qgxs fB @ ;-Y;t:9sG_ >9r\6s ]" D+jX ob~+7li6q{]xՃ\NCi{|27s*|zt>aVuWgwoMɾef9m尜l%]f}5! @ @ Nٯg_[e˿|iG̗%Mˍ/T0O0`oԹj{䱃/V݆iW:¸~K{Ik}?FH rEK_o$?ak/kpן hsߔ l_7<ʶ=8*+Ղ4, @ P9>}븬^lhvT}Gv95 zōZe%r
q1rgչwJVM+L|,[Q.pOsfgu$NE,]&T~R /wvyv"ڶn /N_kRjU/ߕe^v':QYdJ{vBGgNuͨHòέ5vk=j1?.?Ǘ9 )ߐWˑAʴQO
L i!%x7 K #%@ @ @['-`O#|}z˲u۬XvnSrK."[ _똶ʖ i kk䕟 DdOc? 5S:~į 45</vsom+YSS'>$ߖ'9ՏwI өg mZA*<V?q3wY߫#̲kq)N"y'ߕ ^d^ϑEJ! @ @ HkrW/}z :\w,. }]}zIw-gV*KGFedD}#O {m2v$-y絿C'.ǛxVaP7G{_9) \o
5`Vs>.)c7;_9|F:O>O
v'Q*J1<Vw! <^;Oy0Z[ +EqMC @ `Μ^E ȐkmrQD @jS264,]qCj[!7(˯:|Kշ^F ܔ˷qEZeeR71,*!sMn0ԪdAC,&z\zgKz' FȽK~Qjj}֍
qvRz r# ί-Ui'tvP_f z کֱͲ}m-'j6븪. 4tz\/rJV=b oB*pii~4Ngxg|lg' @ @e nݵ˵ w|~/O}s+7q9VgJMsri9=s2RJ~'cANlI @ $k{'tf&]Q
?Ûu @ @ "0 5a6 z_^U#`z @ 0[ƚu5g0O;2e-,1$e,ơHWB
^_qeUǑ @ :Ԥ!<d. +)M V.@ă @ @ (ֹݟCP|Ƒ2ƴ6[Cm 0_@ @ ʟvܔ*v}եKOx3G xܰ@ @ ](kt] = I2(0y) n@Ua3¸@ @ #ݓ|1 }1&\w~
N?l BFBS[" &@ @ (* RWWﬨl TT[CNLuP\Uh^ d̫) S=/PL !C~1$ @ @֊ckf .)TWWKAhASS5%
RU5G&&ِX:ͭ#x~1md<dd!x6Gwg2 YB @ @ aIR2QM?A) s284ɂ3`XSjQ\/7LS:d풔Y?eʖ~P3DQK_
@ sOFmm/jn(4˟kkj,[ ^?KI˼jYdd0}Z<#WT}!RS̤IX Pc yy"abB @ H`R% Nj ރڜ,{jgogZ?skg-4b0Kc TP y7BQheH @ E@ݮnӻVn9 $066v掉E!H .79bL -pۯR:>@ @ @ B~
tMct!{.@ @ @ MsS{"dWRb))hC @ @`(c͑S*s5weX,L @ @ @ d 3h
Q8]={{E7[nS C;n N9{ʥ @ @ ꝟu\ʼn%;C曤gA1 @ @ >캡Hf̽ sXeyQPi;R?ǎ
---N Zn}zooXu^ @ @
%`vhM90fE.Kkǖfqm1TxOȖ* @ @ R(55YwS[vf[\96^˥ eצ+<sqmYmw{Kbowĉ K X/<gLFFGeJ}288( Z\W @ @ <IwG V,ۂ0 @ @ @B
˄: Zέ@?5G~Y;56ύaY/ Ͱ8UAw MB5tKt,6|h v^ CV稕:dp`j:r#uO=e
uc֎AyA@ @ $Ⱥfl1 4 0/?! @ @ DA%0X{ 04vxb m77~ۺww8VOx><J @ @ e.-I6wxMW9/L @ @ H*Y;M
9M!kɽ DIę=ݽ#UUU2:2"
Tebv @ @ E槵?k(Vw]> 2 5i1^Z^IЩL+b @ @ "5?KvA½j\KsíL}:nМO{#M쥒eDv 266*ccIfA @ @ C@k}Z_ .{@H*O4 `
@ @ %i/2qT;.ʸ\JXUiOj
2
@ @ HiOk~֗Vf -
bI<St/&tۉ ^+u]]%u244]'D,@ @ -vkOk}UJvK+-0R#4r ]~1'#<{E)_K-H[['>< AuϘ46Woa @ @ *;G-[k}-9G96?T `J/rҽ}d[}~#twݓں:;A=As @ @ <4222" ب*SzJ-vOGzp=&MsA x8Բ
,J ~*أ]? rrR6es^KuQZqf9by/CŸBvqŠn?vhA @ i
QRjcz qc֟=m7Ǻ+fqj}[
%`WC B*u&6
[m1C<{D:Xy%-Z*s7Ԕ FZklp Wݜ o^7qmЉŲ
q~h?7@fֽ;>n5{d:c@ @ fMt9Bq.|XQmu'bC% 핑/=bu/a---=?>ݒ?ڋ֤poXKUnެ7[.YآVO_zMfk
=R(ۭ~
q;AtZy)oC @ -%|Y Cl>mm >({MZ.aoR7*8n95~K|ɋoR*Ir-B='g@^4SVz9jx\]gi로@KzZP
jT5'v4vމN`}ӗcvꗜ&?gӬMpو VrfH? @ @ 0H :K?mo%rkq~ Lz:azH-xyXWaZki3vƒa"֫W<y39Y/.>\wrzޑA@ͭdS m65~ow@ @ nj1^9s8L vQUz ۆу-NxzNWw-azctI#PwS@+یWRV6#U7=NaQ DPv^/MF{0;+KAt$}8lsy:r @ @ %I+Iufn5m,M!{Z8z:\7jF12vѲg=\v /YAO<C1ͣL7Kh0i7Ejn
@J#n6}3uآnٯX #`M*nF~gRdG/ @ @ 6|tqJ b ͕F؍}Qt }hpN0u V)➫횟 ydFWPO0vxVGU bD4=@~:n?\݂>Nܙ}}{?[g + Q]nOw7 M3S7)C @ F`Zts6^r3fIw|t2^^!F8w3'V5Zt!`*N&p*Uj^a|Dۧ.,ʗ!xT" e->qnI_ jb=C2:}Cd<pqfk0ױpN% @ @ ڌ_^ !K&>]'f apݏ*N!\KqSO7tZ~oX,r !v<RO x ub,-1Buza['uXzYf
tS5(N8wQe1!"&vhq%M @ @ ]MMZC0RmMH:ŏ鷅Sm x^!31}
;dw
k$hiWY:#eN $xE\#4s91 8^Wp<^86'㝊1/DZͽWݯL·kcWw Ed un
= 2 @ @ UL5&rK]dc0zP}f8]֯Dq}?{jNk
xhyB"PcjdNyN{oE xNG{7i`A?]HP/c U<f 1)B @ pU"gQ
i]g!dUD}S duJn|pP X{}`0F= ұ(V-F8D4$0<WTi*B.f[T,@\{L>O_cg5^roP @ @ (s /8v^\_=\ ur{2cSwϔw6TSP
!Rč ʔoh0ې)׆; @ @ 8f6LewQӍ?S_T.QO IENDB` | PNG
IHDR \ i iCCPICC Profile HWXS[R -)7At{6B AŎ,*TDQTtUĶ@֊ >QYY XPy}s3ɹ lFU }ILR7@
4ӉzGE(mh况$ֿWQD (S"N 59| Po4;?W VB q NaM N Rh_Y l0 % of' Qpp@`s!~Y+!6O.Nbdǰ,l [rţkAEKruۛ5+TFDBe>Wj/3Aqr~ 0 lPu f؞-B{4 +ǩYh ;"L gy/xWD16i`a
3bd< neń} fFKDl0 h^
-] ψ
b<Qb(._qrn.hoInv eF Čv{5 +ㆣ ?b8R, m
l& kF=3Ox@4#2=At@Ak㞸; ,8quԏ<*џG "-xp l8ot̓IFsAxBE"4j&Hs&]0Z<To7 q q
I0o 3qV ד> ^RQ"u 1w5w菖r(ւî`'`X+vJ:ᩴFWr˂q6u}X-__R/Q>oNc;WOgzݘ pl&0m-Cg#tygp-o: '@ 3z}
9baL'َP2* 00 { bA+r `>XJ@X6` h '9p \x ` #BBh B
G\O C$$IG,Eʐrd3E~EN +HrF7'C:Q
Ech:*A9z B_1fYc./%ci[bX
vk
>D3qk؛Ax J|3/7n| JtV7B0!NM(!Tv.聯0D$D33.yĕĭCijbqD"iH HO*!m"'!uzI Ȋd}=9L}NsBWaj]
M
z)3%IYB \<UTT4TtUW\XxXbGՒKFSWQPRQh4SL˧ >(ѕlJ:^)+(({+P.TP>|]_EATWPJ AUjjJ}WT_Lոjj;Ϋ1ݗΡ/_ԃ3hiL҈טQqJ1LljmƧqƭwp\5Y<RC4?i1j5h=Ƶ-h֮־?^}xGAu,uui
ݤ{^_[wZO_Fӛͬd^`
v 2|dD1r1J3Zol4`o n<߸IFf LL_iՙ=4{טߴ ZXdYlhD- -3,,[VNV|V \'&LcM.a4ؼh<1yډ-:f}`fbWddҞc_eӁȡ$IIՓ: 96;~qrv: ts6vNq|E%eeW"ד ݜݎndɼɻ&xz=vxty2=S<{vyxjX\nso Lޯ|l}>}.=o ` P08/l!(4hmН``Npm@sȂ И͡O,ÄaMhxH&H .QYT^oSSTMym=?% 33f_POqqxi'&.HOjL&%'N ?uiJݞn6}+3gd85Sy&{BJBʾHv
{058uK Ǘ<xi ii/=ץexeTd}32eϊړ5}(sB&\7kά\ܒܮ<
yPn".jWǜV'qwgAUQ#:r
ko0 v,D.l^dxQ{Pd-ȶ҄Mźŋ{~
DDXrgmm+ VlZ[z̶Jʫ?\ȪUmVW!kru3חa+*mlo ldiͦϛ36ߪ:Egˊ-rvVnVv;wטT$,lW_\~ݭl==]{^uݧou Z'?m88Tv ה_o =|c&Ƕ /G4d4t5&5v9t748YuJӔŧG<{\'yaʅ/_
tŻe']9qj5kwxS[uM ;NwzuwnE wiwrﾸ}?$<,}XPSשn'1O pz^>=[/N1ޗ/KTs+Wb:8ZzʷZoy0jPZ ~t)ٟI+X|iHH.[Ȗ 08д4 Pdw/ e38@b -9zDz 06"JsŢ [] HM | o <ٝO"Dxn!Amk3 pHYs % %IR$ @ IDATxip\יb!@;Bl $AfR$%Kl-j\eS&:b#&cb" SUrr[RQdQ,QD\`.. NĚ Msnf%7d&rA|{<$K HHHHHHHHHHH`ش$@$@$@$@$@$@$@$@$@$@$` @HHHHHHHHHH`C! 9@$@$@$@$@$@$@$@$@$@$!lxA:$ 4WK K^FIHHHHHHHHH, ے:8:$H$@$@$@$@$&f`g$@$@$7(xPf`n xHfgf_ $@$@$@4< (xoad'HHHHHHHHHH(xs l70$@$@$@$@$@$@$@$@$@$@\sHHHHHH^ ~-)^¦MؼR$>ǍV Xm̈́gHHHHHHH`CX^^· Az myyA lţ2>c@$;}ǚ- H^/}M App06 olOmxlY4P\ lH</Ofc$@$@$@$@$@$@$@H./"@ݩvTdUSRRߏ.# |Uup~5["
c͖<H :c/g!9)0|
6U!IJLMlߜ@( @jxms2z w;8HxD$@$@$@$V!0ٶmA4{2~/)vwbb{(D _JaJtet[my!; 4
Y,,EvK :WC''KKh[U`bHt m3(-^"^ECeO=_]J+xH
)(ȐFMv)EHh<Q{+- ܄% 5xD鲑)# cpPح" y1h\.W]" A@#""tۃUZ۴i16>nh-;,
KA
߬1c:A[Ƅ$e`wTC
:+%_(z>C+QVG`={ މ(:
rM Sګ
(U#_v3ZƩ#P\MxԹ>ȕ{;FI:! E!ۨjTޞW^z JL E9^}B}h?˾6GoSŲhijݫ+ː %E[
_M%%VVrI^D٨ ttO&>ѡɳvǓƊ|qVӯkmsA1v k "RĬ(, 98ZZ/[]xD :o.=ߋy 0$!ap N9/ш6 @/Gx` eI7Mgh%(S#vKt*G˃~يu'G 9:kPLlHHHH@
-GqĒAYQYՖ&~Zc}cvEW|CoU X_^aD\c0>r 3LZf8ގMlj巻$h1 d$' )5] 1b>N`JlHoz XKrBbFjzorU5GFz26T6gA$@$@$@$/$/lh<p\C!3?YH
X͉:%1vtuuJf/7$:\ ]{ XF$-d!XrG٫CS(*Oltq
m
ظ j U˦pn*9I۹Vp{pw:y2n%|)[6?mP$ pO=Wu^$"&Bujq]#vK@k,><K`Ϗ T]UŶjg.߭՟
0 삗8)xb7kDBÑ3 T*ґX>#(8PZSlKA͍ ]
rtqfxCk qf ޤ|.FLhXQ5 MYyͰt0F#҃f!<\mbqPZQP??ށ&Z@vGF IF[n<SߛHAK1߅w0l[%dEQF<_ÃkqCQ hA 0GJ[54g!fga .->Av/c _Ί5
if؝-o[\dGAö$ݒ +ϬJ1;pWɤd|6Sx pinLx=ꗫ;5JLiw8")
En 1?M+iH]th64;eVP8y1x?V>7gq iؕ;=H> bT"Gxn9 ђ >>PgHHHH`к8-3ߌeuQ;A}-*X̳ ~] ;W4
A~" Ö-hvl}O3?lJZ'S1E93J s»wYX8s<eom% EeEHO,~.@?56 :0ć*f'` +nm[j"iS%ܽB5~ψ-EQ߹g{=<
,Ġ<Z٤my} =3ΖՆ`o6B_nX+U< j8ԒC8ZkmY8'9rPZ/? սz̃_CbA ɱGߟ l*~xHe. s|c{501t, Q?{P2yWN 1Ԯo旂wFNaMk
?q~$Yװ+#JpZ%n6Zd0_r%8f
d֥#?;
_ $նO R1w<tn7
MmގE+SJN=VbufV6'C\[6=3-zy{cul:kM6EVLJq>^hm`)ٱh4Bήٛ <ˢxݯ$#+Rto ߣRu:dd#|Uy ͯ2Np4i B<5t:態٦-/7`oo^5Gc2 ?r u; 9.eѷ^>x˥Ÿ\+}{aMHmu %G+L@`p EIHHH# ՖΕZ\b(j e K8(B"4DPd0/ Ԙ^Ѱ};vW W#W, T۽煼N+u\W^zWӈ.1OW*^?Qݝ'B馐=eQơy%<gT0D6:$N[D4X-lO(?R
!|ZM8Qe`v +vDt) KBgϏ#8s&̬< W뗿oΘ}`<,:/(k
ϊu!m;O qYƿ-xZMVgD+wF9
Ǒ"*J'`G[_<6.oi8tD>R0MG'ް圉E87?[Vb!Ň S>4퓅@3ح AW+* o-!
rHDnWw⑽GJ.bP?z5vP_ NB\㢴i=-_ JAyE|GORBێl;bh?DXpҡXva,ϴ
͝uòkG5K<1g0?qS0:Ɏ1m?s
߃W}|J3^M{m8j2]Z;Q"ԌrpymGmqL"~=Qe.X!ڹ5ѡ!jGCl5\1 ڽFf&HHHH)髏S'~kӤNM{gC4=W䖛R#syBw0jn'7?-F{=#7 {#0Q-}zkhy.1B3DŽ8 CY[0D}o[c}`cZӢaYs{D,g$N?%Vy VNԣNVC k,,-i|D
*g5Nsv0xZQqG\x]qM ă4w^ACgq58* ,kdC66Z4'BRҥq5"C?Ҏ Ǜ'D!>Z',8&ry뭻/2g 9
]#!<N"@1H
3Z)Vl.+̌uK2p D7V~ Ss;t%8sZxb?:C<[qmBͽh܌8H>Rắ 0#zc۶ +6l 8fƕ_)GJA >(^Ulj^T(G OD^ߎtH0M-n4?9ڂ/.^D "$8PQh2W
9L<m7в>x:Ǧ֜7wR~7y#FON[xrymQj<j\ ҋp GVcP B gwJmFxݺJQ
P <O QY7 56uzLv(Næ7'#vBy[郿7"SzQ,o~ D6ZsA<M$@$@$@$\FF[S?/?Fkn3y)9ױnQ4o3(o' WѠYn?PwVV;(&2OGH?8Vė^DuqJa fq-_i.I:$DΣJb]ܽm N7s!u׀g[|3 Q25|uѨ%JDZ"s)T G+QuMwq:<c?8 !~lޜa]V>SЎB6L,dƠ|ٰO.TV5)lϕ<@[h躺è04;3Vn ^ xu6O*+ Fs _"FҸF3q2Zr:EN͗izb:{}瓫r-~:8 QJz (bk ~qJ
*2#[ƿ{mj 5J~!MjOEzzjJBqZCVy:Dk7/u~.-E,luQt4TzB.
Lu% SՇ.R)4ܭS}ҮI^~c - 7 5|k"Fhf3h/4:te<Jԣ$pW#Bt9P0#s2/lo]G4y>ԈRNܳ=z
)b[,6Y۪GaU)1[ y>%C" H=F$@$@$@$<UZӴs*фsXhgJ N /;
_3TXB |a4 <W_ \>65GqGwp̥m~8"=Jb]T5R; w?GFOsԾ? WDn'+ҩ!4<:
'c
/n$!U[֕~Ros%{Qm[+tMsz ?Pnɖjw/ QtB*e\aQͪ7t9ͯ9jfq-
xmHZ( ?yL^E{/7<D膅WVg }Vz0 J!V#cG
#*Ev> _};S_1_f7 1;j饻h U&VqΉSёJ.}Wn
25);E.z_vih뒳}m-D+y$,3\ qh\$^& _|v腮۽/,N&V;r4UVぇ9$-ʩ G3 xXizpTi;\>]wvP4 :$0Q~;T2>U!JjlkÞJh~oj ux;Ӝ\͋;}ÑmΟhƵN-Lbҁ`ᔿ W@H7"j&J3bus[Vf
vܻd;.ehU{w[[6UZAsEKChjQ1wfBv
d6"bv2\e TˋF&61ĦrT_lFrv%!:< "w@8 +n"( y|WE忂Е#X֠oʁ1 H:IDGJ~*GNӧO7L2l=)O;$/c_oعS"X +[L@=g֗ɦ{xXZ aKݵ Um3-N[)x(mu.GY690+FS7с}5"[5Fr aӰc۪õsv4^37 g^fuC ly)
ufjfSU)wq6Ë6?k']rBWq?5. h58b NkZDl)}ZPF;q4g3( 3:- PxHWZ >A,ch@fX8f8V<P__RWm+C
I>}Cq} ^VXqͯw 3NW,` Ov\앥qVoَ-ԧS9o&
˾bWxiݢsz͵vym.l6_p + ] +HӈהO"u&Uq$\"SSI<5`ŊVya6G9.|#E)n8o5ms?]#>ı۳Wv4TX tyyXr )8ʉ5*jM:
l^a[|c6`*#\?]sTKjE
9{FϿ'ٿ31 S\_3Թ!rzlY<Y8j]iMkzVV:7q-H29NgFvᔘbʖ&+UmX=~ݩS݉8|e?7Dn/?<[(" Z=}"l<*\]7je0-NaV60ߧE8gBdRXR Y7ڻɢ.MmqE[" j-Ҋv3 \2DZmmZ$<qu0Ԗ煳[^mG; Wᣖ1texpRx؉LjY}HHHk28}EYx-*>ήyi'W Y!v|^[ӭ~ֲ(.EjY*y|-Xǫz^o
xY7+AQ[J͝--.5RH\&Dي#5 Uz]7oq==GdwxddM; v_ >j혭~P43]⟋O)SDo
!@Znwq|0͝!m01J6ՋE W #ՏmضݎY%"|=:-, YB78y{_i_XG 3E-oUtb i$AA";}gڊzmkX1 tӍuڞ!w^uwG#6? [Y_Qqmb(@{:ꩍ1\ gAPPjJygĂ]DbX8־5 aؚR$R P+Ozq?^ߌC%7D FJAlVwSU]pK*vӦ8,jmjw!/U-D0Fƅb-5;WdGL&+1}3EqkEV>q'^qMhAi*mr7^{>xgUOcpX5#*[lN:$B&,Hݻ* ӅIOCNq<q~WJ
vܴ\ z63 Y,/I& >(C\w҄SQ4dSsQµGC}X7.|./fU}3 ':ڎH[uו Úicm[z drg߇ .PI\~X"Nks
eY̥w
S[k?}F q3bꖗc 3zgΐۃf/|[8-m+$:fr} UyvNHo^{GbN!xI-9TB-V)WRyQoŽH/O [kZէ8#.QG Q$;(V?k"Q\q?zBƭWKcSj2dÙ'Vyb'R
^(ΈǎxTGmzۛ$TSK][4Њ&k[fz4 qȂgJǷ(*:6S ibu:%&/qmq݇Zj
d'CCNɅagAn5F|=2^m| s K@[ͽ{tQq AXL<`m]AޜrvÑ5-!
omcQPv RU0l2
Nqz%Qy<j)f` <64Zl ^X>6+
Qrѥ+¡4ؔ,/GLgCO;:=Phjbrn{xKuܬĭ ԭJFaDf :-)'FD|k d/;P]Ƒ*e j1<!; d R?| {NF`v{:2QOzfet~37oBph$E $?ᆻ/DI=6{X6$.DyFj콇o[[:2q@govFd [a؍Zy&+܃^dŤ [ Fo"L alNCf恄,;kj $GnG/QZb18 .eF\rny"g=wp1 rL WmD [C'{9\5k=~o DlA 3cI}8-xcr wstq}φ>IHHH@R*^.+N)kGgO1:>$-A#Tن^ mRk8? lĽlTB"* ̰NOr>u"G:ىALmAj^1d :;Ah~?L,c7ϡU3b<jspC ԣs`v">1Y)hG|tbK8 K$1BAijoCczɫjvŇc.V)Ps69-|&ve>4
|9O+rט{
.oۼ|dc:iL xY&QqJ|
0l-_}>8(LR?$d1|ڽE{e
t ;9|WyL|~*N;|@k9N-ij9jKx$4X8BT5U RveC=dO3_rO7'!4d< SؔK[kZe89 h>_ G qptt%ʛ{HWl#/V/@~İE"\.g l{
-x9/4' 3-8
meh5K$@$@$@$`g<lml~nqq/I{U4YRqJL^(5^9k/n+RE`ߛ+YwpggZk8a[zxk,eDi8hzk8juϝqi>)5Wku]Jcf0rO(o{ "NWuFFo ob ²(T{fJ k^ 'g#_YbeТg gM<njG@5ËUg\j̮fd7Zz9-7\iѼa>އ>" ᕀ=WP,,h^{0U19'^ b-7/?j!Tj-zզRJ?gu/P,:xü8WzW=SM4
L!"~M5 q4d)˚|^ rǼfX qYeyñ툅*} >r[<ӎ~/. Zr+DD &ElkV S? F f< ^" 躨xzLHڷޫFC[6ӏo< x^G% Ow[ёOWy|}>j+?Usowť+̯K
ޕNؽ2IHHH0@>+h:>>nEnץ*f14`,o~ o|~ΎuL攊5 oJX<N KUoiGkiڛ
o.#!Q AsЉ2
ZD|i ?|eTy .5 ߭^oWd0ϸxQ
lW/iw&o"l="FͧLgiP 鶲%"F@O/V)ҡ#Ǽ\}LwUD74:|ZALx=h5S:R%2xfغyQ,0 kcvfᨩ ۃ@# .&Swwrl8æ9l(z;z1uy[Cuq}=mJ GZ,"1m xHd&X.oڊ < L< ;ȏ4 7U FFMfh0Sx"g&"f{w˛U h|OMd7?T<`ONjMjosƜ2y^<:,G=b!Z
}`<I$@$@$R%]}O1;cEoa12VUappP-v̬-,1߁r~i .ߪOPj*wPƇz? /5 |F06_Ӻ o^̣ NI~1-LB8[zС]M2>mܺ4 %vD2RXHo3uC>xx -xLKk#x{O / @mX¯ڶ8 S5xcl}mӧw+EkVw;lHHHH|H9lI
܊am6Z,n^buGsss_k`E`qqIxy߫|uֲLC&ၽucm7mĸ^-@' 1ź k!J䀰^(>Nla[&f FaOI)Pʢm<sWHHHHHE 0/BF a`` R
o@hX1<b/}_\~U^Zz + ?v ݽ cA< Eˠz66Ɏ7Wk>Dπȓvo4yGQxӇ=r;LlAHc+Vm{%x~-8\QwP=/ XkMMLN!<< /l'7)\ʖ-[ID{X?ύQg.Wso5{چ̵gϓ7 /4-B*ZbeܿP&F'kh7 ߯ŵN;9xcA@PW4+V$@$@$@$@$BB.[ o%-Z955UG7Fqe~86,/N;fG:n5.Ӽ|˛%"^jkscJ=1=0)G'cgX(n
;`&gnb
o5 x cxG, 1_zIa{x[\\ C> p~xfb)\ݺm6!`2fQX Cv62 SC̾ H+33A6 p~N \H<Hk=U
kǞ- x odU$@$@$@$@$@$@$@$@$@$@kGڱg$@$@$@$@$@$@$@$@$@$@ $E+=WUeg)C$@$@$@$@$@$@$@$@$@ =PP {%:~v]h{v% @{ٙuj9& `Hpe$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ x ope$@$@$@$@$@$@$@$@$@$@>&@ wPWJ$@$@$@$@$@$@$@$@$@$c} ͑ xfTkёx^ QQ+NJxxl}e' quV@$@$@$@$@$@$@^"@o/e$@$@$@$@$@$@$@$@$@$@%os c \_yYE~7&HHHHHH9>eSDII#0r3{L$@$@$@$@$@$@$@$@>$U[!Fۇʦ|_FcI' ?gLNK3eHHHHHH֒ cx%}M$@$@$@$@$@$@$@$@$@$1= %
kIm xWcx{
PQ. 光HIf%L=PG;> =dHHHHHHHHHH`m ;QܴX$D#x[ `E=,F&08 τG[Za!~\ZhH pZ;
et) 9," 0'wD^-BQs MG>? җ5b tMb $sK¢p| 9AFZnO {cD IHHHHHHHH` ;g( >##^ #4B6߶ QĘl`_{Ӗ&cyQsnY~aXC^ WNBm
d#i($DrR<Ұ͖C3=n9
{B!I+C CsnG6&'Pɩ0T9 i]
tI$@$@$@$@$@$@$@$n 9P,pܯǷ ;Ύ^xdڞZX0w-opkmM]%!T9iONZڅĘn⢈w/>cj|CAǐ/Ĥa 8lM[+ @.a
Cke % p_
a: rԮ<S!(x9P!Q [$&fe$Qܿ<nxH$Ju
UMC47I,aRV;jAM*"9
!LjE;E A/c
_{ٹi";qͺ((v)
bff_XTs:ť)HV1q pD!(hNa)~My(M F\q!OD
? 94=zhfv[E6|~ Nm?~ 2{&Ӓ cQ o뀏9Qtbe5PT
Cvs K;3=V[OܢFK[.]TݬCIU/jQ)/5 1 3[ILOm&)YpUAZ6 olގE+
<ufRY؝6 \[ފf }kC58Tg{B4]\Tqʁ|qVT; P /AD+NY%7GSrZlZc ˬcucj Q{h_^ H>^\ @ IDAT 4 K>:{$@$@$@$@$@$@$e~y 2dm}S).'sʍO㙥H3 AQ8y [n sI(ϫ؏<4A18{[
' $,GA1ԗV2~\iP,9 0b-YyЪ[_3[V 1msZAW99rNe/yS+v12,#J~ 8Ffco{]&[j wjhk-0AԤ$eB'FXq֔pIpC JPތ@5s%J }-brnX.v8 i&h4|&ە)gǟ h @ɑ=GspNd\Rދ7ǟ?~gR !7 ڹ-b 5}~Ƒ}+Z~.'gEǨnE@6
B07Zu4v8xGM.;0x=j?=jEq]g oq 1si \S\nLɉ0>Xa&v7߹sWm>:
z|6[$@$@$@$@$@$@$@$`Ҧ^}^
wg'[ޗt%8]jM( /o
hɤ7&ZD+H5
I
O6ƏvnSs1'%bcIT~h;٭Ǐ.FDo<} 5t(|B6DޱSӜA, BV:㽒m]ƿ<S1(*Gzb4)0ׁ:a9& GK`ɾ,bu4n[6m KG $FCj~X4pi'Zm
מO
f#D <;ܳ 3=) S14fbEOĢIbE}NĠpX [ox'##I @5@jn8.wQL,^ƻ qfsv]Us
CQY %,@?56<hsՏ14 A/ozKHU @[T1]:DĦPSVlxW+>шrJё~TinI .+<k!v;he~م )jwmegOΐ ڭbrn2pPā~k\3 fān)~\ʳ[jǢie)8$8*Nb g\֞O<N}G1nKk* ,c|Z:fņQ 5¨|,fh.!AiITj/ӺW"17t馱 Ge-p_6#7gW
J
8ih G > ԓDbk#:L'o?~HRuh/Q92Ou^ż.+:9>b Vm1)I(߃Δoϊ+鈳c6x; $Fn߮dwH^ʡˉW˳b@ FԺSpz "-B
`*J+W3ح AWXUޢRc?iBCXV,-|X[d[-âZrnҊb]h1 9+{?G 5Hּh p{\:11+4E$@$@$@$@$@$@ &Jc[aV] 4ViͲ9q
YТܬMo6mZ\8l?\ҭ+qıG"[PYN>uy TƳz^햍3EjN\"njggC4(%Q~XS~Qxcja=PqD#*Ml ;ﭻ/20 8sIRpq\v w:MVv -3xpPt䖅sfq;vR=˥n?Pwb07)\tA};Ms( oネÃQ¸D| ė^D) .G:=ռgeQ { 5I'b߇sQeܴ$lh3pO$@$@$@$@$@$@ zx*G%D\hBknKiʫeՖܬ<%oшz<{svqZ\oa5kCl-@Bd*PyENU=]NG iyV\݊9/[>!bzJLѾ #u-]o7U.7+&]} f|Ц8y!#[f4>yӕ~46*iOr!>t }hmjBY.s_Z'PuI h8M=uS$vK9:j~6Zvu>r+楥M$ze[:51P'9+$@$@$@$@$@$@$-~OE -( E,@BC>I,&oY~_(w>bq9wC>YSȁ.|WqQ/ҕ6xij0I}G;,<
{6
S$ĉHMTZPϊ &g5ǚd\tr$\G'wYŌV
X;>}hiW{]FvfB =ވZ}O4
M?_RSL1ҋIuZd'FtmXSGrVȫK6&J3b3ܓ C@}O=ii^7k_&J ~nOchr3N)^*'EB! `sOr@&;.+w:Q71^/@Vt n7+rTSǁRw= BD[^(2+7x+ r)-EL6#dDDі{-W38
d 쌎6="}&J5UiRCWrϠ$pXLb(v|(70JGvvz2t£]BoU:9.Jٕ$f,=
W$"R3^:6= hoE>*kW vlHHHHHH<K/=L-7 W9L^@J=#mݣa@
UORcY(8wuYKr
"^aBx/m9Jeжj`F#Bb xЈbR @1#cvd>++ l^-fUuڲK56(ޤژ+g})OAXزIi^}C5hU#+@&L<ʑ 6QY<eSU
|8YiHMD.o3tkr,{wn_gؙ%b < 33HHHHHH6\iFZ~d řT<] hz2 l Lآv.< y
wsvaoq1jǛCE,<OpuXpш] (O5x`6,Jց"c3 Լ$
.ԫͪ>* x|b (] {Tר=qYYxkrfqm3vfP{ȕ(!RZ6iaxRN2mB[V kGcT=V{ .y?|$k[[:Q3 5-B+6,Ԡ˨VhBČ =}B<*\SiV[MaaȬE~ֲ(.Ej Q϶` {yHHHHHH֖
|?~6^=[G{Ncw3 ._AwKc`Nߓ=6J?Ņ+
kʢ!lIGZ:*wb-^+BYV8V-]e`SSxԃdө 3qv*a ,tdX^-+
B6T{}bL{O\iCqNI|DNi 3Cvxn|Jz<ahb[ ׄނFzK1%.&Lq=m.h8cϥ1Kp;*EwOlؓ"\ɩ<H/BzͶf%mLx0>X
}u!UbbE<\8mk"p\Bvm2}$>ռuw.Cb^3,h*OCN<"
D@uN
O7@!u=-8j(1MXm]sh;wVӄxXкIU5 4*ƌ6\w !(W^5q ڻO? 5'eZR{t_`nDŽi[\8}@7ˇmL>ݪչ:m#r(v\f~]2GS:aw } k^XpΆ! R.A!Iʉ961cJ:LK%xP2v#6J=TSRSg6# Xg2N} ߵhQ~U#vK4A } R,YHks
*vၻ\mwcA"5.ų$@$@$@$@$@$@$ h'!}t)HF`jz [6ca9&Ǧ=j坭vh UWA]:q.?غ4A Y ri||hk?ݍùG9юV7X&+B Sw ꚻP @6v}nŽH]1,ߟC,vhjsSȏN gKbЀw;%c'zzY;n %bC?/|IG
N%\>O o<Lҟ*{@gGoRpQ[T(7#i0]ELyÖXe8)+9W5 c*lԵ`AXx <ub/6W7&b,uޖճZq1<("ީ N8 5-8*؏4m4{9en!4 4QҐKNq>rq+Qubo}ԫ
y> .ougGUQ߬z+"㜶#·|O"ngӈu~6ĵ۟F⨯vr ߂.{ح8rH}'~>$,
1 HJ1
JwP]X)FOv^Ƨ>Py/ƑTCUPok@Y"uq#;EڭF/QBu]&N Uڢ_~Ft Ob{G"1Yԭ_G-b (65m XbJ~/r?YY 2 31 7>hĽlTd&]TN->^]Sc`ڌ ,Jr>\s98:ЉNbbnR Ŀ к HHHHHHH +̤ҲRUx &cai#bPP ) S@x'PZIYE>v7M. Go $f EfCI4.O𤮺pXIS,h6ҍ)H2h V_ gQe2 * GnCޏ̗O Ÿ>u
;M9<T-Sbײ^)vv䗧.E!oV$x ?3<l<y
3lyxk,eb9lYmjeQv`aP/q[]}; b[բFV# N %Mz3W2k]֛]u'R㑓ND6K}-qx&jֈ+Z/d3ým -bl);#ph[7A35/ ^
EtlZUG[.㉈6c
w5|w%(r8*l+(FBtvmGy &: bX!,F e ]}hl첎/7fs|d]0`'\j s9_
صg7L6CSuÝ=އ.IWlE2"qZ<闾]Ęxl M8Ǿa*;6[a5RJyځ"˃d1g}*fܼDUsȨD>1jmw"-su{ʉƘHHHHHH<@CG}zlV1:2b8 -6sxiEgCxTʆa*d.XxVohS/dÓ.^ܓs zL[x;jL+b`~[.N
Jc[d( ]huY7|E-("y}IQ4E%kَqNgh4`0= `y@ zNHNb'cǖȲeɲ%Y)"^n"R$Uȼ_ݺ֭{)~KS|R~u YB#'} fgaTe~cK(O'Je}Dž M[@Ysں\ktYdn/jx~u%ٔZuʵ9x+McjGSk yې)Ŷ 2Rhj\S 8Cog8 l*n:qb:2V 8uĨ]
_wd9u[˙γ^=`EiY4&1US % XS*+1pŒUVjT -~_m، .as^% Dwv%:n=Zcn5p)HHHHHH`{53J$@H꘎M`R[wY&X?>Jɼ $
މ"tIH`wEvgFݸv3+Hz"@ЏHHHHHH#@wtH<o{q9rb=R-cn|;<#; 5! +<xF$@$!~7# ` Q1 x+ cçnktZ%xEϺۊ ے9ەF`\$@$@$@$@$@$@$':ÛF
K=g% $+PR vf0j'ѐd }E AHHHHHHHH YqIk YZ "@*nfHHHHHHHHH ]!4QM+t0g$@$@$@$@$@$@$@$@$@$@"lVԲ&ᝨRd$@$@$@$@$@$@$@$@$@$@QF$@$@$@$@$@$@$@$@$@$(4x'<% p
ގ0 D;Q. hv' $
މ"tIHHHHHHHHH %@8)HHHHHHHHHH QhNyK$@$@$@$@$@$@$@$@$@$( Ia$@$@$@$@$@$@$@$@$@$@">Q 3] <0C *m ]} {1lHMEjz[|sEpBw2u !*mٙH][=6>)䧖4 $@+A
HHHHHHH !PVTh)XYssPfS'ۡ:Oۼ6z KiN"$@$@$@$@$@$@$@$@$@k=0|w i<FoedY$I"b$@$@$@$@$@$@$@$@$@$?ʚ17?nEGeܜ=$$(@$@$@$@$@$@$@$@$@$@d٭j˭$ƚ4xKn UKU[tTHHHHHHHHHHLo3
IHHHHHHHHHV-WmQq 34& Xh^EGIHHHHHHHHH֛ONv8QTd) wN&ԏHH dW z3"f ǽ۟ے@C9L ;tu<0 p#/LX/s2_ɔDBNϴIH3xؽyST3;Іg%
P%KK{:G [O$#a$A-(iDmWk4x'AP E`~6`Y7?*t|:^<qoF6NwtpUFYW4x{P*)5fk|gʽ!M7 r; wq< =@2jN^HH M'E|RM0pgQk
u 6qaI[ ̑Xe#8K8K[ Ã. $#PCeVϹbvhh6'{3u_\a}Mce'$>2q wѠ"5sds(vbV n<9 | E0nSRUo;ye @` 0Kq|bfݵc|eSBc҈IHLLI~d ۼwM%iB$@kkwح廋ֿ@ĘGc
A%ܸ(Y z <VsuCw>vՉ;5hz]Hivg\VIYxHH!Pw8Rλq&&:18oFƕBV6qnIH 2QY]nQ|O#rLD6.J>}s E`
c
yGU%؆@3QU.Vm(
I}8k#& <8 ˞c>xEv$3&N$@!$@$@(̟Q7CZ! Y 7HEɨNC$@$v[fw{5˱ vhBx1tج*Tb|~ -y SC}pV^p͵HKURX>\~3Խ5Uݲ,=??1t]"jvx
g`Q,,bfjC}l\u8#ӳFD7. J%C S>ލ|lN]i<ăӘ /%qH <<ou hO$_NiM lGuzX~p?E"wN ꋳχzԣ)J}EՒNٌrʅ'PB]Go[#a7={PxlgM8EQ<l5Boێ cnr [ Eؖjb[v&6mw bf7?NX{7K}Ȩ=;J[nSݸY/a{'kKq*or
GzsOW^m:kmv^iZuUn[E7eCy;x Wb.gv=~Ab;~f ;L}òt3؝NtDZDHuڹ'YU{4'/\X˄ ?-G[W];jn,qrQZ wDrt ̥k-Cnv ;qQHjX JTKm _25HH'oc6BFq_ښR Cw^ơjürNk9>GmZirjyFck5Us\
aǽ(;yDv m=@0. Kty( Y4iG@x%;;=ϴ[/C:H >c(L,gfYvS8tcT6qO.}Wİk=uCGм_T֣m~ ߃VA(݅OZ" u UZ/y*WӼ&n<i3jq6-Cz>k8M+oe QZ\~U/?rb'pQ/s =Dž'^˭*YXo d jxGO<l]!uU_cLrjt7 ֏O k7v5H1jOr8n+jT=_<o}ۙr[`}rLҿ XXm4xۍȌ=)=ʴs-j<r,A^ﳉzn WЩlPYi<O "QPQ[ܴ]+ ) Zьo?Ը)dyRڣў|֠F^*}{OgL @@۴Z4o]2X} ﾁezw#[s ¨9xz9 9ٳW&T
}+E?u_p %__-3F1n? u<\j C'vY%-* k @%okrdS]
9{|d OGZ)+ i(ֽ4y%q }ح_߃/ O0vaQw𐘎;η2<1Ez U1F9R$+2vkJ?OпfeM-ze[d\*牧R4ˏG}P%{v& ڷTX;E:\>!ߥK.lW>;3 e}47ЁV&T2bq {)N` ęrSc>oC7}\]h6i~8%n^qxRiO&n禤PXق.ܒ ii~ӬND;P
:6t;2~w-Ds
04nz|IFø(N+' T!͇Ko B`gT6rUS#sV9j2fXkTr]XhDE#W[Zq
u蟉/<F R" ａ>[t^F*
x&K+gp+eLܱN'?ɣe _}g;B}y1Ov'g7HZ^̙{-:чH@Ől>ZNٲ<EAVyahU='L&ٙe7l);Ogם8W6 ׯ\{O=>3/s/~k(x+8_]Hۆ -: }G}WGEWFݞ ARYx
^on^@'hpcz>= |Ȓ$_]Twxw]<X8
>#9%hu%^2pδڜcXsRGZOj Rv'qBLr1i/0x-/GPֻB Ӗ^rR ߲Ma &n*+gP{d|ڍ9W
xԼ*j\7/U=G9 ~d$/{6\q#%bLiuД[}{2txD^W|::,lF5(sKמh>#k-t@Qm\ݦ~5r #v[C
ǩњ+,rb~|}ĸȥSoHT\S-%G_տ@*D\w I ,zнNNGYi^@9vTzݲf!TZmæۯwӹM)/Q ުQ=l Xxk*?=9ʳgmj^yp#+%!{=ԄLGfV&ekTO |WZtIt ĉ@ձLJ;gP'Ƈ
?d<cO̲ts
we!Q{sA*-ӟk'Q#oA[ <҂w兛u|ڊ]l }{c\\{D,-NӔu ^ř˝DteWNY[ >"働{ucȮ݉ /#] ;-a Hg !?#8kLYՕw+/KsŠO2Ep>K}k[Io<X$_YYϯ TshUrU3{j('ە[Bm2[ xRgq/L[h K#x
S ]}mr]ly;9حHf N{2~?PAͳ=#GP}otvzq}+~T߅}Q{S_ K~eW>c It(wX 1#9yo7Qdb5wMBGo]EIw\LH Xz<@[[G_!;Y+rՓ۰e( cl!Cw^/Ln-x K#,K;f[o( 2sqXN|>dƯxHL` #1VWfj\U|z;V[` 3kG:Caz>48gӘٹ|K{GK&Sw-n-[ iA~C[g%L,[YX#;99ށ$?~WXQ-i 7 ,H
lח(G~,T6˧PQsW@q;Ћ^r&NH&~k<_|Ո^hY7r>;/<y&4P\S%Nȋ2ȥxS 5nID[|[vK1:觐L -{^y`5п;ꪍdgD}H&ՙ;Bdѷ4-ў;71 1S|9U)Y[7C̣L:IH{wX͍уUiv,oRxXI[>mzuPC%;e漬,o)Y53@-R)N+k`>oNT<%z'ۅCh~/ks|G OIEYF3>gNo$Jwe=o㌜<'ف :IYhRHU ^r[#XL 1(+H]ֈdˋEs>(mlɮ}/9i^(@} G_Ru)e܃nDZ/xf֤'ګ%CΉvI9(9uS 'f2)a 3.+~T\n˚u p
=Ԏ/p%V<I,뎪~/FYI} Fj}cor&Q߯Q^ hKmY<a0|1~ UW~:O4G=C#r0sY9 DS'Uo'=,m'A 1wY߀{)zU 6x3hLrDZ#xu:/Rdͳb=-haE58*{o_pviK$ovg--Usat-%% uru<Çqԑas*f@C Ov1<%.P=@?_/l6pko-R:@jWceE^ \ĝ; s hm| f=VyeW$sbe`K\hFD9O\Z}<WV"}{\Gpװ{=Pr_=WW߂ ！.?#xfJ:'%pev_>K"[ NY6f}gGvNP&< _(۪Q)/F[G?+ #Gz*h,i^Fhz1BH /O.Xr%*8Y8 e֮vrdAusI_3P ӗ<쎖.
ʧ8\Z(A+{< i͏Vx gt |{Qk|/_߽`cN Ó !`YF9rx9X +~b$+# ʒ ?4R}>rV`{|隭lEl`ueh
&85xπ̠ܭV kN=doe3;+ [26Knf=Vj}F{x8bG乢b<?+ 6yFߞgQk
^f|?_m͒E Q'C_)uۍAe۸#Yed̡*MUz]}atUlr?+ t#?!BZg4㛘`Do{eƐ$@$@&eɒkFY#
Ϝ Or&_h'A~3C{
uoFr 3ދE6C#7R~}(
p~{ ersnI$ͦ͌lV 9L&1Xdd35 ՕtJeZYʮ (Be2qp_a w;fl.} PMYX'.kLTFfl$&lN =^1i̭yߓ=ܦvћxXdP/<; e9`}N ?Zwkו BÞ(syii5\e #C{I3aWdLjC}Vn{b~!l6,YA/(GPU4!eɅO xp| H??8˧zr0];q'o?q$ 5Owf$Z-j5l]y'@wg S7/'C[ H{`t0 W<N(,xG#' k7^P@$L\ڈzY!1{ʊQ/4k'_x5 fL?K>o5 {gyYYp((/u)Lfqwd@yi |dV<M/IVgR P qʓ2;}D]w^ͭ wV&4ȪCmz\\Dp^mZ%x ùr>'ZN9W!cU@wK{
ף_톻[\xB^$i*jj{Nc]JQ3x.&:cO?98gI˺ @ IDAT.r sqQ '& X M.مM"}kag!'0(aw46E 5tCԎt wФy0gyd<ܟY4<vy%nw`pA$ mmYh|ؑ k36`r*n>S5 ~AO|/~x??e$5U4++9eM>sCN*fv棡981)1 9$kJLV}ta)j4) $ 0-F/{ C ;FϋĵeJhNM ޙT Ʃr>'J%5UU媒ASC[ٌK{hWۺ<YerFYE.vG[7,/*e q=mc=-h7~)_!D:s_;.$@$@$|bm'م ]7"*Ť}s/B06jԗPQT׀HЁgqe'iUo_B CؘY|wM)Z? ~u@(yr'n719]{q0G{-ڍ)
ryHa V1 2kp18:-d#RT+ o~}hK>N7wdMȯiFsscs\w`shvit̷Gf[{'/f}lLGcJQgvx/KvC}XJ/E()f4p0t¹δ,vmrHAvTYyU
2ҸN R_P:5|\wƤҷ"#3 y(Ї =nܝ<"5`kYF`pܦj܄x4ݓL/capKϱ(8UD=puU?cH71,_%L?XÕ8mW7 v!dJ?hW]@_5-C 6f=zҍ+0j#&UJ2벵h=2;a.ǒ~2qf?s㛘uEԌHHd _ gd@ Z/!5QR<ֆd5 nap#
O po1Y۲
Exi w 7D{\x[ӿڃJ.v |J= O>-r({5e\S0vM$?_z _FC4@_[$.Ҿ2*=kʋ*/p a35offG |m)SuV]:* l+Q? F4 =- u?Gwt}|f[3Au\
g?흨Eu_yA;9?yc\/_q,V"~&6oTz۪Y#>c 1x
QXbpm%S'սmAYNy9-ʵk`&|Gu8
} WzLkm?截>ǟ_Pn }cO?x{UC!:O0R7tn{
ꎶɏ~EϩzĞRӨ<fS&*֯sYh>]hzB ._tj!7^TQM?8dZ9 q
=Gysf\d
ޡ뗄fs6!. GfŜ"y
LE(jf뇿۟˜ cb 97 Y9(|~ \:u 5%O `'O/!E|LLMÃP15:!c^-}w W~|oTƓCߥR
H f˭nPM`z߈T Nqsuo-O.cko^~%-.9ӯzb6 V؏wy='sY?UHé{~NmhsvgpفV8DYY+\y)?}\mRZ>)~SVn,^~$zv#?YWd21;{~u`| C V#}
6?F+ Ϟ38Y߾[o엳ZYǕ_n{C >NS7xn<|cm}`?#}F[ o-7cGBoViͷQSy} Aֺ^r't|SսvWr4F9X= w]I<MLS"WneF6Lfݗ C#ǟc쎍ʧOa^K*GSV,<X)Ӹ6kMw=odJ˅zYcs,SdgWU<2]ۆL SRnp8=K0u&O@ݎ*=BlK6*FlNYLtb`퓊lo15KSoxx>bwj'ja1;ڇp b9,Ʊ kxg|M*k4`~y,r :fGsʱõ 2j]]nC\ʕɺx0އ!IrȒ*a~n bz MTصn.gs+zkd ۶a4EmZY?l7!$E{} b/ƥ
aЋ~e#t}9;Vw&(7v Oտ`" UEУo[Gwk(=ɞ'u m~=O6x
`ׂK\+#h
\-Eϼ/nb u3ؔ1䢝|ۉcv[cE% cA$˵`ׂD`WL<G$sX9h~J.ש _ԇx=>cۤZ\=vz2V{9پ@+XP%ʱǓhiYū3 5L`Ŗ4YÌu @ *˵HBmV2C IHHH`m{m;sM$@$$x#N`}v#$@}CwHQ"f+'ۗ3ck|grA)$@$@$@~ @\ ,i〛05}
'' >;IAEz= 76/r53 M+CWIH`pnU G 74ҩM+9`J *&@*.<N$@$@$@$@$@$@$@$@$@$``A *&@*.<N$@$@$@$@$@$@$@$@$@"1ռ?&JtiCB Xy .yݼi' e=6z..,F;~O4% 8M@۽iG$@$@$@$@$@$@$x `iy=/sW* cS֭ÇXX; &z %,{ؖ1znIjʌ{c-iI]e :HHHHHHH`
x`#شq#֯OI /.>2#=
,P1 H@=;7 sie)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&@w)HHHHHHHHHH @ HHHHHHHHHHb&>f @$@$wu; H .K=6"5u=֭K9XXXEd8;J: HCLO~ӭb RҔ]SKTTHOo5$@$@$@$@$@$@$@v ~ѭ)XYssPfS'ۡ:Oۼ6z KiN"$@$i# P$@$@$@$@$@$@$@?7;M7z .a(?&Wey[ &i @(kv+|R ssc8? hyf-Lkm.!IHHHHHHHHHV-WmQq 34& Xh^EGIHHHHHHHHHh6ӠHHHHHHHHHH`Xj5$@$@$@$@$@$@$@$@$@$F qo+%"tHHV1 }ImI-Op{ʔpMA I z?[b0; ,.bv]? `9s9Ѽ8x
Ҕ\ph7wk ,Vc$K]XI=V[96}Õe N> ]Ѱ[R"ϭݸ9bN? Į9t]!oQE@'HJ0K{:G !19/Ub$ޖ<F993CH@e}rO%G.]r
}jvdz ]G J2ynTc~7sG) LB+b^[k3*<ą܊:o_>ˢ#{J e [<Jcq<F)L43R,45bOWPo̜ .?;K(@CM\.deaӆ
X/åLn;ԏ5IniA45#/c(\Xݾ.\:}1x@Y|};ĿۿqDN]Y *fs"ܝc"\3_A'<ijO7EMiG g,jMna &GY}&>><<jy|ʉy H@ ǞFjw .\־aW[e@Gzi_pcJ M~\ CJVW %<c11x[( l%WNF?UhjԹ 1Շ]F]9^N),ۅk<bg:?a ۏqme4"/^8NZ8;"o,po0} .?[D/ً.(+ۿ U,Z{O~'5C+&Ք߾^T4OO /t8n^w
<^ ϊݕ^c70} esl.-3ؾbV©3H^,W&&FOM_V ڱZ3_ "P#4xˋF+-2u DH$yz={ͼ,~_`rؚ~ W\՚Z"W<7[ SS
)c!P^NWF i m؍gH+8y fS
۵/mӊ1w"v71v{ w<9ʳJZ)x7`ݚd}YTzk_?*'q7x]DǑFsQU \R<+;agfGծ:1xYjj=gzӵҿE u[N_ 4Fz3"˽,ahb<@z @z.~)lR )둖r((i< HSWcOBW.Mb$ ƨ :&do4oxM}*x+4G OUЮzloD'ӯ<Tf3 8G68w$ƳIp>8}o-yKJ0BԵX(7kg6njz|ϡRyM>|}~On5 *Tׂ`X˫Qw% 5vwTUbm$+U5ꣳ> (̪z0O=1og^t @ ̎NNeI<qc]O+=]Cu( h<) o
N @~cB$ ㇅ؒclG^2& }\dҏb%(~7xw#͊xg$}~e>.;̱Avx kÏПe':?5J"Sxt꛲ߠWTpy349 eiz G rz 9߳ۻ:GPs Hk3;kΠ% 5r kqno˱ v{#~*<M;LrtUEyبl ;Ѝ6Kf
33x "gSj
Qp֗ : (DAV*ډ@җ,͠b %V:Ch-DCY,F>gIa(qeYLM`3ᐲKA&qmDF Xۗ?o'vjŶ,G^VlN@Iiwpӫʖe© 7?\lL]1;>3C~ަl Ұ^`})րieӏ 4=ـҼLlͥoٶ1(QU9H/fȐY0-`0}64Due`s
<u'e2&zŹ/<rq. KR;pj'
]
:A@I*(j-D~]Z}pj_T?GCuߕQ2vuL
j-:?:زfE$.^em_|FDN@0QMxI]|0I ߹Y?~vl }^()fs(w s'*jXR<?hoQɷh}1G/{#ھ-So;C 4BuKm,i M# W&ߖ ̉i: C12K e=vBeIڇZ꡷_i:R:\Z`7.P +5"}] GGh&q8RncbnmE?BchA)Y`E_"5r& [L o\|9CVN"ύTC bE>h~yCxɸI
ag<
/ j/[f?'7<9(V P]YxMwӑ-Nى[CW䍪Z1NW,Sq*ڍ*g+ U;qm5pz_mo892#y]Ď]8D#>z=i5Z7l fkB.U|8Ӧ(܉iWqaӼ&2]ݚNM+G˩i <gKh5ؽ
o"(^~h@Jv4x+ yZ0~o6]$\k*H_]VZyyqTS7O}E<!\jوdw>@n&# ,GEVܛo\Pbȫ;O @2F9*D.;s,\1|riBDWpi'5&ZZ8$>#oO}hJCFpWaOa(+qu)~h5gUW}) 5u-eVOa oMPXVdzpCI .åt엥P._BC]9{M6p{iڪ:[PCǏymǰ{uVJ| uJIYO œOg}Z>
a6i==}Qlʶzb>^iW}.6St-zjNƌ}[K[zH8qI| ,{|[mٴthM+ v<@iOZc֏Qp d\] Hm:o0XTsV ;P8u]alHWp nj=kj> :hXKWNUxi =)@Qa FOٹ1dSeE_~\O ;@ħ2_{Lb,=j/*F&~v}%ee0\Kd^(ZQɌow nԭĔR_t$LYc m]]z:;+`0Uh
8 |:U2(%Ux
Vc zLO|8_ͦWI,G?حR6yǂ es:K8Gz9:qT˔ׅG! FBS D6\+VV5ۀ-x`edc&e#' 2yNq^ߺ'8KoNV6_F7h $ ~\Od]}Gҏ%[M NqQf]E{ʃ1Toc~F)Dy|=&e#G7v+f,ApKU = _C =en[?mq%\#}=!߰V!T68v?K .PU2_Q_b!y.),Y `{QBlܟA77=o#N[xN;6eEܦ: `ڏ5vsr8?o<m|حHCQ9ma{Y_ ֡kVf,/[# uXS/o ~QŶ|9 }X< AsG0veQ/MJ/-JA=^z>Yef$ -`o,j}kn)qpV\K +-YхUդr WϹ=gu%z.G.7\5E'Y娕E|3`Ʋ(]XhإǎQ7Q&xݷqS}ͪ>Txf}.Fp)ر6h|ٷ/?}'jԷ >5^v7}(3>ａ>[8T^PzI_P\}f oଗ!2eb4 ^u.=/. t ě;e4z8`J b˛|4{Ǽ3Kӷe{ j7bzn|/e41!iUA<S3T(Kb\ RC' 7ObokE3:̲' Kv]NߪwܬW?7^6ɘ VFsw{^~JMb oCo kzǬ`GAV;N],ñb?^ufGf
iZ Lg?Z+:hO:M
yo/J6 ±C2+;뎔?\ /I{V y;> ~2<a wj TD.}q[.o h@3_
\^,:6.x d䠦+'v y}_W5.ǁCFX|k
Y~`~<ytOѵ{t]ol"};yN1JJ=?ԾY9%|ACu객ڛp y?e 2&3f3=/i/_Eb/˗c _/duf<Ҳ-uj{713.
;spu0t6cvO9geyޯMfvYE٭w6sE~z}0,[Y2Nݔ\it;;/hx0ڋ5ȱ{SӺ3<3ɄK`EY I? î/7ttl$7]_;`M_ ?
lޢ P{::@~Zjkv [_>&uwM,zϽ뱯Lf7yY^t\Be7wC${!~b߿_;^uhdq
oi链~1n rmCӇpurfa Ob |>3 o5T{9g"GZPy݊v\ |WZ3 )! e %o!3>$;oGߵ }g-_Ik9;wᓫhF`#߿.p'=ow^ƣh?i
գf3\g.
qŚRF[LDqOOM5ZRꁾ
حD}?+wߍg୭YXh|2 AR>A˲( =d|mY{<~=?s(=y ҂ o~sQئhLmG#1 ICIfVғi1W#vNq_ķW<;Co/#I3v+O7}AڕS4͎|Qf_^wO7/Nf< twXs93P#}'\z %ջmgo_M^6k5h+GOmoܖsPx
*˒ 2qc v{peb99Uc4 h6۵egJ 7ߐ*)~~ٟ[Տ,l;e4Hk A~OTͳF[
H^%}
7n6u5]'o2y$3YFGXQʍPqӭGY"/kK{Eo饯9!vȌWT~? '7ӈ{z _g7!#CmIaΝxd֒ C (7.k'o`_wdE/ #DDK1(L-n-5c3lQl٪,.hb ^F{̶.,BGԌOsC?cru+gR:w3q">#ͺpO6}YNGǔiY4ߖ#2ݗ[K*] o!5ba^y4=FnĻ,( ?JH7+|~9\ \Vn̏Ucv㚏;ؘ`B ,%}'\zNh) \|+/T caVg0~<ӲYhLJEf ` -nٮ.'C!.xf~{;8|ťޅ}w}6V v>ю|dCʻM*n94w> G
!L$*6ۼq'tJ okQ9bQq,W kDg\kprWU.vYbhsc`::
5.^ MeQo[E"rc7,.yghgy60M2-6XOtC*| t2 hߍ.yב-]x{@;Z_]Ha
N8fG˱N 1ѤI^E=j
5BJfUMr{TXsG=pD}qY"x z%:}RQq3:'}cDWi4 A2NGxfC?7ɋ@eYQl c~tw3W*MK:1O,9Io
w̖/V5M/óߔrd-8{ݭ^p_Ļ _l툵]tҔA;&ΪX_E,;sxR[ԽqOl*sO_/vn Ys յlsBq>vC]ʠvd?#X߸OoxVz<ƏjUn,l;vel 3_EUZ݉ƽu/q]xe9Wp!`5tfV/kOV_Y?O"b)N)P\%k] ̽i7!Y$oo=rUQ(.gV[e mהz[ț.-9?m>Ř4(.ιXp \ʯ߂V<J 7ޯxH :QudCajWwգe T4djsw 0?cf?,:u؍ɟ?UWOmuuz%VU.EyU s`DV?Io _Ut*
Z0X '9Z9Lٷۮ{m՛Hyg@b7Nsx$;{-X#KŹNh?P"c/T0%07F}VYQscE,:.ȳW|
rZo5 dB9s|_Z<ث>j8~z-KQ߭Q?; =}1lzǷTuAɢ^UiT&bGt\gP+u'_|
\}~)ikkm s~.rIEMo0S dtH$L ` E%8tpԕ7^,˙tD"&Dxl5#KT
(s#}!G)1ճ
?3Tt=2Z:t !pN>t,/]%zAfxofr O3^d!ܖeH&;-߹ :tMdww(#{P%)s,˅O̒~t
k"Zg1㧃ؐb528)8Ḳj4[\)I 2)Z֖X< L t'CxDZ[m)1(3}Û7աEIgG뽹-g+G_o,C<)wRċ?TDs./6cvuӢL~ B]vWg@iE߮ecv ?و; ;Ivw1pǜ ;<T=N VE\Qg Yy.o, /}e#Z
oL2E}I·eٖG 7=t
ŻN&cE:nY.#ңm Q岬3'ډE'f*y`CtǨO"̇Rl0
57ﳂ@އWpGm^h=@
DL`-z 6` v5O~~A{^M&2+7,LflS^JY$gdDob](=@50v6IMFe2sLgěRDK#>nw)@; &O y(6vgRV?>Bi~4ۋ .;
b3tv9o_J6+2 ,}rF~f_$_(;nh[r[ne$|G)~BK\
O٭ ;ցQx~l5*hy^r
Wu
;a64Ŷ$Bu٭w~ى#V V"x>Tмydd)?=|YN9.cO Lϋ [
q=ܬ,x_/-=7{&#Uی15bKrjڎ]O1Ant\lT# _۴a~iȍ1=0qv- ) ^-dyYvP]1~wynz5ؙR4-^å=ZNaG "U]y$W$ !
^tfV.tFUOtDDL GuLtODtuj*3ˮ, &1cB d!Њ6Ϲﾻ}{Y~w>gy甿K"Typ_waalJg얊pVj{izFnv8숃 f%'#fbDԳ ~tdkMK8s(GiysJ CxgO7z{1~>E,P(nGy9Jw1}5?7v#TZpd#7: ViVg;۶
Y7&(N49GT`MSCqd dR</l7ɗ4vn|=.{߿a\TƈWލ \{G'Ԧc-Խqv`quZ><|[lVƲv8'k-\)˙Vt>t֚y;y|;[S oyyNYL: ^թIHN~j!5YON(i z;,[5It'5gf$<]q64ubA+qZ[BXG:K j1]*rEyجYY91PV 6Et
7 5u9
#*EI!N< W- -Y_݇ F"{?`'e6L%. ͒NQ#ƴvmf݃E1 $d"+l(-R>hRIjoO5ⷡ8rrj/h{ܢֱ+MI (sgUmvWMs 3 ZQu~W(aUb'Bb:^Iި ?uS6Kv -uyb$UZ_sߝpmDm|"+bjݐLڧ|]
vCd
Qh {.)z:'EO˳>; F1Dg懪R7;NR16S8^tP
]PԨ7{n|1.ikWqu$>>mޑ 9R< զҹ5;jGrVO% @ IDAT Qn}/w"x,;NӍvgz[ .}+|uޝXYfJ kד9$'Fzj4pX]{N'Bvy<t[ O=yRbZJQ{xⷠE|Ky%r.(ݎڪsB^]SXnټ,>Ցt^y?̤̬O] e6ngv(oMH͕+hyA%M{E_ܪ
H^6)^{Rb
k6\E.NZlں hڬ--@vf4ܭz:ёfm}b@;dh½yi AX0**-8C=-hni3z12"ӵ6+ai;___ >m $@ G 9 / (X3( 4
(r%gpG#kzL) < !dn[Lo&T*ۇ
UW`k+PYXRycmW#5HRE^J%kzU_Q]nJ:g@)3=~ wG˟zbmD$6!)yBpT93
6FtR|<e7!! 'ΡM1Į藩 ':aHn}.}>{>箿_rvr0چ~<},?VKQ@dVwu_MYà Ҵ^L
8 OH3 f^}?<iŸՔK P:* /gHxqFF#QM[kb\x<w$c㔧@d\r~$Ϥ`'z[w1J?ڬRV~z%IH2Oti:[
?9㹝b[ KS\ 9k_%/Rp]'u]<؎Aa Pk.I ?x/_B@$
+rV<P'W)~wM0] aV[i1x `n{!k4KVC/̋5V3:M/U1.8Fa(0O)RI ǟ; {u1 Q fGQyɓɎ1:[q/cBP$oHkg`w <,PL$N>+>t;x҆u((SWAvI(7o dw>o 2cL']^bv(8 2Ynn}
Ryz5mu 顏[`~/ǜ{gX2vgBL&v GOGǰKV.A+>b1iz<'nR#IxsSgrԡlhWd
hŲ^w}bK?~ލV>Ś꾏*W I_-3kx v eRb*ܼwgK݊4J8;d~ջ'soe?o0c} *3%}(g syBYE;o\|\*?Io9Nyp$_/C7954c&y)fZ:&e szn 'i2=IX_o94qy;T_nK$z0,EŠxg$_śR:?o,3
l7+
i,ǪU WLxeY[{?B& gid9
/}<gҼ"#s÷&hRp*~4M }s5B+b;ޱZ.5Ξ-Q xi* Ggt|aZWGh|/Q)7`gmY;K(x&L'{9 v6μ8e-qOGQyWcAFӆ!6ܽnD7}JLGpqAnKwΡvT/lZ( 3,8 ߜ'P.E'/73~m q. ҪԘ{`U7~.ol5W OjD?§sbV&ۅrW$3? gliLIUu^ZoO
S8}[LH0 s{O4]A] ?_cOޛ#_{`Lڃp"-vў,gq}˭oq}A=WO.7O{n .*DKlR2 O-Os^ۨ}
g IIsOہ6X^tٕ@vj_,Mڠk6_;Яs:!UY"r&
J]yHkI:r < }{<ip{PnX3ۿ ⯸'wOxBwx^Q7w&uYGk&-U} ؼ'U VH='5WuFBk!tv -uas_ V!- މP6kiQP`1fiBOI&6D#3n#JC({д~6dЋV( yZ]C/q/Q ibHpl^̢ 7i+
bGn~
͓G.UHC11 "Q<{(8$#ILyg{# x `%^xy
`-s}Yw?}i DN}ְy K}:Yiq :Zџ\PrX;:LO7a=.Q"c 0g Z-x9 /,_{iŦĺ
^ Sn^aKRwҠ2ۂ.- ZnxRhc |;up hX`W~ :!j[VOIxE3{h E~aoDGËgƛo N74A o9h#SI1|) Ko; шItĘ ~y^/6*AXh|j5"BgVvg [# ؔlJمɉI\g< qX4E MInwR>7Hn_٣mc#ںJ9H^ӫ W.P%?-+ڊ3҇fA$@hސJ"j1j܉y 7_/6bv17i3hzU-("N]_yؔ+~Lĉ`Y<u^13ئW<Q+WىOI"y? ( k@vM|<> {K;jN\ox3.;Au{C;}>/hʇ |L[CxV =$ yw[mwJKi-3:.3U]*uۈ؛qΔ}6p4F0gl
<.]-SNxzx^w5^ܯa˗h%M" +zqT k/e]Ѡ+9}/h~Zх'bYDژ l+u)[a%bٗeT,J@X'˓܂V7brQUYBl'8%DXrqX\2RuĤ=e/Ei KO} %hN,"ҐcGHyln±)wcO_ܔ^|/O˥ /R uQ,6Ǖ>IL^^%Z5 .lVDYs{ij'؇zN/n p؍D*L6p{LWa< X1 76wZ]pIl[ޏ9 [ncdhPcޖ6<W-鷢,~v. &E9/ɲKA ] =ri Wɦߺp.mt! p[QdnZ*E!Xݦ˷X2p@\R6DE"44Hlի052f.IHF^RTuQ%K )X ` 3;&֣mT /BQq Xi@)asJ=
IHHH`nG?m+ݯ:g(<HHV[E@.~yX~HHHHHHHHHH`{T$A$@$@$@$@$@$@$@$@$@+
+$@$@$@$@$@$@$@$@$@$իdwy?IhWJ% Ι⇭]Vňj*zL,
6 KO $zQ) L={y#!.SS [V,ghf$ K`^
ch;$d]@FdhВ& Mʑ LIE X^=Fo ֮Yࠀ-,d` M mK$@$@$@$@$@$@$,H3'&ߓ䦕Pc #@wU "
ޞPc #@wU "
ޞPc #@wU "
ޞPc #@wU "
ޞPc #@wU " @'HH`a d-l̍HHHHHHH`54ZjBCBիo<g0=3c;.hZ$@$@$@$@$@$@$@$@$@$ C
Q |ӭd \]S TTH xJnifw̆haN̢4:iyxXBCCL
4xLUP p@XxkHHHHHHH`I~ONLb5&c zwOGǐ g2zK˯& LV!# 얎ɩ6vK:J3'&'%mr (yftV[ 5i$@$@$@$@$@$@$@$@$@$@K
K8
zt ,Y4x/٪$@$@$@$@$@$@$@$@$@$@z4xiM$@$@$@$@$@$@$@$@$@$d /Yͩ8 P'_>ᗒ=w/rJ(
E ,Iq;{{.Rぉ `fcFtl\e$ D>$K/M˨ % XSqaA019>4YӇHH@z xV-p;QXN/(A~[x@N5f8>()tWܫurc J#o'r[SPrD8)pn߹n9` 7 G:pyA <
$avp4\ v+W Uͬx\ہ{=^M$@$@$@$ ,[>)P;3xGh:">7Vzݰ$3Q<
"A -qfC6ЁUV3`0/ٽc^ql y#ܫorc &p?^~UrX0 X7J
^ Öh5J (ZՇ O8s\bJZs |T!I 9>71 t4}X,4B묖sLj$@$@$@$@+ǟlxkq#TX맡z+I`1.`օ3q#K\ ہ{H^bl Xy}~M({3?W\d3|z.{5BxU6ko2f AH<v (FfbB_rMN^<J"+%kVٌŴ¡|$n|~f
}mpƛ&]&~UZ3:5 ٩HBxZ&9ΗwlhXpE.yr9 D8=A@秞TxzR /(݁$DX׳XG< fFuqeH1`1#t\q
tK2M>iGۆ<mBRṭSQLIQ[QS(D;B f&0>:FT5Ygh_Sg# $ܒbWs Mad +EMH1(YL[6 6yKۉ$9cbUW+Fa{V "6jcⰵ4N\[
qnFYl|o~鬬5cmA,
vs̳ L1jv "ɜoy * pƠdw!>tN2LM*<L2GM<E & 7kw zODmXpa_ߛQ-5'6Zj\V=Anzf0
*D?_u}榆PsW{%t%YKW/7.˰/HHHHVE1x#<.eeF
v6
Cɖ(0O4Q% ĉc{I 9[gW}~W
r-RfKxh 6h^&זm2 g= @wUx {u@Wn>vg ۪l)Q~ͥ)߃rDTO%M )ҝ-|ʦuk'J v!Y`|J䉝6f\lߒx
U{E_C\y($xk{cN9 ǏkQ+p(^Sw
9E';Rz4xK ;,3^o/Vqn0v u w18.o *CZ_ڜ][qeܨ47y<`$ 1e⩏P5 %\c<cבxTu5coң8~pDYRX+7KF2cd z壻m27®;H|/ nmT6mBqv:>=w5rˡԭ]ȓ3E&(tjUSV;@\]U)=h4ʷ~yu
3x2u3;g ᮍjH/9G;R#ֲjM!|Z$f'㷿x6L!Y\+
l{]~F_fIHHH`y8{Wl+aX*%'~$ͪL]+k4vKdҗNv~GWK5,
?0vtvb<]:V5vK4z#0zz0 Y#" TԳ^~ѓn%fJ ^ɏ[v#Gt ՟[bRyQ|֣)~m< z=ns|n ٯ%9<0=Dmh GiJ4'91͛ , aq-f&
bxFWrH=nq;<{_^,0d fȫn%0< {+Wxbc륗[neMGj.-ǰ.7Ы$E+qs{bP<5?Rd^FEj}yʌn)xbSV68"!lZ{F//ۋ5 pXQod A}ww +ͥ=>I.*桯'JԤmx7[=;Y4m};W~#spa]ƢHHHH`^[cy@ ,gjh߶"x]$[DH (b Fٚ]ǟGf e}h@)f! ݪ ogy҃8r@̎1s\Kd3 SO-ţQu 1܍h2|j3eK> oJN͓'Q(K̐ m;und >gFlDb*,@;SV;y8, @(GGU|rkӲ+{[ 3VynsC I()^+m?ʼ6/?A0)+ۤf"vN\~ QczL,Cf
rc#2V(1> Ch
/Ui%e -9= ƞt#mr"*GMgđeh>2cwV7ۏ VgF$$f-K/H,<wg&p߮`hMFY yZ6\:ww=,=eHע\X|tKt 1MKFhAw6pz.\܉oC;*%biv]Zk㪯GD`*$ o$ RGlJNA|EY|;,pE
x6*OGhk7/ _ 7 \ȣp`<?R,[wVԮ;
3)x fhcܺbR]hċvآ82ܕkJ~Wo,[IHHH`X4v
Ql3Wl}6Eӟo
]+F!-;
9[_0 +XYQs|th|+8\܃g:cpm{_<o^N" %GP{$V\;-i4j_7g
2]4zSv V]#~Em $am֕Ajv
_## %,z
UW @Mc߽/ VݒNÍ_i^ Z(Ssxk5mn׆^GL2sP8" jjcZSj>C1vK^"~}P%[s
Xxt
m `hG{|pYz, -0劽}ӏ Fէ͕S~tlDl_o[z ~wWW?@V9}zl9x*˺IY EloWe8sӕ7Ή'ta'/b-PA#RRƣ fO>@5vK6W)~<2emUaVaX{4>h &cgXZ&[ԍ{QMti ;=m/,c
:t762V6`0xHQ1H~KڞC-E {8\Fms?~⨻'s >oeq~w jn<B\l6}Eҝ o}HHHHVE1xo9C ln g*l/!fY%)1b#-onR%VLxX4(-M|)x#\m1/FTz===mHռiF
צU<ь(-C-bEu; _w曨k_6熆v iᦳ-P-|3v+PañA!DIb< @ fz&ڤҘW$As-lY6㖅A]bΔq]Mlv 7i[ wDI9.fq7tn5`t(H{<Yدh 7n͇ mR) wbXM߈ᦳ-w׃+n)u7Ŭx٨if$
]Rtu%GPm(/G6Fmob|ښa?0`ݩeJ3vg mc-;lk .7ΐWdq # !_9,ea^l:Q-`Zc-7,<>R4/ԡ$iW67!MhBlRG1rBv7".:҄h$ؽ pb<]6w+a+O} *|vjU.d/No%i㑻M=t9uDVUɚ{\X&
%/ϏluYkJm.}b7h;uKI9RɘK5Z%{"6
11e4ljn;J<apQ9f݂1 =Uuv7j\nTI,A 'DpBNno|D'ǯԂ^a0O.c2ś&jۤ>nrݽZ*]M'. >|eg
$$ ;%<dR,*D~ \o8</ %(2(zQlAggMO%85 Rgޮ` {zJ
mIԌɝ^:oJZ/uj.,^9B}?"⯿/ݐ⳽.cT+k~.1qӞj!-Zs@i_nn(&q]n\L:Ȣ\tj9g?/'zR,uyZJ#n["w46PǭeH0,\m" o:Ƈk$] z;Liy2Mn/?M/+ X y8?Z,.N3q,P[bBboF^" XX-MLω=yvZ^s̜)(k+ׁ~O*lz]yKNXXwk0W<qs&hiB{gXQ3 ^,ՅCeYaM/ ĆFF34r:|
ǰ b5K4 N8;wg tu5˛0C1a|H+2u0>[Oh\-DSYJ\kF%5j'
Y߯DϷ6 Q1|gF $^
ٽIސ3&?0Umz{J%-a< z^|Y^oۿY7^-/=c7[!nJ{a{4wk1VY- g:0HHHHA`Q ޫ j2ˢkLJFb'bm7FAuSIć~Kx(#c0[b߄˗w[CdAYNlI4#rQ77Z aHUiLN0V2V涵VQiPFnVזYMfMWz}q茶1 ʱk\~(K(ݱ 9,lݙvs! qztUJ7DfQ6f3|UkOۋ U*}$ߩ3hw?_Ԗ
EMпv ]Ɍ^u˒$@$@$@$@ N`6LӦkG0rIX%Oi'_/ KLw}vcڔjgMx&E7F:'Oߗ sQO3O^{U +劀a\3vKto;a֒R<Yo kk
lۊf@q.h)锌hZW\ 0(SEl*vyC϶c^iɈQmzH)N=pnS<ߧNBaziv؛Gsය
Y٘<j\]ubV⣯|o&U2;Pu?!,Li#-ega#TM4́nOe~cY˵X$@$@$@$@+20x-ͭZ%`_yvmvb25-j;-zxGGY^
SPT~?ƎLmvM6/1q]S۴Rl @/k5?tl_nVߩnP&@DW}MQ)%"8J OOuF9%#'CxCR^.jtñI1h nooCYivmvmYBqU~h/x{'=; cPP ?MVOY5#ElK3G OL?ǶS#}4]Ld۩ˠ7\o/t~,8 I6>E{ )gu{io$cEI/:zc._lq7.˵,vc$@$@$@$HVGAt> ~{g>1}z }x݁TwuY%MUYper£?ƚ
WQ XM[s
ܸJCeml.6ǿ/>Z
{tE6)y|GBEreYtX ; COV2<)=I]EܽLʇhu1)iځ~) <ΐFFqyaSmI߅7PO [Zыjf6h"mk ~U zppa.72K?+ !x0;uJyVpm* Q*+8}
wzĸi[<KQ:v6+<`7^Gusvg1Y8zR|\T09w;^9}}mhmmCgw?> ˟Z-F
V@Lv~xܼ_QDԆ8$%oBZhN\Mw\rجQ! ,Ty].o"&)8rLVڈgAyzH:[л3]5h bpoLD>UH]
kr7 X062n}|?:u3rJm5?ʐ|ؓ7j_]7yX u&2'E.yI
e7c5F*V/CRr-D؞(^!L>WY|\!3L/eR b؟k+6 _ )P C/R>
oWa0˹F`q) _xalDxtV!8#;*'PdA}(oyD|v%*0XO_Z+L!eNza~<8]z&e FqAMb>l^ k^ls1}D|,e g1&F6a?|hEm1ʙ| iyu((SAvmH;o+ݯϣk
7oYjr<;dsg
6;l wZev8gcZI$@$@$@+a8ǪpMJ<}Rv;=gθ i/̨Z5R~תt룍UiTbt &44Jzܯp<un7}Sop'n_x?],ZOk\x]eyhu0 ˇ?֔?^1>К-p{x4|inB?>RI+av?՝s0:+3L[.5Ξ0+)7\ hPo~ 54kgt㋏~V#b kgy 7 4ڹB:OqW;P;x6ɛQZ.شMcZ7Jf &uI5 G~.oV Ojn
V̉YDؓ><7s].~ZrkϾ3KC ΉJy"[ Cm}-+=l/𤼚f調qڸ)w#j#Uoũkc[z2z)as0ޚ9'Wide:;,\qo 27j XV;x;[ @b!< ~Қ u C{K zm]+Jt1;0ޯNֱ3P Ŭ1ThqDXQuQ#29؎/֤Ƶz_1MF5h/7LdMLjL#4xVl0 ev|$, ũ!8}h֯*EGfFD7P ~^I,2 khBXxo.$#t~œfa mAB9iMXSPy\loDtbr}AgAz_cnӳ1\;tdmݶ̡D"4k}lX>R<ԔŃv-+
C25ԉݖpjF Mܲr߸7Ί_VfY5fHHH`9ؔl*^kg&'&>rtt ǝcݛ}죿7C2s'Uܙ{&?K諗#}ee^Kz;[g(; ԵǻŌXcʞmSU 3JY++t\xbvsl1,'b7PlI>4/AX~iݨv7"[Ei8i/b#Ƕ Dxs5֡"t]y 5^aL<ghG~v]-~v陀HHHH`Xoj8^
hn8faqQRVLm><jxAL ;0 L`q4? b֎.<~Ym;.m.
ԥ 2Cb^
*
2-^u\ş*9 OSrLG$- r>z.T{7۞l J!@c`Zp6>4fj':$@nct %C`dhPlB^%VyA$@$@$@$@$@$@P$rHCkIH@Lz CFyL5CX2fV$@ J9H4lDhh~ s@m]|A)23 p
z;Za#@ ,0vӶԙ c )v X2h^2UEEIHHHH-a @ IDATHHHHH $zl^;IbPg$@$@$@$@$@$@$@$@$@$`A`vvvEH]Z
aᲞ33 7 "$@$@^NHA$@$@$@$@$@$@$$ L={y#!.SSY[V,ghȊR$@$@$@$@$@$@$@$@$@$X慱06n6CB-*.+H24hIvH@]C@XxꦃHHHHHHH`yxl}Xf
p33f[Ew6*F$@ LNL/ O*VzBiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH4x{BiHHHHHHHHHH
W%THHHHHHHHHH$b %27 XB ڮZ
!! Ձ7w~~ 31\,ur,ƙŠ<IHHHHHHHHB D7nBHp>%0TK] Z_$0̖H@ԑ: B|#Z !A'' ͦCu }&@@$@n s#6 ' V5kL9 ? Cb|--"-oM P$@$@$@$@$@$@$@$@$@KftLNM[Qy>19)9MFoʰ
ދ]̟HHHHHHHHHyfr+k.ue\h7
M
~J$@$@$@$@$@$@$@$@$@$@ M&HHHHHHHHHHB@^/)HHHHHHHHHH~ӟEEr S> {A03 &.Bٱ}Ȉ ~n q)ʉ"9\z2oZ"Z9ϒ %ˑN'Gg
T4h8 EHHHHHk~7x(/C8j+j0lK<%HFuEXO֡c,됒[-f7
ޙ;$8wgV}g jf4Bo]egXfa ,8@UZ$4ks' DAI."$itV~.}{sA bITբ"|e\:)ÅIls 8:qtyXh*< pƽ=]?{y/
> $q#neMGw
yTY.*$@$@$@^Xj2(:OZ ?b.0 E,*܅) L
[vQ~)J7kڻoa\y;p1DQ GCoK3Hc4kzv"; _EK@\6ppIن}ݮ) }G@~7/`עJ.^aWny ]\Nj)Gg cVkӺ_]y,scO{yxSЇHHHS 4NjIqEh$f(s┩Ӓw"3u3 )@GgY2T{q/3:/i&
;zi[+XeM #=\>ttXxIiK_gg<13%8Lp
ä|}lto=˲rLx ӓ $C' Oc: >ûs[rev|rФB4ħ>C%ŚHT&R֭YR:ք! z* g閿rj.?VtSA@jj,-+pF+s @G3ڇ[fK^| /lM2]^~ T9wzYևs)|s?>яRHHHH` 2#^&wwG0\
ޱII`9;6.ʷghڦTtu=`)|u|\R.0~I ,MibYY<} Gqr~ܟv*Я{pJ佇_x % @pd1<Pk-0ruMnORZkwwsg
Rqؔ! -҅|8C0h
ީiplSs<"K[,2?fTߨ/3l؋2 X/qFnב !1dbkGlZii=(ݒG &mt$[\g`I>7F@0?3%f?h82ѴQ$oU;c!V"9jk^0kw;\VTa[YQYWs90Ղoܱ[r~QY 055A4ݺ+s.jRJ{tJ>vG6A7a^j 0OŒb} wmzvLw<#,u,t$b9y AG$
K!#)kCVcnn 3&096ޮǨi BdKs!\Z=6ܽQePo،^lJ8݅HB{ :%?/i+299q#,|R DM 1(Y &k%1 ݭxPaRgy;Q$W7&W+ nx*g(ucl".f
^ix]ge![zr($FSUNڂb!eTUVjD-ܒNy>1''hV6uS/C C<wMrF>FԯTZ[welkWx|gVy=[=ӚHHH=c8
W'y vt hHH4%O5RGD gRD>na-/<b\$݊=pVci3nX-Qd%4ݑYwo|lqj0xydi1p̼m.fܿJˢH/գ% J-[+gfa\os%v"^}Z`,ɟqRI.c~=RSK䉝h9efb |SoO|~xt?2MmQK1! ނK| ? Wj^QMX1g; f(DO\\ZGy]桇_o<m/l~gfn|c}v9^>ieޞ;HGbӦ,gsgQ3k܌nZfFNt=`Qڴ{18ؕSTIv.+¥?]6)G\ =Tfn6g[qeP (J9^ CL 6/Ēw
2pG2ԓCpczQ ?ͼ&"'7YAo49h0x̌z7LGj+9L|*KWή 'đ!9&0g(=Cli!G<)*ڇW23Q= 7ΞÍQ;eQ]i?ޝ;gj @#`i<jhaYn3]̅v5ZMWn|rn-HHCmG20 ٩b|1օݴҗNvjy"" _kR,lu5`-R&i),\;=x vE$c>bBաף0vDdБV3_O/Fn~a 7M،5l4[l W?'䏡O4 |IQyì(e= ŗiJiRw_ ߡe -198g#")ݿ{s 2rݯA20i/*IĴx])߽Ztk2pൿˢ *锳t r2r Yٖ`7uj )Rg|y10Dμ>R'N36# Ơ aZ E&O.y ?y9lT {t7ɗlg8o*ǖZޒz)gyJs
EĆa N:jr$=_e.u
hz`ω"yMk}z_D-RgYg_>m K
c 2ZNg{Viq
ӎԮj9a`HWߪn//Kt>|K^ }݉iD" . ㉾cMW½F" ^$/DY:|yx4y;;YO{мv$ q&bV83RY}]ygv7Qe8yyuFT j)l*淭^P.
!E($I=ˆX$o[_}9 TTQwv ?=2$lZ%0t{@x .O2K~1;Z+ {8<gPeE ewjƵk[5zá4=:ܟFAy|WVYt!|.~*R!^e2nZq 5 Ε?~ 5">
1kzAK>v-/ x\h'i`} 앗Ŗx4XLcO+F"֩
bzL &t>DyDyؼ)Q1%:Ċ
t<42i mQ"wxz%!x´̝xU<O(Kht\U7PQׁLI ꥪ:|sF.OPSWƺv(%7Ϝظd{P b
W|
sݬ,BKǨWKm1Q{?XHHaz8@DsmTzn-fey@Khm *P-ϴo <Bi DI̮oג7p mKqNӒ#cI^L/Jh}p5
2Wc[q *uN
;j^mD/ A@EX nzu1KMhMfÈx驍❝ {[%cؐgۂ(x1:UŚ=|=4,H#gfclJ%M ]H83-qW~*Dc7s
9t\?}ҕjf 13B
Lʑ cT%ӿx ʷbTcLjX#" |MSe ri VRƯqF*~WjCb~N6{Xm҉sόKv4WvrIig_aV<jhǿ:YR;X<~C bMTvvD9ffmƆ<{<j7[%2^LQ u\ވB ث&*e5˖,KqnI6z7eǻI6:[$[իU,Q"+QH4 z33gڝ[q!9;3sqs8ѐZVuxn_E:Cح.ރvWྫ.["x[[;?{/0no'ų
W'!kD6$fpCQ"X!|ڝ4.ʃ[7G`up/td=v[ F}ni64q\}s^Ȳ4^xRnӹ ?Eqޝ940(_CAA(i$4-5;ָ>zr Z<xƼo{/w\K4J\\d2u? ) PBqx BBP0GU$@$@$@[ = nzC|7eoC.BY'NLOk@Fn+_sK~YR[ϋpx/ISV}8R -3钂GWn]ٸޛɞ-"O G΄Zm,KNlQC
RC1̺o-\6\-\$+,-nL47% Ck<Q{ D6Ο\cD¢9NrcCTFK6yK<<z9:mc%l؛e.[-^},d|<c ,%_rK >}>7
LI^6ƾ{>Jt~Iu[s1.ĩӍh˞kCoQqc0$8SR߇7fq[.[;} 'K}u^Bz[=* HAMG <)-Gvc v$xG
Gz o_pf'ҀHHH`Vp
y5cF=mΠgNO0 և64*2jy D 0V~b~<c*+d5 FK[:U$XhmgM*l8uܘ] [(.8Jؚle
E| 5yn/ J}LLТwZsg |%^<4_a bMa*y!K𭟜H͗Xz:(]bk ϟeoU^*Uz$ >w Af3un
މ\
yZ&:c6w nr3.p;H\ƃg5X^- m^V綣/ơ:7J':(Y-#b%e0Eq,\y)NƱ090 oW#[/7ÞV?+ DOvc- hnⷦT% &Z1 ݎיwRYZ b) Ess;V.1ܒE|(qƘm r1< ߽uӜن>4*q3TUCX햤˾#2z ^'ޑ8x[ŞKs% Iǩn}A;H6I?1 Q{D _^ ޔXd
k c54Wf\8 t{氼ֆ r kzOQy
k_a߬PUyn۫ulm1SX\ a@tUa,f;<dz\u?]oNSr5;Na"'nQ-RYg=>V>8ׁ+ɠxE wI.d S4" -~ό ofw4.q9iP} ZsbхvMVd] 3e 4 ^vlq <TO.ZkV|v|ٽ]lv$ZH)>v}GHv~3~n'
p^LDa؉TY7x jF#
wV }GM3;cعʺ `,X+a*mϝ1
l.,6CRSa] E!.Z}ڼ58(RC^f'SnƵ+QY(ֹe+q/d`Ϣv|מUpLBfu;V07w,Rb;}q۪t <sXWO_m,b >z/K9q|7p8|G4hK+9hGS UiT8x9GX9 s qK $x v\$k-kQLJh @|_¯[{3>H^cHHH&},{BᲳ18%8qC>%_s=.#)Ʌq-wdÒ|-B|Zdt2zL.gA &(+HJ%?/u뺘^y *K}cvLCsQb ␅DzM{dVk=l;yrڸn]fK?ZN⍟ AO Sw S*]6; ák7aCkS0B6uܓ jdnKk.PG !W}h^O:wdϡ~VnWb|+ܥX{ލ>ci}i1&u O_[O6 7mՂT?' {yLlgb ]wՂHbk8qz$竅4B> !1?9[ X e ߮H\/ء'9ߠD`z@HHH'0SonM&rnu
rZMQh@}Ԙ
d""_Zq6߳
2O$LO\pa5Nca4?oO_CYİe5 <#o~i mҀ-+1p?8hǥvg-f\= _Ur hmw<^%fO밥&f&#Aӷղ>}ZQYf?URDy_pY 9B7/SXJB`muԟ. n.v55nSwL pȳ <aky][Gݤr*,s㗈 xyz[syֳ;.ح\7wݭ¥
- cUWTg<T,(K{E46,XUvJT{o2_ g>IyոrWXW,v#w(Uei@r.O^;ٯ>TL @h/i$U&}ǘ]$WTtՙŦv\@[n4Յty#
\{e۷cgO @M ;<<ΨIֶ/-D!mgef-g V.DXՍl^\
wBkNMq"%nx:sOMr3pf-o}zډwma[[!w
t/Y>sNAF\*|,ᑃ'4 ǮCe̟t#Pj :h˳9M-^V:ҖuYBܴtP2PB tJR}|ss2w1c6`rz2([%?bD;7҄[?&uض)-rֺV֝r
"8~|~W?{7)C<{܇+#-'r|p8wﶾ { 1 sfn g5ؼڹtX DTZ$:oz}% 4t'sOGXs
45tnnj'f]w
U>ލ6aڛ DV[sFM
8[ pf:?q?x"_e
}OC~Jt7sQknFv8 )?><X KSʏٝX*G Džmն^8V D[<H+Dӱ jf;>stc
;k)@,_w kQn9(*%XYǿ0TiUy%.ݿkX6u!eUذ
G^:'E[7iَGLrdit}95'+ᐜ\<~r pN
0EȾrko
oҘ3@Y%J\fscW3&y Z"7_{_! =V]
민#=ʗ_;_k[pl,w҂\ۗ:Igߍ}5[_*jqy(,'ElO { Z7^Q ϟ"W ǥ}$S=I7]?'F_
4T-Jw)jV"̃ Gˑ=طv=6Yo^Y{e UqEÇ}ęBYwW x 8 W/Z)^ ۱.%?61KG x#˱cB|_DޣkFf~!ȷ,ı s]WY<ٹ]/8pN{[^%nێ%be.}%'D_;w|K?>KHHHH`z:dGn}RI8 破J{Z;xLT|`,gRb
:3"ZNc,,h֣393-n! P (>JY|,/l[ ['9 "ۿ3H u]*y0\,쳈m'.}9
TZjw:4WaMU:Z瑗}]nd)U~wxx -3JA ; ȇ"bOɏT iQF%WyޅVX|aQ<<Ό_ĵ;M@K' ,YkY\:8a?[;Y9Xqbx㘳ۦTn* wN_8\9{/#7\]cŋqN-6=_ !H\]"<-(n ˸hkP{ Vo[\VWn3W^}Vk vm/ω/ 9K6.Zۆưx9|%q/![u;(I kv/#<Ώ
bzm7ɏ|s(s?MՖh/=ݲ] X6>Kv^
ԏ]b'&v] Muov9=K*x £=E +wTܤJ{k?3vNԝuլ09[Jt O)לF8[7!m308nJB]Aɷ{]"f :83٣GzS ]\ 3ǿG_ޅCpŁk<*\bwO;Ϭm;1 櫸 3mÞ/Z-x'oGsH"FwV7 ^}ud.o+}Ͼ7ArWCxB÷<y:r >"k,ڏ::^{ >oVZېo]L&0Uz-:Fdsxp.Tv5Cￊ́-
p{qx7ᬄr̮8.wE8oz NnhJ-xΝk~o
Ծ ^0,'?|/(F`8 <w w<>8E \~0Gʟ?C<M38}F¡? ^;.?VcGڰ~G^ S\1OBv1N|\y z;~><J&x1'< L}n{Gn陰ֆw`'ȳl䱘LYh>2{05C];s &!q2(\s rsx ĉ""C `5ދp!NBBiX ^Yޞd
rEi,1`ΟD}l4tLKqb4ny@䞇+o{n9< 'Bmjp8 8xW?e}}ӻhV\"YlTF-)zAc/A"˷U++h?`jYc{>rs+6\P0e%jN/;;Q:m4T]s{CWs̎A5_V@yh{#NwKd ˱#4?=>nw1c QW {No> [aOOGw[#ε'ueG,n|ÓlB$PRۿC<q*Dɐ˺pؙ2 uxݔ&0w4 L1<Hq]МyVVEA rgT/=1 c$'xڊ;1F_6 ]Z
h4QE
8x5|5OXg 9mYm@nu3 &(8 g {"ce9yxÆlu)vsgmJsrv'89m8'?cΝ<scq6bh\a-&&w~ vZp(xQw$\]<#G%3 D/,)W8 LX
P[*Nd ڙD؍K
!ֿ c@.xuSc? )տ'fHHH`jYcfͩ>;ut$&{JI=w[w~'p\=.`ph9zWaING`5XL n `O(ZɲRg\3'4Yl<]KxfwÀ87W^{;n^Ox~U6m"izTbe
5$C=Ǖ" N@ r1͗b˾ߑlgb]T{JAkf=BYeC<,YWnpWIyfá;zfmW,CZ^ Vy\C:O@"`fp4j3*- >'cbQOcǠR{Z5~6╃cV/`>/S4;9*fx;N|N($hM$@$@$@qП5%x s
!-!U%zrDւ%jwY ~?/wq %Prsm*GB 9@` U&>Xx ܅ t1AtQ >\=Mw[ _ f}_|'5qs6 =5RgF HHHH` Dg97{ɑǂx|"l:"GzgE(.*@fV<L *:KM8x2U7m&@#_㙉= "PދP?e(*Gffߥ!5u} 8rwzs>xu?6`( _w(IMcv k#`#'PVɉr:ᙄ45E>/1S hPjLݑ LZv2a5>F7 < om y<-.lq$ ~"L)zOr",i2YA&&pS؞ܣIHHHHHHH*qDAjA;I)nOѓ $N@ 0qlI$@$@$@$@$@HIjظ?SXg&C@)y42M?OM/OSOpP|ꟀjW: W$@$@$@$@$@$@$@$@$0>܂T$^X| E|wCCF6';]<%J5 4bO4;v\
۬? ! L5K&WvI$@$@$@$@$@$,93y"
3g{cxdXP:}}AMz!v(! tJ (x&N?;qMHHHHHHHHp3U}%4~1:}q}R;wFƜDNH;5cֽp?!Тt2wlc;
ϸ $@@؉Sv/99v O`L+Oz-'HYYHOOKۤ U'=a䋻c%HiG$0δ!q<$@$@$@$@$@$0$W >fnecLGk@jtO< 9F# G) ɉ5\4,' ѐ t%߸>V Ĥpj@OOcҧ\X .5u4qq%wF$@$@$@$@$@$@$@$0DҢ"A
:qcXV=ݓHAhPq
:~QRٷ06ĐLIfoE$@$@$@$@$@$@$@$,qK u 7Ŧ7 w\Xz҃?DBai@ F[V#Oh!R; +W2i%qx]1O$@$@$@$@$@$@$@$0Iq\Ɓ= Y Pij {jxXfvP41H6t1
5=2 @->~$ﴉ7+oI^ss<Oq
HHHHHHHH@ jrÊ6rYD씔T"U~$-TU5· kJsx]Mo'xPͭ!̝[[ʍW`媕XXQf,# @hhlı aϞt i f}7 TC%: z,$ x34Z}B֘%J qםwbݺ oSᚳHHHHHHHHH`aQu5/Zo4>{yKHOϐiZ' bpd /n[u8!!NRoNY !~Bך9 B@ ۫dkנrB<c(zصn#'$Knj$!c;]
S16[-c248(b¹ L]JSZ4>A o^wL&#$d2;1[ӷ ?}zfHHHH`:4:8c# Qڞ+"%##& <ѳ**@Cbz-i|
!ֱ[Tdq# Nl?8~ w]wPw&$O'Hq5s.v @ IDAT^T2FCF QOȨoL#x0)nٲ+W&5 %0>@P 8
k.n''Y~b2Ws ncm>vJnn<qB;ЙM-P@fw0֯[g֔$@$@$@$0M$b} a# GtM$@$@$0!LM2<[-!FWW,k cnL6 {ګ"%sfL2훒 #68&3 (tV~`ҥ #7 |g1IHH`6PԬєcg-QGDQ\>ƫ2[n,({hhM-SZoم譖_*˛3?H ~lA.HHH
S0$ I!4?9"7r>b\՚jN%j Y}N^!zO[_NQdgg
9}#aa4]ˆ.(C5HݴK$x uwwҥK,qENL/8Νx&Xg- @]O#; EʭEp]UX<i} '4?Svk: <jFDXE\zKnTh6Tg >'!UqFΝSObݘ'q.䕙}hmF+gď*}^V/rbTOOf EEESkUߠ< uuu())
+㘀wf#[cNZ{wt u ÷ 7ͻ_"Y:ѱ pp<~\(cHHHf7_VP+cpPܳn
/x{'Yd #?{
<l/V DUz6DUJ0tOŇz->fP__oꉵ.*4fv3 >J,X0K<uyS ._7?cZZė9yb7w;>{ W>W~gr !C~߸qYK L[4#.y*|E"g#Q6c#t@|s^|%E@,B0~X *%Uf1*>H^YrJV˗K([ zJ=aUV_Q3o%|s; C~e4?>~VVŖ"
_ۦťv|>IHH`|doA֚c<cX(+oow%2Џ=?zZ~ GeXث?B [mjtd!v>8m
2jǥ L%uBGN]W|~qNh=~)'뽶0G^)vΓӹQ{߮]M7kä[ZZ [-O!O {ՉN9U[%z7774)qi'O_xJK|RB nt*,/M~1g=e,$ I #o.E= 7| 7 e卖 `qsE6eI43Ǹ:Ȃmѷsx ;ռ{0z)b1"˧=蛸ܗMyGW(nz[X
KMӽ3l '-
2>:ԇ:~?21{ (#" ;h[1`Dֹ Έ`-kL+[mvG`7Rh>mVn_W 5jgpk[{wAe^U/ d} "2Ds{w*fL1*~ը[ ! Skn7;8x3X839zɮwl^ׯnBds?¡kpeq\Z4 xm58 S*5шwѯ_7;_{ z߅Uː汘ǍQ Wgj *fkIiCm o*ԇߏkh.xvr*C= ,$>[D:AJ#k'P&\:K1~(Ky(_3~'Uelҏ Grl3LoS e˘gv+<ڻ7u+ި6EoJ^(-& YH +m1;G8z$ޭ0-<VF_}W ZkrO-=#[YZB̘},3f 'd'y5bUhOF]_>TD'zw@17p>}(N^Џ;ݻQ<nN03_3-zˋ)cns3gR-~ǰݗ.]ҥK=cgZVatAAN:1>}
+e60Ҭ^4ʽL|@R*c=B~mRI,[m 2kSOP~} \* 65
sʰoxmy)",_ ϹIK^o۽ƚAGS00l-
* e]Tl،w ea% ^EG22a5ٱɃ;sş1AtI 03sAmQbJT϶鸈>xZ `I<c'3U=dz\h+-3%(c_$@$@$@$0((M]z5bZ xy '\oO&KV|tq> @}PR( R $Ӻ*ӯ#*_E=VX$U|A 2ezU|M.kQ+~2fpoSe&>U))QIU.O囂 $@$@3~ 2e 6ݷo<O܃ 3Ӂ*߀-bzUo :GBb];jf ;;(3ϟ
=])ͯ <Q 97<6FZ߸5Ŏz||+kbao _=[z+އ< <7 ?xBq 4|o v.*
\[ʿx .%-;bS]kׁJfHHHH`0t$E_kP𭮂chk_&q%ch+jB@ocaOFSe wƾ&ѲG#'G>(ڗ.~#)GG?y,]]]3'L ,҇ (AmcK|q&?ۗf){TۻgͅJUǍHHf7ܪ[ C8nZ%dV`q<[PfbkGPiU_!ei3|}u-ŋTFT,_ڃ0pq*k߸_x >;[jZ}<eK6i -{4=gͦZcHIuP W>wmݹ=O WWP E< |QnģŖXu5|c_!L-Gglo {+~*j>=̐ !`\Zb\am{ v,Q)ƝA,Zڹ? ykbˍ47kw~\I'FR*< RN}vDoo/Νk| kPnWTu^w{ t
=1b{gC k|N@L %Z -[ME }~ j~{k8e!]zsIc{E} 7^k+Bg {lU7oOLV<߁{T@dc~T>xo7pmZ|wmY&K _} 2
_(,|t~ _ߦx|WO-à|#-5+tׯ_ݷR(o+r7~Z֢87
]ʏ oZC¾ և~7o1si~nYIa L$" М<zSlK-ci&*t0'gu7'oq܆eG>(~Wʧ=mXmLsVQ>n Cu<T@Kŧ|s# D@q|t\ڱkÁ c<+m^v,To
uã2c|J/`W~/TK_gm#;~ކEss rS> nx K;X } oWl_g~×vmw'8gJIGfz:e۾e Ldff"]6zo2hް6/BN_C Uf-e6~.RWocn Eq3mK#ϊQ1`= ۱C~d1vɼ(M>HHH`.oȵy2roFN{k{'h _$A X61lQ8{u?773mtlM$@$@^Jor2yøc30^\-c3"۷C|+=
&|WM~
mgxWғ6/}V^)NLv8Gv _<.177Uv~4 e
7x˔}f%n]sǛY[ z :k]5r^hLW-5o xcěz(vv#v9 u= ȯhn><thxaS8ܰ
WTI)
Y-=R&HHHH`Зwk} 2xf,3>$ WA;hWk&50!9n 6\t~>d3.3){ DLlI%J/_ ^ 6\0 ,tϲc+WO k|uH+ rqԵJ>Nu]ՖZYdQ3"+e^Y IŻQsz8z/IluXtix K-1[]7To_"xqi1o5nd'zn Ua>wȡ"FfЀl*яaoebvwU Q^fs^K*Q^Z,KD_O 7 A tW.jD7vzHbfN*cO--.]WOu_Ŋ
ކqݓ D >J*;;K}Vm++{|*~Q .ÉF!VPJ.lbhp+ = L~7F5ڼ i珛W/2z|t~֣6' R5$EqPm+ycwlGzy
J ~ibg_R㡐z'*K1Q)kvz ŅYmG oh~ۇ\{0$~T4e^^]lv:LmqGoi=ۛ'^n8 Go˷܁;ډs}^ڀ{ W@RXܤ/6Q gK[^'KgM40SSi|6p
ӱǓ]Z cfpu:|S 떗g<\2 %`2z`=튂u1}p,]u.[Ua2SF$@$@Y#-Z ll{;n;w^~dε!~ CGG K۫m۶. |n+Btja\!3oݼo#/ryAg}nvf<v'\}w<SMqoQcM||?~ۿܲ]f{ڽ/_<^{[3G$@$@$@Ӌ*4vu"^{w~5 &hӸޮҕ ">BWOr^(YG>
wLoFU02.o߫Ny/ˢ455 .Xk ˖- P}[ݺG0:oD ?f"dm7փ[ _YN$@$@Ӓ@l]xQ־]W!P*yc[*Y]cIgޭeح|M֮^5W_E Ɛ^49Gur]n:zCtHW3*/j1- Gδᦥ1viG,YPd,ş댟<z:RW}{ l[_'?[ #t9Ck
KNΤ("^{ݫ*ޗni /z`D Z_^^jo7 NTVad :"QC~;ȃb^q%/^6|oWPԲ#|2*:ֱk[ d,i4g1voOPX<o̦@@YAQY˗: wct 3E$@$@3@FY7uR@<58hr1PYf5_ 2B[<}j{T5w8 :jOHA <ՎU o[Y";di끛kg%Xۿ8vp0gjgڶF"̸2 CE^(oF@h-x:(f.BV.RkڌȲs$edJjKAN^ۊV-A^Sŵ<T-7 k&}!
=Nu}%sll ݱ6{ =]p}\Q̻7mDs#w߃]]5
~u(6W2mć|&k?>Z[[gZHhW?ʇ|&kRmG⧐)c n|(_'7 mLqT +r/`oy
S @?Z|{nѶ,Z^+}\##}X<vl߃^xvކZ1 |{vgZ>q2!ϑK:xҩϫuV<I %ȃ6q,m3V \~ ]}
_yNewiխc?Z^9}<^ / T$\88ɵy2r'ҟޗEBy7ܰfx;'>VNcWNZ{A`[EF t>c%<%e/%(4˔چy5*>ufeeBeHJJJ!3~6-V{JCR>}xgW7 A&33ͅ*įi{hhKLV|!}HH5B߱/H/k G hƼ,d-M湦'DlU~|P?~wX=.6~+p`GRڷM7nވB}^|o9;Fo JjϾ䠨l
W?6
>hݱs҆CV,=ų/\A_'|O]%yil>w/kBŚ%U:mIHH<-.TbV*Y6 ONuQ )^WeHҜ1uu߀vY?W?W6ɖ 0E_=Jf&+OaD|ETavj9~KH>jOJVB{i1&(mᖟ_ʨcCf5[{(PµclN$@$@3@يM"Өرɚ nx&{cm
7"P.uLidXf4[uC;L\ů?~j%>³c'qW +%m٧Gw4 L)ZEA~ ݿq a\ek| _gOm ~(.jH:06y/^o=H Q
6}ٰHHHfuTƖ<)iF ;Qjں{ t֥/ x o4X3͓*|)m픝+Y5#wߍ|\z'YCMo
sbyPe4ÔF<FvL,X`ލC,ީF|m Px"JKK)RPRo }~)!|.8e P)2qwm ^HHH`YH.X6W,
[GG&m^.Ҕkeծ`fܼJ:{ٍX_ <%z܌(} dfn?Dz^Jׯ wv * ~,6=/<0tWpύk% a97s?s*[! J+J3ܶ6?K:wݸnC%2<<SPTq4֚WJAr+^+??-]7^}%O9֟ 7^AU6}eHHHfuj\ Y;|ց(
tB)\ws
`^: ^:lXrNr#?~nDJC=M}(-\:"4ay,+\..LV---]\\,˜Y
K|j^C.,,4n5{"Sgȅ#8ٹy2]T|CC|↢Ųci} L~\A<{D};sj? o~bD_g 5j191"7śq5"7cleｌTd5H*5bpv1'o^!@HHHH`/ [t4y8%w{Zw.@x;0 [ݑEWi 9Ruh1`9Ѧ .'fGdxye+vN&$;'6[ lBLC
yJ\ C#94 er3i:JcdٰՉu`+%\WVVbyR!|+\ jS²jܔpߖ>N`a4]@%#Y +7cY҉ } %`_MXJ&I1r]Ngʺ܆(C"{9LةB:InAzf ݸb3{ HHH`
P^]n'BU S
y^WLrv !`; uf̌ 2HZr
#uSg$lJԎex24욜%P?XJ1 ~b- L<':̽, ۱`HHHH`0%##$۹D(m7 -:vn LO7aou287͒r
S$@$@$@$0] xE:=:<d;j
rFgxGgD E@i\h"d^7 t**crjat6oN[%B&L YVK_Ȃ,aJgȨ8 h
P
N\h"Xi8ğ]3It 3]ouf\ \WVs&f= t',-tT)ٸDIU@& F|b&Mjɑm zKMҘz!kǕKVN6kJokAF$@$@$@$@$`HHH`&P
WKڹDG#ClTcX Rj Lkfy;ᯗVٞIHHHHHHHHf St! 0mB!\9q 6;ǯ5s3N.zFY#$
p9F X AdhpZlڭ;k;_4!Z֯i`lVλ -՛_ٴXqG$@$@$@$@$@$@$@$@3VTTh]l-QU \o73
Zml>{| 1}twvJyNݔ{ D@4@%n̮荜ȓ +` p:1E*@P7ALۈ:8VyBx! a&sЄ3x)rbƛʝ4Lg ou-Du\0E$@$@$@$@$@$@$@$@$0C@Me9FpRvqtzm kMnvSBwXenԚ6`HHHHHHHHH`&tCN8Єc$)%fa E6ҿOE XYأԅ5:cHHHHHHHHH`A#aQڹHu33ottiL}zu%Zd4$@$@$@$@$@$@$@$@$@0? НXrhر1rA}lmK 5ŔGB{
'0gmxYV{s$%Rڡ^C r0 I=
LaL Rі03}8Q+MеnNHEv]g'*o"Zz熆!dgrgה N,m8808ebo9qԹ#j\[VXv# ^ļ ے L"+مn^ SYcEs0g ;})ӽ.L *Kď#Z[NAǻ__?GFobƥDT
a`pJ ގb+';oS$ u
( J L&#jݽ}t_xIFeEpnP]PY8ه+W"R )ɨv-2D9F}/u!Flhޖ +j ٦qPXbz<f[ qrEG X44S:nk܉a}s_NJCv*Tb>w^ MbJYL~܊,Uo2
AHW7 Җ /
SnbWV
RN [ r(KɜFoK5NN퀼FMTBif \16ʘdhWX'(fzNPo31:7)l #!]Xǚʔ5r#gv
v$@$@$@$@$@$@$@$@$#[]ͨMO@K@#atYr_] M{ǟۖGYi S9)w^kv Hy(OU-IHHHHHHHH`3:uJ]Tٿj*'dJ#t:'g7Nk s!~r{`z<lD ;-æL|R`}#HHHHHHHHLqW=ԏ)%, ~`1dzvHݘ l
P%LH9YoJN8^ tʥWS߸d,ibzVǟRy)w- ,Ȼ=+wS2 YL\z~).Ycg+_ 卬STNIy(vam O7ƻ 5sӛ!tp?a]n gu
{ٝR! 2XTeOk3AH: [Wro̎ oyD k'%x
wLC2@dnn$@$@$@$@$@$@$@$@$@ ^l8Xo {G42N7 [;e'|uFv6?3wRFõ . hK
Zz?Д$@$@$@$@$@$@$@$@$0m}pr;pA`bʉ*)T Sh*!Sब1[N
1O')HHHHHHHHH` \pzۘp4QC:FΙ݆X qQ,6ڻFI+;,9'`g.;2S`HHHHHHHHH`:NrF-srNJzsZLFq8:.\8=|8qg;OA[5.YP6} 檵[&.D[ 0=[bPe#rsL2^[+7&K&m%b0#zb% !mmvB&NI` szO y EPYYĎC% YC
CC~P̗2UY& ^ۭtslw;<s= # KI,oi㲔o/jmOF®v#[)h#J%xr
|B-& "h*#TIElJ! R<u;'6|ly
RGP 9
9Z˔ɈJm5Vr> -'? qW=ټ& fIHHHHHH l-Ph<Q `iF؈,b3,QY)NqgI諓'h|E )Xt(I ٰKvRS Zpӳx*jbyO|w9ꉎzNF:Ⱥ|HWX!k;N:99DJO6?֑ @iJ;4t FcSK{}ghP[5x,sd_u7܈U58ɇu.t3r" q:^q bl;6r ?(
q|}Mo6;Ct('d< - fu2푻]e,2;e'\EQ
5d $ %
)kWQ.S]s}Sj f*E}B1P{-ƃX93 G$@$@$@$@$@$@DTw}F)֗5*ʜcL1$m:V?`͝6N{^g:h#7wÂj,-} Un/
/4Ɉ'@y(=u9PBkiԵ;r~5wl =O-7 ~Q<Yƈ% #tA-^"&6
99'\ysFMuC > Ǚ@-=6@Λ3wwO+낅o;#uqٓ@rƱF`pp=۩/;4 M$@$@$@$@$@$@SڂTTox6w~bmFk=Cfjbw)m[LD*u5S^SéśuW{˾/Ҋ2-@Nn6Lin]-
轏WYC
;fz,.TGϥ| h`5ҮZ G8p`Nd&r m_+YBdf Mvm.0q/
jJW^()+@w:@hwV'V:.+P>78wRG~
>K`b\n[q ʹX_?::{a*,y˰es숊Wba Ʊ&McsU[nY9ru@>zs|ņ+PS/H]y
sn1lޞ: HHHHHHH`Rh P\,o# Љ̕=*pPYۡ˟]w"
b"SzA[Ѓ+u7~ X͕byr Us(݉mKJtwlXמ~=ɽ;*J뚚f9,M5u"tfyeUv/]
6Ů7_.،55}v`
Pw"XXC; n?o8 =(0[fQ\YgBHHRdZ!$Y21`Uvr۫^߾}?~kkU]Uvl0c[@#J4$ ODFdƐ88g qΎT Z0>=j5eB*U*B5"sV Dyi'PT,(`@
oOX(z.z+"!e
_p`n>!S\V#p#W9VqןKej )^H-vܯU9#p8 G#p8Jp fJg)L 4W2r.W[a]Tr馥]G "q.S<KvTĪ DX)%I/DÞ ) )L* .6[ T5W`!fwrz> {G *o+n:z[@C$|K4]NJgšF*TR k(B*;7
p(2_.^>U-x7B!aAQRiX@^yǑn{z䈔QL4@{pѯ G#p8 G#,@fl %B !YJXeVpS ÛKd{$Ш1@hlYM[j 07n^ٴB& y
/;K36mV;A~ݷ^>IAi 4lWy"M!2mܩc=Y4uJp(ݬnGѮQxt-vz㦧S|Z.}X'|CγRy ?m(YJ v+Ra ߺ3gD3 YŻplQSw =B_]ITNfA/, DOj Ž+KOun˷8NLztʟqrtCR6 (t
]mAj6 Rؼ^|
,s(yG#p8 G#pOn~f"D'7HicER'X2JX 6բqG0UMC$W Bхd+5+\D!|wޢ.ۇͤ1GP)qg:. XZoC$^J0_j u6ŋ bT (Ch5X_njx4uiZGTG 3ێ=1> S1A.|KUv A:7b`i b>xM(bY,^AM2sS2{:G<"JqQI`<[(K&@_\b_gaN;j¸8ϸp8 b @ IDAT G#p8 G PpȚn٩fiT
az
O Ԏ5͐.[hKh ҥCs7_YX.mJܵ]~R';M#ԌNٞޔ-oV);;Er)tʽn!.3}HLXw>Fz1M(fw\F\f*%j+=@G; F٭dŚ!qٻVQ^gT<#p8 G#p8IA@
&I)FŚ1tN74#v W2JK1 -巑ĒcDuxm.>'^oFᭉ[\ |YHl µ`{4PgNE#go\[0> |>ѼujK6Οn %T>h: ÷ j|YE`*7}8LY.]~ld d;; S= G#p8 G#XD3(BȉF}1,YFD;J QeUжĿC+i㞲QkVE/-f@2Ǐ) |%y_[XerY3ӖL2qSrX؊Xc i[䋏U:{ץ_>IVVN!$UpuU'+q%=j'eU=Z.g4<#p8 G#p8pX^c5D I٢95 BK_^ A{>ՠ=Tm` 1:RScGfHB0-{ܹdEG&cEX*w(T,_]^j!r) +'`+ BBώQծ^ UVZr+Sq,Z]l[G=8ox0G#p8 G#p@ u v։ NFɒG%
RxS FtJ>^M:]6s{ UTP ԍxi=%mN*ۻnWn
3fnH U(-\h'G iuz;fNL '9!m m ŋmv 5QRTh;>{9Oa b:=e/>zS9p8 G#p8 !m,.
Y(Ts^}g=-4 >6qy}7ܼu9p=֭SF%F-0D΅y%QV?|D=bCE+#BM6h'Sqg+6';MZ:.8c@ ʃ(?߆Dj 0?55H]P? a`hm^K-)+%ئt <k[$*][a]d'13" p8 G#p8 "BX"F qƩR NS6GhWocn9Z)e߳KJe,}Wq:c΄5
#r$,sh%)Ua$2+Qr=2U!Z[zly;Q_ ٫ %RA={<,vJź/Œ.vȓxp+[/6Z/=A(F| #92t8wǑz dQ( 5/@ >?"oZl
)4,ˡ>)Yc̐kg|y<G#p8 G#p⅀H/tܬu (z<*s+K,U~nS!lH,R(4̒R:sC
Pp!BȞYqe`CFS+(F0Ռ- Zv
wz1Q* z
Pk+Q/U 9Ҳ/# Uc_cߴ*3_)n
]R)_,95UFR6 N \kGwx iޘ 89d"AE\܆bHsʒD{q<ZzѮ(-GY xdz:V3_[ RR[NTΑp8 G#p8 G :g%b_^[N/h( !
!.W ;`Lt)b/ &|M!uXfCE-
6 E1=OO'Z/|n]>>#r%5 E 6Q֛$eXp=H.C ?:Ԭ [ޫg>CP&7_1OAvqRx4Rxٯ"X1_vմi슅v<O}7ҏ8Mw?Uk'
6T ";o!j^#w>Ͱa G#p8 G#XTb ۦpܚy0ila!oDmXDN+aF!<A>l
h1ή9}ݞc!47__|xCr ٛ%7s[LB |xNv #Q_&epľ g(dTynh9V<z_*qQ.E(]`lL.a+<a\<; :uɞC fr CO Tl݂4Qat
xWhQ&>k$#k /g0T4Ne]>5zty"x3yKAF0.v z _Kl_ G#p8 G#,X ۫t[% {Z}B}s$
W~_<=BK)؝8)v~~ Oa?ԏ#=ӏe§Do]L,.IvjQ\EZڪOF^H( yѶɖ0A䭣M kH={m]&;5֪p(Ac̤Gv`(b$ g삐:]aYWajjhl=9zLV XD={I,b}(` BX3. iҎ~+' ,a>qd\k1ws8 G#p8 G@F`,~w+Ϥ'9e^ n]:k.g&~5'!b %ҨaCK+ 3L RWSj.JQغG cJN Ɩ aMOdvxK
lЎWLd+e F+(z7
Q\U(EFg%}<V]V Ywr`J7b8(]JѦHT |3}ȥ6lŏɁAn!0h,B`>mI<le G#p8 G#XT!pjq%ݢDP ;-2s< I[~gs
gyꕌ@n+UlAA[OZL̺8&q:tEw_? MaL~bg (btܽXa8w G#p8 G#p2*3g.^ln 9#62*R4抌SB>'])]\khidI'llV߾3Ċ|<#p8 G#p8 #z6z3>i`KDSM]*3x*4B۠K ).!j~r fg4C#osx J8pb-BK!~l$Q:
r0 _\H9 G#p8 G#XzBM-K)㘃-ƨZn.B`а _ q"wjs.ș)H~lDjj
Udl$͢T ϔ#p8 G#p8 ش!YXzz 3́fnHxAXZiWf)$%1㳚, Γع9l~a O@BmO-ҧ.ω#X z1uKd G#p8 G#p@jj*֮M`U
n_`kƆś4Bp)<
giԒ+N%-{F63 (ƍ0>>KN14Vz+. o/ G#p8 G#p8 G`!0>1I֎ )v[۠}-9#we[ )|Q1 ˯g!ɡ}
{[){13IO_u05S Iݿv/@23]}@;e&N0r[3I#p8 G#p8 G#XLNNb6"&P$Q-įƚ $6"+1k%
K֟W⫄+XN)wT*Y
oRv? Q×c )[6nBxdtɈĕ
+ws8 G#p8 G#p8K:@#/f
?ymR$'蹐YK2s֔p8 G#p8 G#p;>ѦR4_ |N[vĤ,: 1nɔ !=ß.|.GST|^%@&jԀtĪݸΥX% &r&oUXxrF V˞sv y ,&1t{ґL:]>uUl m l lcV'Y3 j$2M$0 dT"wZZ'(ڇ| [um%bK*j[bQy7q #Z*RT w[po] )b[P1m%W">t3
-Afr{q(=O. z.4zW4Dʻ-"Vyb/I3ӏ"<
HKMw< uVbygVAMVf B zM3Ƕ Wc~nN.FG1KpSiN!Va~˜_CcX0PK݀J ,y)?z0 =KkBYX
<C%=]tg k uD㽎7O8:0
ۘ :0z ZZooL3
V%do #OHy<`IlYA(=kaknfC}]he2YnQ(gBOV> -e0?/
Jg9{Q %ВE!(c$wm7֥*
-&r-Uq*"_ C@k|)@r \(dgjny眨zʭډWdʝE(yc'Vbɝ|8&SyQT\wO&&^ɳgh*T#X^-^ "J:KF<$wjO")pԈNL»]/MG +>n ݨĶ6KHaueX ub`zyQvt~xr GT\=hUV.&i/
'w1]IZ[5= ,s<og<2q 9Bf!*wqI\.",}-LH\~YLAQPB-%nD=&Ym*}Gxux] WSZ)L<Zb;|V
E`vw"ʹm-"0>ڹjrKg?O\
062Ʌ6b<NǡG1Qn+=)U:(O╟sc4Yof 5 ϯALl!CywO5eI1kh)
O[q _}?P &fXˎCu)E~?-mՏD㽎/۪#cej ,R7D0"_%Gplt Z?Z~@<s2^D+טx,SXwT wp4n)<44D_|_byL]x3QMUcfj;&KLb0[s54aFqSįV<;Ӳ̊:aZP186_<qkWvEZOr*lc<~qV+P]wIܜOspܼ>BnWz
]m#"@ C[J8X)5Ƈ$2+8aʗ^{qW8*wqӓ3Cy)Li?vڅnJ}[)}*|u:DaY
˅Y
C@^V]I-xҺ86mų[KQ]&ÅeVt4~|%Ye7H1. /l[O^d0ڟ1 6<K"+Nx, B_%TUh5'Or{q2 eUrh YfxrѨV :53 6TtC$ln Oæ-krjJI]# ܩ8m3%
8>1^-m%z ~q :
OKPD.rE?y7ao_gC5jEe#< u6Ty ?GPcCfRp Jo6u.7qESv ߨeW.3C`vV;b*E*X (W3MzxK4E1r^xP^x GOGsc?K?qi]E/ɚpvFyPS[& ):z{;}b .k<<&Zsm%R$w<XkcB$g3r!kF-5/.Fv k⠢KxEhOliUd$]\t~)]RMJ.xfa|'WÚ4]ģ<3QY[9H[C )<Co&3^C$0LT<a_4N"}iDan6R .b[8a:>.Юt,r|0:<o_e96N;ထ<tH;{g'=v[Q܍YX&G11t -WZ2gcKz6C-!3? Ztmpn4r 6Cl0 uVSL@A1.d&['xft]Mյݚ;7>ށ2TlO71d>kNe2bO !U }Ѓ
eՕrG!1¡th*>k &謨+uv)a;~4`devsЏv([5{Q^'Y:D}A ATU4F'#s*n*+kACt3 _[֓qT'o$Z=iJ 'hC_Vt3gnx9lwD~<r 9[9K܌<ڥ砋a4:QhDgW ̝([;iyN>I᭴y?JMLݑ,c8'm)m5>=$"t㥋G8}Ӹw9?|-pn-Mls9zp2,@mMh5ĎLS|fhKxxo %eLPQtaF|3r~79:a@ݸyl72@<^^zgC>Eй7T6`r<a$ Qܮ{v۹VM[L)5=+qIE%D,2l @;W6jc)4~i\Asy1]5Ex.hb>*ۃPFd46PWGrOUO~˺C iipn@PyH f1i=?_ 8$P*[qC:Љ)_H_Bܶ K;A'RvDHp'Raaz:)"tGoݤ4蠬R2SThiLjC@;pqn$j ՛dw\<. EsUmbX|=_z vKeͥq`_Jhcf'e&ki]*1#⡕ Z^H-o`ݴ R˵ʠַ O߳
w]Y y 4;dض=gϝgQM ~{Z Ⱦz'{(- RGүcՓq4:fEـ%@7
.tݏs/x )u|v ys Nۥ }1K@mk agfĠ&05^\Jw%4ɗ4g Mz9O;)D}]4|9'e2 }g,T
J鬙/ژg5+~t>ߔxyi4nn/VuhVέ $̷UR +p>}}[ VyuIf\elyV T1'S o4m}Yϳx}Ö NB>v F?ttmXCuܑ>-.OXL{vyOxLR14Fq, ɋ濜<[}oIҼ#4r[ r) lux L4Rv)\ ٓv4+G1@b]r`[eǾU5@tn!M'j4^l| G.:i߁=O 1iPvsdHGl, FSvOa S_x[j~b&u%MIh1MiE*WÞHZ,1~Gꂿ}b_C
1m:k߱q/-bvJ(_"Wj@0J WǍna0֝
{bSa
jI|8T.MĖ;$qN'&Vz?zY+\SnaZ}F*8e {wD-m.*Õ=2Y-ioSxױ9m$hÊx1fxFЋ/*鸤3:ιkwns1.p.qż8sPVRH8~6ӗJ
uɛr=6'ىؔ)Ldž KG^47~ 9ZF!Q[ ܚ(*Nk~Ԙgc{6Bh /7?4)~&f:}7^rd|{vVtZWuDBZGS ڵª m8F,^Љ+ZDVq?y{0kD:xyr2¼c>pqLucԣ}̪wKr6Zy,V\3ptHx O+{os RǸY z]ޗl-Y'C7o=
Vڡa 0YM[ R6X /O|;ǥL: ]jX[Ff+
<TѧM!if^%|{32d@+V}mj :VC:c{I<T}zWeU{^ ,̳{wjv|P ص
Tr`z{phw{db-V_wglڨ' m)L:߹g9ܵu:!i c\M62xg$: Enzt^p3ԍȲvR0WK8I+0(dny%9##}Mu4{XݮmTGFz!e(O(PiG.<k1mrȌɤvȤ -}>,^}3}#^S}q {H߀<{[;٢)Rl#%ҽVe1
ԕjuݯSO,<N,W[:VV8ݹ zEt _mAdP&-9( t|Sq|ڷgч3XQzԧXt> hY2^ӫOX
R ;j哯bI&vЗс{]7;ѥmaLoq4w'^OZ\O J9s3 ]?w;bKqTbF/>>_cdm*g0dyGu eHt`r/Sh";2*dc U} +>;%$rsuA|ϳ7l.BeURW(U$?CM $tq#Cx$u]d(-·-× gy42t'-E1L>0J|I1"f_Ģ?Y3])Ev
QA1$VQv i"ۋA\9hs[a dۓPI"J(Z/'MD} =ݤr-(-ӳIkq sS?% nWxs#( *X@vlSI(q:<Z;?o _&! w6ᜬ \'3@3p
K7e)W)@S )!Qu ;~7kw?bwV]C.ͩPT[[#gzi ,-V3+tINցfNz}e}{1ru6NmB!.o3ooR'(
W(%{%Eyo^I(Nz16Xjy DI{n@sٯ_O893eQك^1tzys\/-qUt _7l~g:A5E?MnhR;ywӧosMt Mud͠1e<6`>z|2m.?K4 = VFh S
tCSl R{͟}lϖh^08 SgV.rOKDs %G8uU {7 }Dq<0@^'EXD)7wA<cр}#ä1Rԧ; F2
.O.Rh~Νa5ˋY݈X''\iP@!~晕 /O,h%4-R9
eK2҂H}s@Nь=S[.)nw)Nq<.pQv+YJ}
`iLvw!O
s 89ӹ%/WM3IFdMrOk/+\ j-[% eR숫A#ԌNͤΦlew!] V.+K +0ՉkeUyL{L Ln7V嶕OOqq\wq:Nm0^hn9}]=8'M-Obt\
ݻ*DU ]0-R_ǻ4\@ r3Y[:g\B] ,W<ܶrxЁCd*L1 .z?A$R
Wz
2YV2JZow?#~1r̠Q 5\u8'۷_[: *[ዾm8a;4? 1a<x; hg&ؘm k]8X/
5ebv<q5ߌ?^x0_d<UuD8Oy 7=?tK\Ɠ$
XX5[6{'/2sm`&ݒt$
ƅX ]s;L1@+x٫\*i>i`NbegB ]}VkeNWޠCCwu\e$h||4PgNńR x;; cFM] ?bW(/
4beM#g=<>/6' &v3kSa&iɷ AЏ!{/,qc^n{O~T2wŷy:ܶ{cS? an26ndf'
(~=
w|kꋖ{/nBu<ǹ;-WkrKo7}qNOoKh<ד9}z CnebH@;?JEV{n;jB7
^#sFצ+CSf~P +N^V&Xpyd&*Gt~!M
->MvOߊ2vn*P}RR }ya w - ^]sWq@ě+v+d4.{gDI0a[U= }y IftK>}} y//;M㇇VcK yr 9w7ŮqsQww;O霏_ dzevK< [8)A[q!u^=}]Fɞ=]μ '3'䧘y1%E. E
V.dO5Goi k<֬(MJ& xq FIbDƺ~ڋ7K@ mӲ 9m';IaS.
!lN䴊+nwdB|=3ӑ =&
*hҬM<#w]I.V0W'gU{at.UpudvUKfrǢ䘟+U<O<xqL#*f}h Jː{Lmd S{]N^=ĵn-" "k*2-nV Ko n<U <O;O1l(E)0w~_~CHmz]d[9ckZvYMv݊!lJzQ&\rssAI?ɭ*g̺յbS/P$!WL9xç=kj l95eq p݂*:JO3dׅ݅ GK
j3r6)C2;>b˫əM}y-_7ㅇzFn=95zgӘWhRcY:\/:N[E#1G!( &C7Gė=tV.46G2{zOZr2|cŊgXq'G@AB X4xￋ/7{H *iwԡ `t2Ř#v|5{A+J>dC=6_)إ#PwQOdTQ|{ƱuG&0{d&/ (|<wntxGY1V Irʪ
ENc:::8Jh)PdvzrpX`bЧ7Ν3;)_7bчe۸+E \1/ ViyfuqO| Ĝ/?He[=>Z7Xz
Ȭ!s=xCyg
5-$ "!7RYl'./5ӮY 9sOh`~0ܜHIp[>< }Kֲr2N{7 ݷ?F{1Lɦ|tb9[d61C}ʑ\cXA'M4ハZw:VES3y^u<`ErN%D㟄y| Kfd焬;VɊוe\ -[i27/:~^KKY zNsʃ.Ih +e'Z GU*Xg˥6s ? URP ,tέ
PGn?#RUvnk
np4̹ {Y ü;s2,g,3.F ? ZTYP fLQ37m$1vO>^)-IgfF
Bzp.mx%'ttÝx،\n{؈B{#R{=
3-8 hlZQ!~ӑmrgJA$֓Ae
P J[:^{ ܶj1^ROh {xO<֘l(ƶig`|J}nβZ
ߔIc0fئl'_Gfm ӧ-dZMpI}%l֛[22ZIwDѼ%i%{nGV_zvV NyQfB'L (̃fg QnLv~h<y 类븱&Pc<IH.@{bn)#
M hC~DMGlCK|ǙYj+Ŋ{_bkQZo +ڥFľMsˆ ڎ>k1 =mM8I| &ҵivO 浴lLVZĨxU6o/E xguSXiƨvbIa8H_
HLz[,pRd¹0O۵"Xn7uAA HOV8ٽExRJד) ej
uV~ #<(@a9q ]AyP|mKhmO'Eo_ &ZdDv6Nm.NH/Yxb8RMݯ_OR$s&ҫ1: 'ty ܶr|cH:`d:7!Ye8
h˫6u*AƲ mv]}n]{- [K聴4mZ=JvCI?xD}7kZ&Ƕʭ_t:wޡ%{&䵭ajكwrDeD# f e27c1n{vNJ<>8'y0 $k >wqci#Qxuy;D2vQ6."\[9KUEwh@"8JL?fBNMMӟLiOe5~^<_hRuM(Vq WP!O2ym92J\0,PW!ۭt.C Z` }*,)H
q#r:ȒL~Qk^@ĮC(۴,<bq>Ra J-N5kXV ˍڢАW66hy+ >sd>?^795O%u?С %R[^8ڒ<yN-JfN&#tii.64}8t72
YGG; ߋ'RjGv$%NF#2 jZM" Er:Nہon6ڀB{;?UȌ*,]ד" O?
; ny ܶ;y1j[=ۗp5̗tC#!:vE]-Z[>վ"~v663:tw Jd(f wvjov GRI?يR/e[cVR7TeVJ\ _B<OJw`zB>~N szU2 jM<qN^q,{q z=h-]b
jp`r=aat @ IDATʢkC@w{O-xa<w4wtD{q&&\ƍc` IE\Ys 8"i3YTe%F*JgRH=RP?DesSiq#?9J4J)rH,RRi㐹!2hi ?
j<W}enR(ok>hÝ~ecw~,zl qseA-zl.*ՔcSXж߾S8U 9nLߴ[7
2/IR NAyo "kMcm6I z 4 $iJbݶ&4WVN^W iٗp7VjwUrF/ii/϶ xdz:XzQ""Ccg5]CA_٥8(lIfn,GۅpRQ.wd˵QZV}'W;Lgd"{c." =ۑ wRm$R: ܶ8Pso "ۿį?i6xp3u@c; V)_ǻ̀? <z}[:3A)8ݹ -`xmbl<tW͑7J<<>zICeg #fJ
w4 Ga9Ùt(ދx^l)WwӭWa'=C-szBnq
;}6Վf[:'UeZRGC|t%~<9+DC&/^۟{<z~mڏ}Fq
хjۭB)Os[OsX:' n1+y^(=7Kh]2֑9,Z3S`릢Ωo X].F<q v<)RzErHD \4%n^ǍdBK DۥzN;- DE4Pր~# |w
7{6XVWUa6ԽSPԝ;(nwͨs/6LnuQ-itЀ *`Q%R{GrEc
Z͚"$Z\j8Ч-Y2硺^Eƶ^<v9[H
-$VXsBtgRܼ9+`N3ʕBTXP >G@^h։zeו3&pbu| WHG~DAA+:o7;U.J Z(Q82p;>9m|ImtUzL\*
%b^^dAVQ);Ʈ㵛>g>CP&+Faik,k cb Q]%v1'!~OG(<) r зȲi㆞QN4-Ԓ8.IMr9H/KZbeE88ow~#zybGzC/hb?αUl wϓdt畞HMxx߉3BpP3rn#ji!z(tjd"M[{h FI;-6J8ǽ?o{'~}G0U7e;_D5*9txq@J=ׄXx{㱎2{j]6փ4 ֤Zy r* Qb'q_/x} [ƝMMmRx-KTnYR*wy 7\X }~x Otu}gEN_$ov_q5 ?# /0Y2at#-3Ku32M/HMՌL(e9) R,]7Jpm-0{
wj<IY~\<oYsT#ZT~A
`>7htXbqvB+dڅJv
I}T<Մ?c.K5 {
y.}j1^ a \gٛĴM8}>^
n{j7m8pVgdDv~q1@4I m.|BAT JY%&nwB,5@LR=<ڱœNw`v+^.vr刎"{b^ !˟}AJ nہ6E3L2mEIgJ>t w"G;K]O0s!m=F)$s&@݃^;/iE1Ů?x ܴ;y籍zzKim?g
+QW2ͬ%IJSX>&C8p\E);{JkE0NJNm ٗܝ7CKR.anD4ngI〝Zlz뿘쮣
Yk)C=p=ˈǢAf ⭾<J垿@"<>6^$|Կc[}J\i ~ {<. jMmGblcX]d{ wZo %h]
GЌiX W)f&67":@ yRB<~<
Oԏ#N&35.L}>,و,#7C EQۏc）Jm;;l #P D ZXC9q+%0Ycyݓ,ș` +H]x-dr,fșS@v3x\ 8>}Rghz5&S)n;n7bY rDLfR#un"Fc -SR{eם@mT_aYW=ã12{aS⤖ۦL 2%ׁEv7-al?"qJ/v#ɮéVxzzuzfH6kMJſ 켂焵O-I `8'cݹ c#nnC Q,uKdgd -u
Rmbj4\+& }mT
9dh H`OZ{m<D&X6myüJ@fZZ"rrD2 ʽ/NN:ǟ`
9fn壇auƞ{I@$2~螳$D?O<wDcyy: (cO>Om~%ɢ'BumI2n4H 19]d6|#}߭ >E{ ߇u plZ6|M7uO$Xq_Rd
[\7Kc& f[d"2cy>:<WN\eۄM1 ~#j;KK&)?~_nhY!oxx[ه7uy8X}yJ0 F\_)0;"Ϲf$BZD}?'hGkhАpo䁉Jk5 ĉwRMf]᱁E6= m}r[*yI("GLaIrs?N;};aF<kk sUSQ}m3tKg;!qNSS9ya1nHP[Gs{y
fwZiB0+)$rMϮ|)2s@z\_qu^6o"dh >gnpFy: 3 ,=.T3Oc'-(8#ZσlDN07#`ed2Q0QxSl ~@и} }y}xHOѧiYTį \y2 G@V^ @gp[QC1CA
xQs~woi*WR[/ݍv.#d%)%,6|<YXZq_ZRL {NjD)[d Ȉz2r}BW:w?+6/ Fes8zgoD~@悮5u Upa^C>3͐f!CSި_ĉ{9++NcGXr6>o_ƕE,1x*dًÕ㉪¦Q>+f!2֖_
o;56k9TK56C }`!do,R` GtH ʱِX8,_>`.{ ?0Oz.!nǰi[[: p
o&I+ '
jG`#Ǔ_
NYRYZ&+3\[ğN~_ε?[n;JjtxhxdlDsC+ c rؘ:2V0Z;]ژ^hq"gn
VS_ {Ks
p8 G`"+jy8IG'I\p xK6%b$?)F>3UrZ2|ZkNJ;RKĉy"">Z5W3JV= uh% wsBm~$qp8 G#>ow pĈs&Wfi
t&Mp8 G#p8 G#p8^H1ܽ/ :sp8 G#p8 G#p86n =I(5;e
p8 G#p8 G#$(Y˲6)K6mq8 G#p8 G#p8++\5˵ڵA&L9 t cܺp ȇp8 G#p8 G## INUr
sI
I/qT."y`jj #ZB*o;O-7lQe 9Al
0P3V@-s8 G#p8 G#pn7q 8(.?*_<`=}wv{\nGRQÔ0)kY]SH/ G#p8 G#p8 !x WsǯfNlx //^9~Xgh\eZ`i L[x" G#jkp8 G#p8@ vx/ɻ .v#M@#e5c l/3*zo3-8i\&0Q2B&-Q͑7X r/#XjV,/G#p8 G#8BT@Hp$TON
\YRw"C*^꾋-':X;3+D JEW+fy8 G#p8 VHLλ\G&V{pb~:CE9MmH
Q ۉ YNOfgXIuIa㙨y% bj>n~ф JsDPPln]Ŷ0tL4w̏tXhZWYӴ.t@8(4O<817FY
Wm?{蟟'=v[Q܍YX&+-b)Cm~6dWC7C-"T$~hiӵGUy}UAm·4E%`ƭV}4"W {@]T}] w ]{ۭyS e,ف<=Qߘ_ <Dg
{Sʪ>ˆ2ZnrX 8iu~-ً<=b$ԉ&jx⥪r䬧1+?Wq7KDEm."uKM4.+-/p8 G#p8 {VZz#5OnoobK\f iXKU56 IF*It?*4|S\`B4T5 g'OjC+|ZOWɦ<Tnť n?B Sv%vÿJ7(}[y奝@Q1$e?)75oaaz:)F%|awEr<_]sWeEϡ`M`{=ە1 k1s
wF
EM\ an.q 酇#W9U!c]~ v [{o/mN7
(ҬIm!PuGk6>=&PKity-7ॾ.mzZ/<n+73_uesXSӈ7k_H5TmۃxInh9nzח3f{w/%9kgW<8=G#p8 G#fZl"B5t
>9xq\o |ɮC {tp1 l0Qvd~;~ l)NG_Wv ʦ_6x V ŧ M;
A*UƲ#PՈ7u) 1:%%o6T* ˴b2*WÞ*T1 ꂿ}1;<BoQnc߱qh(o-bv1(.@
_ 7*鋇ZwzΒO{UvO7%O^Cb˥ ey4y̦sݶ_ F*Zı G( %W' e=KlPו tp8 G#p<# n͡g)TڼV~rU-n"wxېilC lj:RTYj<) >zKI}hAvEa2~h潖Kv Vgd@/Z`
]mAj6 RwHglas:AՇ ,&
Ž;bFhڊ;p;TK&`vBÁꈝ I7n^ټB& y
/;36mN~ݖoQq$e+Ɖ#tCrn7e1փϟE沊pzt^/
[.GK 8@
N~ 5&Tr @& 6o]3MV. c?r]GOpX 'gmlo[>,^f2F*!*"mpTם I d$Y dY` `C N&9IUJNL[Su^[uOթS5N݇7ys_d^LUqRN! IX +2 z~䮽w[Rmw~Zk>kR掠djLS.B㠶Y6W/|;I3R,ɻ \ϟ+O#8D @ @
XU((WݦZj'&eo`bHg+
8sg|`tdP] YI7k\\^AT=M;>lxIw U4y>P?;z2^ikӗArblT˓j ԉ7 dϙ?!}_Wcwއ- ;n#8yL NQ~=0/< ҮFӮ ]#vP|zf.|nzO7
Rpܴ<3~̗ N][ݧ7AԤO7 n7GG]W{ƅ~qkKJ\Nei_|<
Oz@dӺu7;Oe{9'km&_)MNБq֩jޞvꕗb,U#-|6)Ӟ&kK2? O~.˟+oK8F @ @ (-Yk˔ő'hJ>z=]uq$)ý+>18M} XqU7Ay:i≓ $_ L VTTҒYwϛLњwI&b2C!ͬo`^'g'yIeBNic`s.ة & x{/'UO۩G<o.x56Twhy7Fnjd;K lO3v[}_VԜeE)⽜*닕 pܬ*?# =RW%+R.1T㮼-l[$ݛxI|ŋW4dZe%Wړٯ'eM;_lFpݱfi wћvc[`sBVnK.jQnb SCl/lGW
` Xv [ʛ^k\S58dʛ,s-raOMMmv5\ZnCe~36ބ\ҥ>3vs4}imm}v-(|uo9T
Xdw`l*+`jPMUkjohjSKc+TjW_' 2njU]Ǖ7_32 )sWVd OU?Ҹ|kK;nd] _iOrgD8ϯ?FןU#7n&\I85HE]BivZ襮^W n J6[?@ @ @ ;!0csfN~v3୳Ovm|}k[xK4[O' y|786#I&46>n~YlےGXWOT 9hw51aEޜmP7ZoݪgNQu qu`{o0nB&n'<rs8禧2xRzIW{
mR {zz lܤ=9 'G9$H5^L1|ַsh_+X}f
ڞTMlzK|n0q0k_@gbR}. 1dB @ @ 9|K3˳4&l .GO;Vtsl=,vn'Xx/"ZaTxϰ8tn[4/?5_pEn CKvn_?4/$Ko7^ERx:v
L\^'vhU}f|?Hfx0*ͼ-y6Y x ]lsK`ؙu,Bڤ'KT7aVg>n|eGWxs%$C'.R~Ua瀞efXwKkj]#_g趡 ^F;5 |;og=62<@ @ @ V x+ҙ|; ھO-ҧK)b >кO{ ݣm5wVmWN)}X0罎hJIS5A /bϺо}gIЎ+?;<Uj8QnOLk2ɼcC>/hYc Z_km^nw(v_ܞ%r3~|L s+(ԖƆ0)ޓl?O]3 p x'omO?=Ϟd<ÞΓz#8.}~cMb2{Z1J f
\ƇjGY4vPg!ms''&X|HC[isдMܥfVk8 ։=n+gOsV]C 76uA}]Wzzm~I395"Bk-s?ﻙɠGiK۴)~/_}KZI Vnڽtݭ
ZsUՈz21"O^XW\fAd
ʜ^Hh.mǟЗ<ԾpRV88{;1Odn?شC
fm2pB/gzE^7＠'uL)ج] U;8I}ʴ3j^_`4;+: b_*h x7
ݥ~7O
;{<_
.R*u1祕</E5ݼ 7ccWRVêז}k{
TXʚf-zϐeऽ 3bD zA}DgV.3ߐK+i/</!E> ,6jw
oq{d۵R `B~.͟Pq &@h]zTTR,YV} r=z`ڣ˗{t%rMU.=Fz{.iɧ_%^Ġz=1?3t)VѪ:Ifkq w.h`_C<0wUQ{N7&m':kMw&tǞ]гmus*OUMjUjzn4P ޯnͩgDS t\8S;vihیGqŇ:5 ngoSK24۞~V/Tרag1SJEd8>E8z?VsmLe봩hެ^֑Ssf`U5?]>K}i**7QzN8du :~xBl?zs &U
pgzXcu/z)7$Y?S' %SIv~k{۱0{etKW ,vգz;ޓ4vlxC_O룏 loٮ9Sfbn"V~g=*ȽePk[^ףvtGd %j]zow ѻG;lmv_DN:KX֝~ϜS/}oeZrJ>yw*/:3}OiG쾻?[Ui7u9V& 8d~ ѣA߸qd*v[ͼIyt)?ǯ%ÒύR_/G/{p?{Aсsm~3Ζ}A @ @ bIHQ ?~+x CuI/ze`荫x?-|~~lu??'uDeG߾`
iZS֔6;;~tK7EN}Ҵ,W,ҭ5~'z䜙V ?_ ~^%S ^1
L9iSdVm:4Q^czO;[|G;hYN :q{aGݿ
u 5}ҕ$>ND^05ZR;+uDyY&6f֘;uȋz'O2>ށffl eˌlۓ K^1 yq|WNygݛϭ{9vmA!Y^HyBKe?WNU# p
ڳۊMնw'CC7Ufϛǒәf9MLLӭ~}uja4Z 6n]IY+U^d
UzZWz&ƪ]yE i T]Sj̚ fu]켴PLyADW~zDS]rZT8?Յ٫ͺe7k{mզ7$)3i^+깞ܠg<n͒t}m2]VK;O~uK
x0s; :4pI ɞܪ%5>>YH?Nr-vg_:9oO&f|)A3-Us\Zef?Wu@ @ X1f/-Uy׳Ok֬j *k_lw )[=. ESɜRcy$f{}+>Or N{68UyVיGc~oyӃI 7'ZkA
k8tIVޅ/Ltҙ{ /St4lHD }uNd:=$i(|g\S$Lr6ζL sޞt۽XL̽? {tKռl>VYYK # Rx
y=<M ~x.w]~0/5KaW=G>Φ /| P=@ @ @ @ XE_D-?X?Pob| pG*+UVVnVy7{Hu:ܽPw=vWi9vk6<@y&05g&^ΙܥYƚ˚|a<8s͡a394'
έgMkf͒esP
4/%Һ ѹO3R2 @
LPP [K7ٽTZJ 훱:xJ*m:y4422kovPО MA:U7dlWeE
̋!z&;ӡn5C @ @ @ })O3`r<lBG'|{_B%vk {@|qQM&&'X;S?K;h.ܹ$[/,).0(/+g_Bfw*4_(xZׄ?==i3{=l
ϵH^H@ @ @ @ W`rrJFuފvC))Ğ;0sZ;mo
TN1 ;[*msgNִNmMлnFYuf7F7k
%cVfM[Yv< @& ŀ6שjnm+JUf|5=11`w+ɭYVyg 2x V{jjZE**,ҤY*Z
vϚn\n&
B[#Tz[˱ey/B:j" YAok6kIl=>1a Ao A'P@ @ @ @ F%rr^m;W@ ?jKp&tcYM <S@ @ @ Ho[vjM^s:i@:9u{eVMVagXSfw۽;9ύ# p
ܧZ3j-Ic.:ћ^ХnO{??>h+-qg{&φ {Wi odzo ޛV0&jsaZei# ,}:~;:~iDŖF^JJ֪r}66hKF~9VПz_z.WB_Tpmqe Kը $6 cߛ<ea}#*mF_|AvGǷ^ :tO4 L
jfx :Z?:=Ewdq݊_qʴc#zZ577qMkv: {$$G+Ȕa[o^O'=XJPÆ
HNx|钼2}\SiޮG>~QzrGj*KLxyY/
_9+:/ga+V; VmE}>7g Xrn6TkMI]?\v]>Y{6WhSuiguܘ /:|ܸ٫c_sU*vbIΝͤUQ`e%:{:3?bIoev5o'٘䨆oPOSy
}ѣ'}ТG *sôewJSOzhn~ ˾5_fl'`m%Ϲ1 }':{QnpG:Ҥo,mlCnTEc&^0dPm}Jm5nQSv٪GЉޙ Zӗ>6'K_NDZQU}TĖִU;Z ۯJힶ;l19bm-j-56)ZaOO6>9kag=vsYGUʷǚR$hnїvm;NT lS~=\V@hϼ|`&{C:Ic:10_xZ>ἴ5v8TzK&~ /)]gjtWWG7:<o 3nƭܠ78Iơ2(~?g4>/ǼU8ة~GM/ 2$a}5wL;fx4wsk' p
ܷ/̬Gt'K6l XCWj`pؓ'噭j /h/~L3klm0(iГO?
{'#9U`evcu;`"W54 M`11SPk{43k'3: f{hJ(.3<F<z ;y)bfem_j]d6|!1m`%GϬ|?wMZU7^IW?ow3 /R3KTfm[z)!r.ĘYt,؝xsN@ @ @ @`w~LZ'o^nRf_}C UN#K/>d~\ v5ڹ,Y?ԟ?S~i&)N% K0שn|9L|tM>wS{otoԠafv7NA7`FlvYa> xzׂniM }_u7I 7Lv ՚o g`7Gz6Sb) 7zcG {['cciaf:3w ޯ3y˕I3KpܵCz̗|c/ו f_s ꭷyʛo?:"-ڽzN%Lc^Iy1_x\7`ct)6^3hŭ
mkj EΌ%ϹiRmm4_-Iwf,XZǗ@ @ @ @07n͙+yfo|`tdP] YI7k\\^. ަ l<ꤌ;O<Yn} =/紵)\BI[1XV5SfiO Rï1@лnwӝ`u<kw(Pk y\MiWTiiW @ IDATݮ;(>=3O>7=fvn)
8nZܡ-ΣuUWK>_)-fu wn %wm_Ro[űE.)q9-}4x. 2>?}wtjr-z{LL?ow5AZ;[/ &md]sE ܼ9fuU ;1ޒ?R]CziRD):?ekyK$I%@ @ @ K9nsAr7f~
N^|n']r~֮zϽ`P_'<" 7;I4vu#752O
ce׃?5~Y+0IL~mUgY u㗢SvY_r턌w6ޭOέ}g<YK$P+r2g$;gy="
z- R6;2>,Ս6AqK>-gjsRD'ݥX'iZ." @XD)u ڞvE:>xYLM;7"3#ڹf6mlrdimm}v-(|uo9T
Xd%ҟ1[J7ߟ}|%jS3KdY64֩BAyfY;ɨHqS<\!2`1uXZǝ}Vԛ OU?Ҹ_Τd{5$Z&o$UP,$/LksvVrYr6xsD-˙\ >鎷T%sk),Sqn2 @HGXCR3S 3
V砙k
YĄysAh͏皴v;G1l
f j=:rMOjOq |M[j`j.`&]1O_yƯSSo=3yRbOshY3b7g)t hZd>UYd
6vmK:Y!Mf9KbfiˎE>鎷T%skkjs @"w_~Ѡy1Yz;eHjCFyMhfK?ŽkGȜ5 hG80^'C`w2 xrUooz\~ga]4EШ6C<.MUwmFY"ܳysy.Cgb|̋S?0w23+e,z~V+q;bfoسjꫫTY-n<nY}̬m-:Sq
L̗i/ҏَ7g{h$Z/] y<E＝NI@ @ @ @`9Vd[1Vmi(%O@ȹl;N}`4Gh[M,]Uիd7yzǾYyp{z"罎IS5A /bϺо}gIЎ+?b[u:ǁ)?q3OSWZ' vg
rN/I2t ҶV _zQ_:~3Sȍ?>LKne_Py`ߕطTVTkފz{z<tƛ<UPZ-~åφuz?BY @ @ @ ==ԪUsgoxğ=_u}BTpU w=ɂ%ָ^}>KY$19szo7<XFɼnV7]<h6>U;⧱z= Ek< P-|`Ndkڦ
U n՚5/ 4 zVJϪ %[-:w[\z ڐuufɊdY,glS sZܷ=ygny2x6i.r0WҪERgs+-[z|XFqhݷ':܉\Y;*ic{F/eT. [\7OѾl?f&F5^~ȀF}5@ @ @xo5=YfGFFI35ʜcTf }I;ϸG*ejۘ#DPYi?P}s|;z~GOnGw^Pቓ:oVج] U;8I]ʴ3j^_`;+: b_*h 5
ݥ~7O
;{<_
.P*u1祕</̕5ݼ 7k4WRVêז}k{
T3ʚf-zϐeऽ 3"vt ;κ37$#Z_&= RZl yE3~Va/!dIi{YojN`^Ӆ! >ϹURGp@ @ @ d _{{yc+P>99d:, o^^=<X3&YZ/84aZ-zj._ѕ5ݚWC's L=?n'v~͖ncҖxLjP=Ӟm יm:hV ~]ظ
˻Ig4`wb)ֶwUQ{N7m':kMw&t۩[*nN婪IQV_t؍rj98J] w)L:nuԩ wsmƣC ͚Hq!z3_
tZ7l{YPg^-/LTX,Q ֢gb/PTV= g6²uTv4oV/ȩX93~Lڪ F }ҥ˃ƾLT[ר~wֶ̚8xv9ݫ/k]wې+:~/m[y\"f9OZ(@ @ @ XB !5U>9_NR,}vgXb_Sn 4Iu5fFٕ"=!,Jjkn-Xێ9+K[
/|7ێzTy~Vyg{R=暟.w
]s8=^oG 5? OT߲]3s0اͪE٭zUj {0ǭֶ&G .}^9JԺ1 ǻO0<:q3w UwL]cMٲ|1)ѳ Gӳu5J;&9_2xʴx|T^
uf Ҏ}w~Ңo@s^UM:pGÃq 8 (1um99ZLJ,YrU4/"A]?˗G 7xs0' d$G߫n=H
nA ݸU:xg*xh0?E, qUgкe`Ϗ-9馉 }~OꈸUG߾`
iZS֔6;;~tK7EN}Ҵ,W,ҭ5~'z䜙V
H[¥_>:W>H]
^T{sԯkzy6 ѩc_|OfqwXMձޓ:i})Z~VfSG~N^.q?{C #xvGMt%;O>xEQL8mJ ѻ7m5ypí1wtE
O+zǏLJ;pLw6#'v9awwvD}fַ3/Yj.$&q2d5xsT=
Yd߾R&K!= њػѓjxTXx:s`w۬< =9ӭ~}uja4ڵ 6n]IY+U^dp UzZWz&ƪ]ayE i T]Sj̚ fu]켴PLyADW~zDS]rZT8?Յ٫ͺeefVustYb$eF?m«~E=ǍYZնtZΎ.1<:o.)4ÌW z%'0&{fCs֗
gukzm9~v|ddFbkm-Ic%y ! *l_[Ј gsj*(g/sR S$_dcωg_ޯ([2
CtX]4fc xScc$>+Id-e7ްX<1uJUW9rSy?]oW\}SׯkSW4slwٿ@zyHJ`dP='g->=ؚāKMPn{~|5 Jgid_]D'ב2E瞽OAv܌Dᙩ'yN0E=;^"a&~3[l 2$m6- +i? $&IaaIxxoVT<M ~x.w]~0/5KaW=G>ΦU/|Fe@ @ @ @ }[&g}2] In^w=e{eu-f+Qc#O*>[g`#yK$A @ @ @ N[ ҃ML_|f[)53V`y4|s0K
Ｊ g} p| ,oi7-k)߽{l 0;[r
ꭟDo娴,~6֫LyŐyZzN plϾ=14@ @ @ P
E6ŗ&I!@; \`xB @ @ @ _NE=D,i9@ @ @ @ @ B(@;B@ @ @ @ @ 2 9@ @ @ @ @ B(@;B@ @ @ @ @ 2 9@ @ @ @ @ B(@;B@ @ @ @ @ 2Xր|.kRԉ E`I2*e."p,klybU7 @C@ @ @ @ T`\xx[ *<|ZӟWIOO&E@ @ @ @ NПW:_5}`MRdm \D @ @ @ @> #ד=(xuu~Rc ĐVX(i&." p <29 85 Z{4
GΗWW^Y
T>%C_,H@ @ @ @ esjʹݽ,i-wL ,7OY@ @ @ @ iJ/P\`e]p#:c/I* .<gfy4ds>(@ @ @ @6Vە.I3;;g;L\wMI=33e>ZV?&ߺ$-G @ @ @ @ V-ѱP֏J*../E.(
՚t3v}>c!འ?W6WԂ\@ @ @ @ @ WVT蓒J"G7Me'&4c v߸9wAP?U7nv4 oQ_*vl# ` \+Бjļ&MдXKQ~~ gn#g Zٙ<LN5Ŏ4>>aZn[/+ٜjZn;is.$٧VTTҒYw[/^655sdffV 0-P4]'OyIm4/̟ҕ-G%uC @ @ @ m1&y],X&69]--Yc oнUTyKu-4ֱwsf 'ZbTyv_Df
[3ٲ_ӦmXܰd@ @ @ @ щ3a[uMϾN;-v''>ɗ캧*r=fA3ѽ93xߙ&S* +ps&g, b/`b*> {h;t Ų:Ae}hy3{sέ[23;_$jID`uLA @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ A @ @ @ @ $@;@ @ @ @ @ &@;l=B}@ @ @ @ @ F&@ @ @ @ @ [P @ @ @ @ @ @ @ @ @ @ @ l#@ @ @ @ @ @ldB @ @ @ @ @~*T}X* @ @ @ @ @ Cfx߇N@ @ @ @ @ {Q`.)i @#HA @ @ @ @ X^@ @ @ @ @ r$@;G ן# Hw )@ @ @ @ @`yx/?OG @ @ @ @ ȑ AR
^^ #9@ @ @ @ @ ོ< @ @ @ @ @ GsI1 +@{yy: @xb@ @ @ @ @ Wt@ @ @ @ @ $ , 9 #HA @ @ @ @ X^@ @ @ @ @ r$h{ =b@ @ @ @ @ ) @ @ @ @ @ , ݓ( @ @ @ @ @ ;(TV(3??驩> @QhZeb;>_ dt*ȟ}L<D%If S %&Y<i,[$H*2]h<}6{\(3r@ @ @ $L @v )I.`krܼ퉂n
'ע*N -٦5k)/@vێFüx:zz9=`_Z+9Jʎ )<cexvNqjb_p3/ϗd H e{S`4m͑}ܜ&&-6@ @ @ H!`7*UL/0"WyG1ggg5bfϳm5~**vm;*ײ}>yyHO6hY"/ό:w_lEOMA=j;.M-.w}^_
&,Vq_4˰Ϝi?5
H0D)ޙDz@ @ @ H-gشi
es&5of:uV0+ewaa*od
Zۓf9bllHq?_d;~) 6 Xvϛٿ3'ҝ Pa̲5EfVv;U&]$+}3cl@Q*լ-Ta|ޖux=8C @ @ @ *--gsOLu v8Κe`M
TQV@KXg͚R3nQiYai|10J-jb@x (23|W5 (ߟ`ά9rY,sbgf2nm voY˸ 2L)3\ViY=Y-p wP~A)wP9E;_r3~X$ߊ49
?+ 33#9 LZL2l63zɦDgRg%:#Dw5 "@{Yؗ%l tH ,&=<ϦϗǝX+8 ?&֢&Oi-@3Lwf^F @ @ @ 2kx[љus(UxDm -G @ @ @ @ 3C!T@ @ @ Hp&v2yN>~
k5
x&XB`v>W%&<7wt<fȁ T| MMؠMUZS9i~fZS ;縮+ b% wp5I$EJ%ReI,;Wcyʓ*9%IU<NY k<eJ,HQ"E\+
k| ~w9s?6\~钻oˍ⋽(%Knu,o-] [d5%H5!}ru pͲA;.W]ˑdT:ikrc0Ҳ,+왗%c( @ rO>*\ Wޑ[YWkb+eAwa_N~Nٹ)u[mwmX7n>W]fyԑn{Wy G);4d\4<ɲ xW3f @ P.N͙8Ҥm^yٝwN;Q[K*_ UvU64< CcԺuvbE^岼lY.}da<tez1>|B 9,: %{. @N$}@ @ @GJn6\>% ;"_ΆhJX\D\+eL
Up|x$M>1[_H1 wn>پY +ìk ~kgpqyD+o>e< @ @24ӏ>/~b֏4W^yKvv8XA: P>=v9}|3djr}*W\h$#i ޙ@ @ Olj*<OOG.IYjZJ,], [!U/;D 1p>tE[Y:J&տU|Ɲ}4/ޛrSY o -[hM푑!푫}߸JX/K[Juդܿ! 7($gSc=*n=}7%;6xiv@~Q\9- jFi
HABȟI 2x]~dv6^! x @ @ @[8OΟ9U`ڭe/l ; Y+|v bl߷_69}Pv[F"ke.YwO=&ڐLRw`l%o}R1vپn֛ex]"
Umx6=r乬;_ӏmxU# f؆ #IDAT7iR <{>$g
@B; @ @ H<VYXbWEFX(P#bwt߽+CCj<1./t Vv*}v5t/>sG{ vAzo./|9Y$\[<?-d}}U9|#ܒ/ ^ Cٴ<yCLfvet2ʖ ;ѐ @ TX{jV#s*ikLF}]Μ(.t({}^oYjR eC S˥;ղٳ_X+
@kg{OiSǬ\$wn'n~yT>l4%LGA8#?5 DGXt4yY350CZdhx$t ϛ/WLK7YI='Ϭl/xO^9~ӫ'`3 s"8 @ 4O ~> ?$[ݦ{buZɍ"GC'? 9+kSMҢO;q7 {ut[w}uk'OUٴvo[nSNNFS9>g ̵bMhҀM!x<[.ϯ+B!Ur@9Hrx
@ @ (2 Z<~I'CvhJHd y!CWtHv+]z]+WnGAݎݵ SS_ea _ fY4@@H@ @ O`a>6ѶzlXD<_Rf1f<vR/-Q':hWgv
olt@ݒrOw~{;)E-v-}Bv\F`*h{[UN@ܓdW -'=&}6T4~L @ ʆU4gDs*q%
NMC m۴G/hz GݢWr K?xk!?Ց2nWv jZǶTny=% ZrdF uܻ{ɍ??nXY^a8?.8ȉ, Pِ @ @ 'l m+VB<B#q>|tܾ#jOo7D<$ ? ڪS\DoNܥ4O[y ߑ=s}⥋eԙvowl G.3] ؽ?=F~{I۟tn){sZ{'J3O$n 3IJP`
@
7\gGvjl}l\Z3k [_ʯ_}GQZd[.}LG
jv*erߍei|\EkPpqL}66@CٶQ =<v{=/n}W.G'_c! o_ NN%8rȻP $qgxs fB @ ;-Y;t:9sG_ >9r\6s ]" D+jX ob~+7li6q{]xՃ\NCi{|27s*|zt>aVuWgwoMɾef9m尜l%]f}5! @ @ Nٯg_[e˿|iG̗%Mˍ/T0O0`oԹj{䱃/V݆iW:¸~K{Ik}?FH rEK_o$?ak/kpן hsߔ l_7<ʶ=8*+Ղ4, @ P9>}븬^lhvT}Gv95 zōZe%r
q1rgչwJVM+L|,[Q.pOsfgu$NE,]&T~R /wvyv"ڶn /N_kRjU/ߕe^v':QYdJ{vBGgNuͨHòέ5vk=j1?.?Ǘ9 )ߐWˑAʴQO
L i!%x7 K #%@ @ @['-`O#|}z˲u۬XvnSrK."[ _똶ʖ i kk䕟 DdOc? 5S:~į 45</vsom+YSS'>$ߖ'9ՏwI өg mZA*<V?q3wY߫#̲kq)N"y'ߕ ^d^ϑEJ! @ @ HkrW/}z :\w,. }]}zIw-gV*KGFedD}#O {m2v$-y絿C'.ǛxVaP7G{_9) \o
5`Vs>.)c7;_9|F:O>O
v'Q*J1<Vw! <^;Oy0Z[ +EqMC @ `Μ^E ȐkmrQD @jS264,]qCj[!7(˯:|Kշ^F ܔ˷qEZeeR71,*!sMn0ԪdAC,&z\zgKz' FȽK~Qjj}֍
qvRz r# ί-Ui'tvP_f z کֱͲ}m-'j6븪. 4tz\/rJV=b oB*pii~4Ngxg|lg' @ @e nݵ˵ w|~/O}s+7q9VgJMsri9=s2RJ~'cANlI @ $k{'tf&]Q
?Ûu @ @ "0 5a6 z_^U#`z @ 0[ƚu5g0O;2e-,1$e,ơHWB
^_qeUǑ @ :Ԥ!<d. +)M V.@ă @ @ (ֹݟCP|Ƒ2ƴ6[Cm 0_@ @ ʟvܔ*v}եKOx3G xܰ@ @ ](kt] = I2(0y) n@Ua3¸@ @ #ݓ|1 }1&\w~
N?l BFBS[" &@ @ (* RWWﬨl TT[CNLuP\Uh^ d̫) S=/PL !C~1$ @ @֊ckf .)TWWKAhASS5%
RU5G&&ِX:ͭ#x~1md<dd!x6Gwg2 YB @ @ aIR2QM?A) s284ɂ3`XSjQ\/7LS:d풔Y?eʖ~P3DQK_
@ sOFmm/jn(4˟kkj,[ ^?KI˼jYdd0}Z<#WT}!RS̤IX Pc yy"abB @ H`R% Nj ރڜ,{jgogZ?skg-4b0Kc TP y7BQheH @ E@ݮnӻVn9 $066v掉E!H .79bL -pۯR:>@ @ @ B~
tMct!{.@ @ @ MsS{"dWRb))hC @ @`(c͑S*s5weX,L @ @ @ d 3h
Q8]={{E7[nS C;n N9{ʥ @ @ ꝟu\ʼn%;C曤gA1 @ @ >캡Hf̽ sXeyQPi;R?ǎ
---N Zn}zooXu^ @ @
%`vhM90fE.Kkǖfqm1TxOȖ* @ @ R(55YwS[vf[\96^˥ eצ+<sqmYmw{Kbowĉ K X/<gLFFGeJ}288( Z\W @ @ <IwG V,ۂ0 @ @ @B
˄: Zέ@?5G~Y;56ύaY/ Ͱ8UAw MB5tKt,6|h v^ CV稕:dp`j:r#uO=e
uc֎AyA@ @ $Ⱥfl1 4 0/?! @ @ DA%0X{ 04vxb m77~ۺww8VOx><J @ @ e.-I6wxMW9/L @ @ H*Y;M
9M!kɽ DIę=ݽ#UUU2:2"
Tebv @ @ E槵?k(Vw]> 2 5i1^Z^IЩL+b @ @ "5?KvA½j\KsíL}:nМO{#M쥒eDv 266*ccIfA @ @ C@k}Z_ .{@H*O4 `
@ @ %i/2qT;.ʸ\JXUiOj
2
@ @ HiOk~֗Vf -
bI<St/&tۉ ^+u]]%u244]'D,@ @ -vkOk}UJvK+-0R#4r ]~1'#<{E)_K-H[['>< AuϘ46Woa @ @ *;G-[k}-9G96?T `J/rҽ}d[}~#twݓں:;A=As @ @ <4222" ب*SzJ-vOGzp=&MsA x8Բ
,J ~*أ]? rrR6es^KuQZqf9by/CŸBvqŠn?vhA @ i
QRjcz qc֟=m7Ǻ+fqj}[
%`WC B*u&6
[m1C<{D:Xy%-Z*s7Ԕ FZklp Wݜ o^7qmЉŲ
q~h?7@fֽ;>n5{d:c@ @ fMt9Bq.|XQmu'bC% 핑/=bu/a---=?>ݒ?ڋ֤poXKUnެ7[.YآVO_zMfk
=R(ۭ~
q;AtZy)oC @ -%|Y Cl>mm >({MZ.aoR7*8n95~K|ɋoR*Ir-B='g@^4SVz9jx\]gi로@KzZP
jT5'v4vމN`}ӗcvꗜ&?gӬMpو VrfH? @ @ 0H :K?mo%rkq~ Lz:azH-xyXWaZki3vƒa"֫W<y39Y/.>\wrzޑA@ͭdS m65~ow@ @ nj1^9s8L vQUz ۆу-NxzNWw-azctI#PwS@+یWRV6#U7=NaQ DPv^/MF{0;+KAt$}8lsy:r @ @ %I+Iufn5m,M!{Z8z:\7jF12vѲg=\v /YAO<C1ͣL7Kh0i7Ejn
@J#n6}3uآnٯX #`M*nF~gRdG/ @ @ 6|tqJ b ͕F؍}Qt }hpN0u V)➫횟 ydFWPO0vxVGU bD4=@~:n?\݂>Nܙ}}{?[g + Q]nOw7 M3S7)C @ F`Zts6^r3fIw|t2^^!F8w3'V5Zt!`*N&p*Uj^a|Dۧ.,ʗ!xT" e->qnI_ jb=C2:}Cd<pqfk0ױpN% @ @ ڌ_^ !K&>]'f apݏ*N!\KqSO7tZ~oX,r !v<RO x ub,-1Buza['uXzYf
tS5(N8wQe1!"&vhq%M @ @ ]MMZC0RmMH:ŏ鷅Sm x^!31}
;dw
k$hiWY:#eN $xE\#4s91 8^Wp<^86'㝊1/DZͽWݯL·kcWw Ed un
= 2 @ @ UL5&rK]dc0zP}f8]֯Dq}?{jNk
xhyB"PcjdNyN{oE xNG{7i`A?]HP/c U<f 1)B @ pU"gQ
i]g!dUD}S duJn|pP X{}`0F= ұ(V-F8D4$0<WTi*B.f[T,@\{L>O_cg5^roP @ @ (s /8v^\_=\ ur{2cSwϔw6TSP
!Rč ʔoh0ې)׆; @ @ 8f6LewQӍ?S_T.QO IENDB` | -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/util/ConfigToFileUtils.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.util;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.List;
import java.util.stream.Collectors;
/**
* jian.tan
*/
public class ConfigToFileUtils {
@Deprecated
public static void itemsToFile(OutputStream os, List<String> items) {
try {
PrintWriter printWriter = new PrintWriter(os);
items.forEach(printWriter::println);
printWriter.close();
} catch (Exception e) {
throw e;
}
}
public static String fileToString(InputStream inputStream) {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
return bufferedReader.lines().collect(Collectors.joining(System.lineSeparator()));
}
}
| /*
* 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.util;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.List;
import java.util.stream.Collectors;
/**
* jian.tan
*/
public class ConfigToFileUtils {
@Deprecated
public static void itemsToFile(OutputStream os, List<String> items) {
try {
PrintWriter printWriter = new PrintWriter(os);
items.forEach(printWriter::println);
printWriter.close();
} catch (Exception e) {
throw e;
}
}
public static String fileToString(InputStream inputStream) {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
return bufferedReader.lines().collect(Collectors.joining(System.lineSeparator()));
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/controller/CommitController.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.common.dto.CommitDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.service.CommitService;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import javax.validation.constraints.PositiveOrZero;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@Validated
@RestController
public class CommitController {
private final CommitService commitService;
private final PermissionValidator permissionValidator;
public CommitController(final CommitService commitService, final PermissionValidator permissionValidator) {
this.commitService = commitService;
this.permissionValidator = permissionValidator;
}
@GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits")
public List<CommitDTO> find(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "10") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return commitService.find(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
}
| /*
* 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.common.dto.CommitDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.service.CommitService;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import javax.validation.constraints.PositiveOrZero;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@Validated
@RestController
public class CommitController {
private final CommitService commitService;
private final PermissionValidator permissionValidator;
public CommitController(final CommitService commitService, final PermissionValidator permissionValidator) {
this.commitService = commitService;
this.permissionValidator = permissionValidator;
}
@GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits")
public List<CommitDTO> find(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page,
@Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "10") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return commitService.find(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| ./.mvn/wrapper/MavenWrapperDownloader.java | /*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you 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.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;
public class MavenWrapperDownloader {
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";
/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";
/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if(mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if(mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}
}
| /*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you 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.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;
public class MavenWrapperDownloader {
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";
/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";
/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if(mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if(mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/ui-ace/worker-xml.js | "no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(/</g,"<")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/xml/sax",["require","exports","module"],function(e,t,n){function d(){}function v(e,t,n,r,i){function s(e){if(e>65535){e-=65536;var t=55296+(e>>10),n=56320+(e&1023);return String.fromCharCode(t,n)}return String.fromCharCode(e)}function o(e){var t=e.slice(1,-1);return t in n?n[t]:t.charAt(0)==="#"?s(parseInt(t.substr(1).replace("x","0x"))):(i.error("entity not found:"+e),e)}function u(t){var n=e.substring(v,t).replace(/&#?\w+;/g,o);h&&a(v),r.characters(n,0,t-v),v=t}function a(t,n){while(t>=l&&(n=c.exec(e)))f=n.index,l=f+n[0].length,h.lineNumber++;h.columnNumber=t-f+1}var f=0,l=0,c=/.+(?:\r\n?|\n)|.*$/g,h=r.locator,p=[{currentNSMap:t}],d={},v=0;for(;;){var E=e.indexOf("<",v);if(E<0){if(!e.substr(v).match(/^\s*$/)){var N=r.document,C=N.createTextNode(e.substr(v));N.appendChild(C),r.currentElement=C}return}E>v&&u(E);switch(e.charAt(E+1)){case"/":var k=e.indexOf(">",E+3),L=e.substring(E+2,k),A;if(!(p.length>1)){i.fatalError("end tag name not found for: "+L);break}A=p.pop();var O=A.localNSMap;A.tagName!=L&&i.fatalError("end tag name: "+L+" does not match the current start tagName: "+A.tagName),r.endElement(A.uri,A.localName,L);if(O)for(var M in O)r.endPrefixMapping(M);k++;break;case"?":h&&a(E),k=x(e,E,r);break;case"!":h&&a(E),k=S(e,E,r,i);break;default:try{h&&a(E);var _=new T,k=g(e,E,_,o,i),D=_.length;if(D&&h){var P=m(h,{});for(var E=0;E<D;E++){var H=_[E];a(H.offset),H.offset=m(h,{})}m(P,h)}!_.closed&&w(e,k,_.tagName,d)&&(_.closed=!0,n.nbsp||i.warning("unclosed xml attribute")),y(_,r,p),_.uri==="http://www.w3.org/1999/xhtml"&&!_.closed?k=b(e,k,_.tagName,o,r):k++}catch(B){i.error("element parse error: "+B),k=-1}}k<0?u(E+1):v=k}}function m(e,t){return t.lineNumber=e.lineNumber,t.columnNumber=e.columnNumber,t}function g(e,t,n,r,i){var s,d,v=++t,m=o;for(;;){var g=e.charAt(v);switch(g){case"=":if(m===u)s=e.slice(t,v),m=f;else{if(m!==a)throw new Error("attribute equal must after attrName");m=f}break;case"'":case'"':if(m===f){t=v+1,v=e.indexOf(g,t);if(!(v>0))throw new Error("attribute value no end '"+g+"' match");d=e.slice(t,v).replace(/&#?\w+;/g,r),n.add(s,d,t-1),m=c}else{if(m!=l)throw new Error('attribute value must after "="');d=e.slice(t,v).replace(/&#?\w+;/g,r),n.add(s,d,t),i.warning('attribute "'+s+'" missed start quot('+g+")!!"),t=v+1,m=c}break;case"/":switch(m){case o:n.setTagName(e.slice(t,v));case c:case h:case p:m=p,n.closed=!0;case l:case u:case a:break;default:throw new Error("attribute invalid close char('/')")}break;case"":i.error("unexpected end of input");case">":switch(m){case o:n.setTagName(e.slice(t,v));case c:case h:case p:break;case l:case u:d=e.slice(t,v),d.slice(-1)==="/"&&(n.closed=!0,d=d.slice(0,-1));case a:m===a&&(d=s),m==l?(i.warning('attribute "'+d+'" missed quot(")!!'),n.add(s,d.replace(/&#?\w+;/g,r),t)):(i.warning('attribute "'+d+'" missed value!! "'+d+'" instead!!'),n.add(d,d,t));break;case f:throw new Error("attribute value missed!!")}return v;case"\u0080":g=" ";default:if(g<=" ")switch(m){case o:n.setTagName(e.slice(t,v)),m=h;break;case u:s=e.slice(t,v),m=a;break;case l:var d=e.slice(t,v).replace(/&#?\w+;/g,r);i.warning('attribute "'+d+'" missed quot(")!!'),n.add(s,d,t);case c:m=h}else switch(m){case a:i.warning('attribute "'+s+'" missed value!! "'+s+'" instead!!'),n.add(s,s,t),t=v,m=u;break;case c:i.warning('attribute space is required"'+s+'"!!');case h:m=u,t=v;break;case f:m=l,t=v;break;case p:throw new Error("elements closed character '/' and '>' must be connected to")}}v++}}function y(e,t,n){var r=e.tagName,i=null,s=n[n.length-1].currentNSMap,o=e.length;while(o--){var u=e[o],a=u.qName,f=u.value,l=a.indexOf(":");if(l>0)var c=u.prefix=a.slice(0,l),h=a.slice(l+1),p=c==="xmlns"&&h;else h=a,c=null,p=a==="xmlns"&&"";u.localName=h,p!==!1&&(i==null&&(i={},E(s,s={})),s[p]=i[p]=f,u.uri="http://www.w3.org/2000/xmlns/",t.startPrefixMapping(p,f))}var o=e.length;while(o--){u=e[o];var c=u.prefix;c&&(c==="xml"&&(u.uri="http://www.w3.org/XML/1998/namespace"),c!=="xmlns"&&(u.uri=s[c]))}var l=r.indexOf(":");l>0?(c=e.prefix=r.slice(0,l),h=e.localName=r.slice(l+1)):(c=null,h=e.localName=r);var d=e.uri=s[c||""];t.startElement(d,h,r,e);if(e.closed){t.endElement(d,h,r);if(i)for(c in i)t.endPrefixMapping(c)}else e.currentNSMap=s,e.localNSMap=i,n.push(e)}function b(e,t,n,r,i){if(/^(?:script|textarea)$/i.test(n)){var s=e.indexOf("</"+n+">",t),o=e.substring(t+1,s);if(/[&<]/.test(o))return/^script$/i.test(n)?(i.characters(o,0,o.length),s):(o=o.replace(/&#?\w+;/g,r),i.characters(o,0,o.length),s)}return t+1}function w(e,t,n,r){var i=r[n];return i==null&&(i=r[n]=e.lastIndexOf("</"+n+">")),i<t}function E(e,t){for(var n in e)t[n]=e[n]}function S(e,t,n,r){var i=e.charAt(t+2);switch(i){case"-":if(e.charAt(t+3)==="-"){var s=e.indexOf("-->",t+4);return s>t?(n.comment(e,t+4,s-t-4),s+3):(r.error("Unclosed comment"),-1)}return-1;default:if(e.substr(t+3,6)=="CDATA["){var s=e.indexOf("]]>",t+9);return n.startCDATA(),n.characters(e,t+9,s-t-9),n.endCDATA(),s+3}var o=C(e,t),u=o.length;if(u>1&&/!doctype/i.test(o[0][0])){var a=o[1][0],f=u>3&&/^public$/i.test(o[2][0])&&o[3][0],l=u>4&&o[4][0],c=o[u-1];return n.startDTD(a,f&&f.replace(/^(['"])(.*?)\1$/,"$2"),l&&l.replace(/^(['"])(.*?)\1$/,"$2")),n.endDTD(),c.index+c[0].length}}return-1}function x(e,t,n){var r=e.indexOf("?>",t);if(r){var i=e.substring(t,r).match(/^<\?(\S*)\s*([\s\S]*?)\s*$/);if(i){var s=i[0].length;return n.processingInstruction(i[1],i[2]),r+2}return-1}return-1}function T(e){}function N(e,t){return e.__proto__=t,e}function C(e,t){var n,r=[],i=/'[^']+'|"[^"]+"|[^\s<>\/=]+=?|(\/?\s*>|<)/g;i.lastIndex=t,i.exec(e);while(n=i.exec(e)){r.push(n);if(n[1])return r}}var r=/[A-Z_a-z\xC0-\xD6\xD8-\xF6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/,i=new RegExp("[\\-\\.0-9"+r.source.slice(1,-1)+"\u00b7\u0300-\u036f\\ux203F-\u2040]"),s=new RegExp("^"+r.source+i.source+"*(?::"+r.source+i.source+"*)?$"),o=0,u=1,a=2,f=3,l=4,c=5,h=6,p=7;return d.prototype={parse:function(e,t,n){var r=this.domBuilder;r.startDocument(),E(t,t={}),v(e,t,n,r,this.errorHandler),r.endDocument()}},T.prototype={setTagName:function(e){if(!s.test(e))throw new Error("invalid tagName:"+e);this.tagName=e},add:function(e,t,n){if(!s.test(e))throw new Error("invalid attribute:"+e);this[this.length++]={qName:e,value:t,offset:n}},length:0,getLocalName:function(e){return this[e].localName},getOffset:function(e){return this[e].offset},getQName:function(e){return this[e].qName},getURI:function(e){return this[e].uri},getValue:function(e){return this[e].value}},N({},N.prototype)instanceof N||(N=function(e,t){function n(){}n.prototype=t,n=new n;for(t in e)n[t]=e[t];return n}),d}),define("ace/mode/xml/dom",["require","exports","module"],function(e,t,n){function r(e,t){for(var n in e)t[n]=e[n]}function i(e,t){var n=e.prototype;if(Object.create){var i=Object.create(t.prototype);n.__proto__=i}if(!(n instanceof t)){function s(){}s.prototype=t.prototype,s=new s,r(n,s),e.prototype=n=s}n.constructor!=e&&(typeof e!="function"&&console.error("unknow Class:"+e),n.constructor=e)}function B(e,t){if(t instanceof Error)var n=t;else n=this,Error.call(this,w[e]),this.message=w[e],Error.captureStackTrace&&Error.captureStackTrace(this,B);return n.code=e,t&&(this.message=this.message+": "+t),n}function j(){}function F(e,t){this._node=e,this._refresh=t,I(this)}function I(e){var t=e._node._inc||e._node.ownerDocument._inc;if(e._inc!=t){var n=e._refresh(e._node);gt(e,"length",n.length),r(n,e),e._inc=t}}function q(){}function R(e,t){var n=e.length;while(n--)if(e[n]===t)return n}function U(e,t,n,r){r?t[R(t,r)]=n:t[t.length++]=n;if(e){n.ownerElement=e;var i=e.ownerDocument;i&&(r&&Q(i,e,r),K(i,e,n))}}function z(e,t,n){var r=R(t,n);if(!(r>=0))throw B(L,new Error);var i=t.length-1;while(r<i)t[r]=t[++r];t.length=i;if(e){var s=e.ownerDocument;s&&(Q(s,e,n),n.ownerElement=null)}}function W(e){this._features={};if(e)for(var t in e)this._features=e[t]}function X(){}function V(e){return e=="<"&&"<"||e==">"&&">"||e=="&"&&"&"||e=='"'&&"""||"&#"+e.charCodeAt()+";"}function $(e,t){if(t(e))return!0;if(e=e.firstChild)do if($(e,t))return!0;while(e=e.nextSibling)}function J(){}function K(e,t,n){e&&e._inc++;var r=n.namespaceURI;r=="http://www.w3.org/2000/xmlns/"&&(t._nsMap[n.prefix?n.localName:""]=n.value)}function Q(e,t,n,r){e&&e._inc++;var i=n.namespaceURI;i=="http://www.w3.org/2000/xmlns/"&&delete t._nsMap[n.prefix?n.localName:""]}function G(e,t,n){if(e&&e._inc){e._inc++;var r=t.childNodes;if(n)r[r.length++]=n;else{var i=t.firstChild,s=0;while(i)r[s++]=i,i=i.nextSibling;r.length=s}}}function Y(e,t){var n=t.previousSibling,r=t.nextSibling;return n?n.nextSibling=r:e.firstChild=r,r?r.previousSibling=n:e.lastChild=n,G(e.ownerDocument,e),t}function Z(e,t,n){var r=t.parentNode;r&&r.removeChild(t);if(t.nodeType===g){var i=t.firstChild;if(i==null)return t;var s=t.lastChild}else i=s=t;var o=n?n.previousSibling:e.lastChild;i.previousSibling=o,s.nextSibling=n,o?o.nextSibling=i:e.firstChild=i,n==null?e.lastChild=s:n.previousSibling=s;do i.parentNode=e;while(i!==s&&(i=i.nextSibling));return G(e.ownerDocument||e,e),t.nodeType==g&&(t.firstChild=t.lastChild=null),t}function et(e,t){var n=t.parentNode;if(n){var r=e.lastChild;n.removeChild(t);var r=e.lastChild}var r=e.lastChild;return t.parentNode=e,t.previousSibling=r,t.nextSibling=null,r?r.nextSibling=t:e.firstChild=t,e.lastChild=t,G(e.ownerDocument,e,t),t}function tt(){this._nsMap={}}function nt(){}function rt(){}function it(){}function st(){}function ot(){}function ut(){}function at(){}function ft(){}function lt(){}function ct(){}function ht(){}function pt(){}function dt(e,t){switch(e.nodeType){case u:var n=e.attributes,r=n.length,i=e.firstChild,o=e.tagName,h=s===e.namespaceURI;t.push("<",o);for(var y=0;y<r;y++)dt(n.item(y),t,h);if(i||h&&!/^(?:meta|link|img|br|hr|input|button)$/i.test(o)){t.push(">");if(h&&/^script$/i.test(o))i&&t.push(i.data);else while(i)dt(i,t),i=i.nextSibling;t.push("</",o,">")}else t.push("/>");return;case v:case g:var i=e.firstChild;while(i)dt(i,t),i=i.nextSibling;return;case a:return t.push(" ",e.name,'="',e.value.replace(/[<&"]/g,V),'"');case f:return t.push(e.data.replace(/[<&]/g,V));case l:return t.push("<![CDATA[",e.data,"]]>");case d:return t.push("<!--",e.data,"-->");case m:var b=e.publicId,w=e.systemId;t.push("<!DOCTYPE ",e.name);if(b)t.push(' PUBLIC "',b),w&&w!="."&&t.push('" "',w),t.push('">');else if(w&&w!=".")t.push(' SYSTEM "',w,'">');else{var E=e.internalSubset;E&&t.push(" [",E,"]"),t.push(">")}return;case p:return t.push("<?",e.target," ",e.data,"?>");case c:return t.push("&",e.nodeName,";");default:t.push("??",e.nodeName)}}function vt(e,t,n){var r;switch(t.nodeType){case u:r=t.cloneNode(!1),r.ownerDocument=e;case g:break;case a:n=!0}r||(r=t.cloneNode(!1)),r.ownerDocument=e,r.parentNode=null;if(n){var i=t.firstChild;while(i)r.appendChild(vt(e,i,n)),i=i.nextSibling}return r}function mt(e,t,n){var r=new t.constructor;for(var i in t){var s=t[i];typeof s!="object"&&s!=r[i]&&(r[i]=s)}t.childNodes&&(r.childNodes=new j),r.ownerDocument=e;switch(r.nodeType){case u:var o=t.attributes,f=r.attributes=new q,l=o.length;f._ownerElement=r;for(var c=0;c<l;c++)r.setAttributeNode(mt(e,o.item(c),!0));break;case a:n=!0}if(n){var h=t.firstChild;while(h)r.appendChild(mt(e,h,n)),h=h.nextSibling}return r}function gt(e,t,n){e[t]=n}var s="http://www.w3.org/1999/xhtml",o={},u=o.ELEMENT_NODE=1,a=o.ATTRIBUTE_NODE=2,f=o.TEXT_NODE=3,l=o.CDATA_SECTION_NODE=4,c=o.ENTITY_REFERENCE_NODE=5,h=o.ENTITY_NODE=6,p=o.PROCESSING_INSTRUCTION_NODE=7,d=o.COMMENT_NODE=8,v=o.DOCUMENT_NODE=9,m=o.DOCUMENT_TYPE_NODE=10,g=o.DOCUMENT_FRAGMENT_NODE=11,y=o.NOTATION_NODE=12,b={},w={},E=b.INDEX_SIZE_ERR=(w[1]="Index size error",1),S=b.DOMSTRING_SIZE_ERR=(w[2]="DOMString size error",2),x=b.HIERARCHY_REQUEST_ERR=(w[3]="Hierarchy request error",3),T=b.WRONG_DOCUMENT_ERR=(w[4]="Wrong document",4),N=b.INVALID_CHARACTER_ERR=(w[5]="Invalid character",5),C=b.NO_DATA_ALLOWED_ERR=(w[6]="No data allowed",6),k=b.NO_MODIFICATION_ALLOWED_ERR=(w[7]="No modification allowed",7),L=b.NOT_FOUND_ERR=(w[8]="Not found",8),A=b.NOT_SUPPORTED_ERR=(w[9]="Not supported",9),O=b.INUSE_ATTRIBUTE_ERR=(w[10]="Attribute in use",10),M=b.INVALID_STATE_ERR=(w[11]="Invalid state",11),_=b.SYNTAX_ERR=(w[12]="Syntax error",12),D=b.INVALID_MODIFICATION_ERR=(w[13]="Invalid modification",13),P=b.NAMESPACE_ERR=(w[14]="Invalid namespace",14),H=b.INVALID_ACCESS_ERR=(w[15]="Invalid access",15);B.prototype=Error.prototype,r(b,B),j.prototype={length:0,item:function(e){return this[e]||null}},F.prototype.item=function(e){return I(this),this[e]},i(F,j),q.prototype={length:0,item:j.prototype.item,getNamedItem:function(e){var t=this.length;while(t--){var n=this[t];if(n.nodeName==e)return n}},setNamedItem:function(e){var t=e.ownerElement;if(t&&t!=this._ownerElement)throw new B(O);var n=this.getNamedItem(e.nodeName);return U(this._ownerElement,this,e,n),n},setNamedItemNS:function(e){var t=e.ownerElement,n;if(t&&t!=this._ownerElement)throw new B(O);return n=this.getNamedItemNS(e.namespaceURI,e.localName),U(this._ownerElement,this,e,n),n},removeNamedItem:function(e){var t=this.getNamedItem(e);return z(this._ownerElement,this,t),t},removeNamedItemNS:function(e,t){var n=this.getNamedItemNS(e,t);return z(this._ownerElement,this,n),n},getNamedItemNS:function(e,t){var n=this.length;while(n--){var r=this[n];if(r.localName==t&&r.namespaceURI==e)return r}return null}},W.prototype={hasFeature:function(e,t){var n=this._features[e.toLowerCase()];return n&&(!t||t in n)?!0:!1},createDocument:function(e,t,n){var r=new J;r.implementation=this,r.childNodes=new j,r.doctype=n,n&&r.appendChild(n);if(t){var i=r.createElementNS(e,t);r.appendChild(i)}return r},createDocumentType:function(e,t,n){var r=new ut;return r.name=e,r.nodeName=e,r.publicId=t,r.systemId=n,r}},X.prototype={firstChild:null,lastChild:null,previousSibling:null,nextSibling:null,attributes:null,parentNode:null,childNodes:null,ownerDocument:null,nodeValue:null,namespaceURI:null,prefix:null,localName:null,insertBefore:function(e,t){return Z(this,e,t)},replaceChild:function(e,t){this.insertBefore(e,t),t&&this.removeChild(t)},removeChild:function(e){return Y(this,e)},appendChild:function(e){return this.insertBefore(e,null)},hasChildNodes:function(){return this.firstChild!=null},cloneNode:function(e){return mt(this.ownerDocument||this,this,e)},normalize:function(){var e=this.firstChild;while(e){var t=e.nextSibling;t&&t.nodeType==f&&e.nodeType==f?(this.removeChild(t),e.appendData(t.data)):(e.normalize(),e=t)}},isSupported:function(e,t){return this.ownerDocument.implementation.hasFeature(e,t)},hasAttributes:function(){return this.attributes.length>0},lookupPrefix:function(e){var t=this;while(t){var n=t._nsMap;if(n)for(var r in n)if(n[r]==e)return r;t=t.nodeType==2?t.ownerDocument:t.parentNode}return null},lookupNamespaceURI:function(e){var t=this;while(t){var n=t._nsMap;if(n&&e in n)return n[e];t=t.nodeType==2?t.ownerDocument:t.parentNode}return null},isDefaultNamespace:function(e){var t=this.lookupPrefix(e);return t==null}},r(o,X),r(o,X.prototype),J.prototype={nodeName:"#document",nodeType:v,doctype:null,documentElement:null,_inc:1,insertBefore:function(e,t){if(e.nodeType==g){var n=e.firstChild;while(n){var r=n.nextSibling;this.insertBefore(n,t),n=r}return e}return this.documentElement==null&&e.nodeType==1&&(this.documentElement=e),Z(this,e,t),e.ownerDocument=this,e},removeChild:function(e){return this.documentElement==e&&(this.documentElement=null),Y(this,e)},importNode:function(e,t){return vt(this,e,t)},getElementById:function(e){var t=null;return $(this.documentElement,function(n){if(n.nodeType==1&&n.getAttribute("id")==e)return t=n,!0}),t},createElement:function(e){var t=new tt;t.ownerDocument=this,t.nodeName=e,t.tagName=e,t.childNodes=new j;var n=t.attributes=new q;return n._ownerElement=t,t},createDocumentFragment:function(){var e=new ct;return e.ownerDocument=this,e.childNodes=new j,e},createTextNode:function(e){var t=new it;return t.ownerDocument=this,t.appendData(e),t},createComment:function(e){var t=new st;return t.ownerDocument=this,t.appendData(e),t},createCDATASection:function(e){var t=new ot;return t.ownerDocument=this,t.appendData(e),t},createProcessingInstruction:function(e,t){var n=new ht;return n.ownerDocument=this,n.tagName=n.target=e,n.nodeValue=n.data=t,n},createAttribute:function(e){var t=new nt;return t.ownerDocument=this,t.name=e,t.nodeName=e,t.localName=e,t.specified=!0,t},createEntityReference:function(e){var t=new lt;return t.ownerDocument=this,t.nodeName=e,t},createElementNS:function(e,t){var n=new tt,r=t.split(":"),i=n.attributes=new q;return n.childNodes=new j,n.ownerDocument=this,n.nodeName=t,n.tagName=t,n.namespaceURI=e,r.length==2?(n.prefix=r[0],n.localName=r[1]):n.localName=t,i._ownerElement=n,n},createAttributeNS:function(e,t){var n=new nt,r=t.split(":");return n.ownerDocument=this,n.nodeName=t,n.name=t,n.namespaceURI=e,n.specified=!0,r.length==2?(n.prefix=r[0],n.localName=r[1]):n.localName=t,n}},i(J,X),tt.prototype={nodeType:u,hasAttribute:function(e){return this.getAttributeNode(e)!=null},getAttribute:function(e){var t=this.getAttributeNode(e);return t&&t.value||""},getAttributeNode:function(e){return this.attributes.getNamedItem(e)},setAttribute:function(e,t){var n=this.ownerDocument.createAttribute(e);n.value=n.nodeValue=""+t,this.setAttributeNode(n)},removeAttribute:function(e){var t=this.getAttributeNode(e);t&&this.removeAttributeNode(t)},appendChild:function(e){return e.nodeType===g?this.insertBefore(e,null):et(this,e)},setAttributeNode:function(e){return this.attributes.setNamedItem(e)},setAttributeNodeNS:function(e){return this.attributes.setNamedItemNS(e)},removeAttributeNode:function(e){return this.attributes.removeNamedItem(e.nodeName)},removeAttributeNS:function(e,t){var n=this.getAttributeNodeNS(e,t);n&&this.removeAttributeNode(n)},hasAttributeNS:function(e,t){return this.getAttributeNodeNS(e,t)!=null},getAttributeNS:function(e,t){var n=this.getAttributeNodeNS(e,t);return n&&n.value||""},setAttributeNS:function(e,t,n){var r=this.ownerDocument.createAttributeNS(e,t);r.value=r.nodeValue=""+n,this.setAttributeNode(r)},getAttributeNodeNS:function(e,t){return this.attributes.getNamedItemNS(e,t)},getElementsByTagName:function(e){return new F(this,function(t){var n=[];return $(t,function(r){r!==t&&r.nodeType==u&&(e==="*"||r.tagName==e)&&n.push(r)}),n})},getElementsByTagNameNS:function(e,t){return new F(this,function(n){var r=[];return $(n,function(i){i!==n&&i.nodeType===u&&(e==="*"||i.namespaceURI===e)&&(t==="*"||i.localName==t)&&r.push(i)}),r})}},J.prototype.getElementsByTagName=tt.prototype.getElementsByTagName,J.prototype.getElementsByTagNameNS=tt.prototype.getElementsByTagNameNS,i(tt,X),nt.prototype.nodeType=a,i(nt,X),rt.prototype={data:"",substringData:function(e,t){return this.data.substring(e,e+t)},appendData:function(e){e=this.data+e,this.nodeValue=this.data=e,this.length=e.length},insertData:function(e,t){this.replaceData(e,0,t)},appendChild:function(e){throw new Error(w[3])},deleteData:function(e,t){this.replaceData(e,t,"")},replaceData:function(e,t,n){var r=this.data.substring(0,e),i=this.data.substring(e+t);n=r+n+i,this.nodeValue=this.data=n,this.length=n.length}},i(rt,X),it.prototype={nodeName:"#text",nodeType:f,splitText:function(e){var t=this.data,n=t.substring(e);t=t.substring(0,e),this.data=this.nodeValue=t,this.length=t.length;var r=this.ownerDocument.createTextNode(n);return this.parentNode&&this.parentNode.insertBefore(r,this.nextSibling),r}},i(it,rt),st.prototype={nodeName:"#comment",nodeType:d},i(st,rt),ot.prototype={nodeName:"#cdata-section",nodeType:l},i(ot,rt),ut.prototype.nodeType=m,i(ut,X),at.prototype.nodeType=y,i(at,X),ft.prototype.nodeType=h,i(ft,X),lt.prototype.nodeType=c,i(lt,X),ct.prototype.nodeName="#document-fragment",ct.prototype.nodeType=g,i(ct,X),ht.prototype.nodeType=p,i(ht,X),pt.prototype.serializeToString=function(e){var t=[];return dt(e,t),t.join("")},X.prototype.toString=function(){return pt.prototype.serializeToString(this)};try{if(Object.defineProperty){Object.defineProperty(F.prototype,"length",{get:function(){return I(this),this.$$length}}),Object.defineProperty(X.prototype,"textContent",{get:function(){return yt(this)},set:function(e){switch(this.nodeType){case 1:case 11:while(this.firstChild)this.removeChild(this.firstChild);(e||String(e))&&this.appendChild(this.ownerDocument.createTextNode(e));break;default:this.data=e,this.value=value,this.nodeValue=e}}});function yt(e){switch(e.nodeType){case 1:case 11:var t=[];e=e.firstChild;while(e)e.nodeType!==7&&e.nodeType!==8&&t.push(yt(e)),e=e.nextSibling;return t.join("");default:return e.nodeValue}}gt=function(e,t,n){e["$$"+t]=n}}}catch(bt){}return W}),define("ace/mode/xml/dom-parser",["require","exports","module","ace/mode/xml/sax","ace/mode/xml/dom"],function(e,t,n){"use strict";function s(e){this.options=e||{locator:{}}}function o(e,t,n){function s(t){var s=e[t];if(!s)if(i)s=e.length==2?function(n){e(t,n)}:e;else{var o=arguments.length;while(--o)if(s=e[arguments[o]])break}r[t]=s&&function(e){s(e+f(n),e,n)}||function(){}}if(!e){if(t instanceof u)return t;e=t}var r={},i=e instanceof Function;return n=n||{},s("warning","warn"),s("error","warn","warning"),s("fatalError","warn","warning","error"),r}function u(){this.cdata=!1}function a(e,t){t.lineNumber=e.lineNumber,t.columnNumber=e.columnNumber}function f(e){if(e)return"\n@"+(e.systemId||"")+"#[line:"+e.lineNumber+",col:"+e.columnNumber+"]"}function l(e,t,n){return typeof e=="string"?e.substr(t,n):e.length>=t+n||t?new java.lang.String(e,t,n)+"":e}function c(e,t){e.currentElement?e.currentElement.appendChild(t):e.document.appendChild(t)}var r=e("./sax"),i=e("./dom");return s.prototype.parseFromString=function(e,t){var n=this.options,i=new r,s=n.domBuilder||new u,a=n.errorHandler,f=n.locator,l=n.xmlns||{},c={lt:"<",gt:">",amp:"&",quot:'"',apos:"'"};return f&&s.setDocumentLocator(f),i.errorHandler=o(a,s,f),i.domBuilder=n.domBuilder||s,/\/x?html?$/.test(t)&&(c.nbsp="\u00a0",c.copy="\u00a9",l[""]="http://www.w3.org/1999/xhtml"),e?i.parse(e,l,c):i.errorHandler.error("invalid document source"),s.document},u.prototype={startDocument:function(){this.document=(new i).createDocument(null,null,null),this.locator&&(this.document.documentURI=this.locator.systemId)},startElement:function(e,t,n,r){var i=this.document,s=i.createElementNS(e,n||t),o=r.length;c(this,s),this.currentElement=s,this.locator&&a(this.locator,s);for(var u=0;u<o;u++){var e=r.getURI(u),f=r.getValue(u),n=r.getQName(u),l=i.createAttributeNS(e,n);l.getOffset&&a(l.getOffset(1),l),l.value=l.nodeValue=f,s.setAttributeNode(l)}},endElement:function(e,t,n){var r=this.currentElement,i=r.tagName;this.currentElement=r.parentNode},startPrefixMapping:function(e,t){},endPrefixMapping:function(e){},processingInstruction:function(e,t){var n=this.document.createProcessingInstruction(e,t);this.locator&&a(this.locator,n),c(this,n)},ignorableWhitespace:function(e,t,n){},characters:function(e,t,n){e=l.apply(this,arguments);if(this.currentElement&&e){if(this.cdata){var r=this.document.createCDATASection(e);this.currentElement.appendChild(r)}else{var r=this.document.createTextNode(e);this.currentElement.appendChild(r)}this.locator&&a(this.locator,r)}},skippedEntity:function(e){},endDocument:function(){this.document.normalize()},setDocumentLocator:function(e){if(this.locator=e)e.lineNumber=0},comment:function(e,t,n){e=l.apply(this,arguments);var r=this.document.createComment(e);this.locator&&a(this.locator,r),c(this,r)},startCDATA:function(){this.cdata=!0},endCDATA:function(){this.cdata=!1},startDTD:function(e,t,n){var r=this.document.implementation;if(r&&r.createDocumentType){var i=r.createDocumentType(e,t,n);this.locator&&a(this.locator,i),c(this,i)}},warning:function(e){console.warn(e,f(this.locator))},error:function(e){console.error(e,f(this.locator))},fatalError:function(e){throw console.error(e,f(this.locator)),e}},"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(e){u.prototype[e]=function(){return null}}),{DOMParser:s}}),define("ace/mode/xml_worker",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/worker/mirror","ace/mode/xml/dom-parser"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("../worker/mirror").Mirror,o=e("./xml/dom-parser").DOMParser,u=t.Worker=function(e){s.call(this,e),this.setTimeout(400),this.context=null};r.inherits(u,s),function(){this.setOptions=function(e){this.context=e.context},this.onUpdate=function(){var e=this.doc.getValue();if(!e)return;var t=new o,n=[];t.options.errorHandler={fatalError:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"error"})},error:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"error"})},warning:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"warning"})}},t.parseFromString(e),this.sender.emit("error",n)}}.call(u.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
| "no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(/</g,"<")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/xml/sax",["require","exports","module"],function(e,t,n){function d(){}function v(e,t,n,r,i){function s(e){if(e>65535){e-=65536;var t=55296+(e>>10),n=56320+(e&1023);return String.fromCharCode(t,n)}return String.fromCharCode(e)}function o(e){var t=e.slice(1,-1);return t in n?n[t]:t.charAt(0)==="#"?s(parseInt(t.substr(1).replace("x","0x"))):(i.error("entity not found:"+e),e)}function u(t){var n=e.substring(v,t).replace(/&#?\w+;/g,o);h&&a(v),r.characters(n,0,t-v),v=t}function a(t,n){while(t>=l&&(n=c.exec(e)))f=n.index,l=f+n[0].length,h.lineNumber++;h.columnNumber=t-f+1}var f=0,l=0,c=/.+(?:\r\n?|\n)|.*$/g,h=r.locator,p=[{currentNSMap:t}],d={},v=0;for(;;){var E=e.indexOf("<",v);if(E<0){if(!e.substr(v).match(/^\s*$/)){var N=r.document,C=N.createTextNode(e.substr(v));N.appendChild(C),r.currentElement=C}return}E>v&&u(E);switch(e.charAt(E+1)){case"/":var k=e.indexOf(">",E+3),L=e.substring(E+2,k),A;if(!(p.length>1)){i.fatalError("end tag name not found for: "+L);break}A=p.pop();var O=A.localNSMap;A.tagName!=L&&i.fatalError("end tag name: "+L+" does not match the current start tagName: "+A.tagName),r.endElement(A.uri,A.localName,L);if(O)for(var M in O)r.endPrefixMapping(M);k++;break;case"?":h&&a(E),k=x(e,E,r);break;case"!":h&&a(E),k=S(e,E,r,i);break;default:try{h&&a(E);var _=new T,k=g(e,E,_,o,i),D=_.length;if(D&&h){var P=m(h,{});for(var E=0;E<D;E++){var H=_[E];a(H.offset),H.offset=m(h,{})}m(P,h)}!_.closed&&w(e,k,_.tagName,d)&&(_.closed=!0,n.nbsp||i.warning("unclosed xml attribute")),y(_,r,p),_.uri==="http://www.w3.org/1999/xhtml"&&!_.closed?k=b(e,k,_.tagName,o,r):k++}catch(B){i.error("element parse error: "+B),k=-1}}k<0?u(E+1):v=k}}function m(e,t){return t.lineNumber=e.lineNumber,t.columnNumber=e.columnNumber,t}function g(e,t,n,r,i){var s,d,v=++t,m=o;for(;;){var g=e.charAt(v);switch(g){case"=":if(m===u)s=e.slice(t,v),m=f;else{if(m!==a)throw new Error("attribute equal must after attrName");m=f}break;case"'":case'"':if(m===f){t=v+1,v=e.indexOf(g,t);if(!(v>0))throw new Error("attribute value no end '"+g+"' match");d=e.slice(t,v).replace(/&#?\w+;/g,r),n.add(s,d,t-1),m=c}else{if(m!=l)throw new Error('attribute value must after "="');d=e.slice(t,v).replace(/&#?\w+;/g,r),n.add(s,d,t),i.warning('attribute "'+s+'" missed start quot('+g+")!!"),t=v+1,m=c}break;case"/":switch(m){case o:n.setTagName(e.slice(t,v));case c:case h:case p:m=p,n.closed=!0;case l:case u:case a:break;default:throw new Error("attribute invalid close char('/')")}break;case"":i.error("unexpected end of input");case">":switch(m){case o:n.setTagName(e.slice(t,v));case c:case h:case p:break;case l:case u:d=e.slice(t,v),d.slice(-1)==="/"&&(n.closed=!0,d=d.slice(0,-1));case a:m===a&&(d=s),m==l?(i.warning('attribute "'+d+'" missed quot(")!!'),n.add(s,d.replace(/&#?\w+;/g,r),t)):(i.warning('attribute "'+d+'" missed value!! "'+d+'" instead!!'),n.add(d,d,t));break;case f:throw new Error("attribute value missed!!")}return v;case"\u0080":g=" ";default:if(g<=" ")switch(m){case o:n.setTagName(e.slice(t,v)),m=h;break;case u:s=e.slice(t,v),m=a;break;case l:var d=e.slice(t,v).replace(/&#?\w+;/g,r);i.warning('attribute "'+d+'" missed quot(")!!'),n.add(s,d,t);case c:m=h}else switch(m){case a:i.warning('attribute "'+s+'" missed value!! "'+s+'" instead!!'),n.add(s,s,t),t=v,m=u;break;case c:i.warning('attribute space is required"'+s+'"!!');case h:m=u,t=v;break;case f:m=l,t=v;break;case p:throw new Error("elements closed character '/' and '>' must be connected to")}}v++}}function y(e,t,n){var r=e.tagName,i=null,s=n[n.length-1].currentNSMap,o=e.length;while(o--){var u=e[o],a=u.qName,f=u.value,l=a.indexOf(":");if(l>0)var c=u.prefix=a.slice(0,l),h=a.slice(l+1),p=c==="xmlns"&&h;else h=a,c=null,p=a==="xmlns"&&"";u.localName=h,p!==!1&&(i==null&&(i={},E(s,s={})),s[p]=i[p]=f,u.uri="http://www.w3.org/2000/xmlns/",t.startPrefixMapping(p,f))}var o=e.length;while(o--){u=e[o];var c=u.prefix;c&&(c==="xml"&&(u.uri="http://www.w3.org/XML/1998/namespace"),c!=="xmlns"&&(u.uri=s[c]))}var l=r.indexOf(":");l>0?(c=e.prefix=r.slice(0,l),h=e.localName=r.slice(l+1)):(c=null,h=e.localName=r);var d=e.uri=s[c||""];t.startElement(d,h,r,e);if(e.closed){t.endElement(d,h,r);if(i)for(c in i)t.endPrefixMapping(c)}else e.currentNSMap=s,e.localNSMap=i,n.push(e)}function b(e,t,n,r,i){if(/^(?:script|textarea)$/i.test(n)){var s=e.indexOf("</"+n+">",t),o=e.substring(t+1,s);if(/[&<]/.test(o))return/^script$/i.test(n)?(i.characters(o,0,o.length),s):(o=o.replace(/&#?\w+;/g,r),i.characters(o,0,o.length),s)}return t+1}function w(e,t,n,r){var i=r[n];return i==null&&(i=r[n]=e.lastIndexOf("</"+n+">")),i<t}function E(e,t){for(var n in e)t[n]=e[n]}function S(e,t,n,r){var i=e.charAt(t+2);switch(i){case"-":if(e.charAt(t+3)==="-"){var s=e.indexOf("-->",t+4);return s>t?(n.comment(e,t+4,s-t-4),s+3):(r.error("Unclosed comment"),-1)}return-1;default:if(e.substr(t+3,6)=="CDATA["){var s=e.indexOf("]]>",t+9);return n.startCDATA(),n.characters(e,t+9,s-t-9),n.endCDATA(),s+3}var o=C(e,t),u=o.length;if(u>1&&/!doctype/i.test(o[0][0])){var a=o[1][0],f=u>3&&/^public$/i.test(o[2][0])&&o[3][0],l=u>4&&o[4][0],c=o[u-1];return n.startDTD(a,f&&f.replace(/^(['"])(.*?)\1$/,"$2"),l&&l.replace(/^(['"])(.*?)\1$/,"$2")),n.endDTD(),c.index+c[0].length}}return-1}function x(e,t,n){var r=e.indexOf("?>",t);if(r){var i=e.substring(t,r).match(/^<\?(\S*)\s*([\s\S]*?)\s*$/);if(i){var s=i[0].length;return n.processingInstruction(i[1],i[2]),r+2}return-1}return-1}function T(e){}function N(e,t){return e.__proto__=t,e}function C(e,t){var n,r=[],i=/'[^']+'|"[^"]+"|[^\s<>\/=]+=?|(\/?\s*>|<)/g;i.lastIndex=t,i.exec(e);while(n=i.exec(e)){r.push(n);if(n[1])return r}}var r=/[A-Z_a-z\xC0-\xD6\xD8-\xF6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/,i=new RegExp("[\\-\\.0-9"+r.source.slice(1,-1)+"\u00b7\u0300-\u036f\\ux203F-\u2040]"),s=new RegExp("^"+r.source+i.source+"*(?::"+r.source+i.source+"*)?$"),o=0,u=1,a=2,f=3,l=4,c=5,h=6,p=7;return d.prototype={parse:function(e,t,n){var r=this.domBuilder;r.startDocument(),E(t,t={}),v(e,t,n,r,this.errorHandler),r.endDocument()}},T.prototype={setTagName:function(e){if(!s.test(e))throw new Error("invalid tagName:"+e);this.tagName=e},add:function(e,t,n){if(!s.test(e))throw new Error("invalid attribute:"+e);this[this.length++]={qName:e,value:t,offset:n}},length:0,getLocalName:function(e){return this[e].localName},getOffset:function(e){return this[e].offset},getQName:function(e){return this[e].qName},getURI:function(e){return this[e].uri},getValue:function(e){return this[e].value}},N({},N.prototype)instanceof N||(N=function(e,t){function n(){}n.prototype=t,n=new n;for(t in e)n[t]=e[t];return n}),d}),define("ace/mode/xml/dom",["require","exports","module"],function(e,t,n){function r(e,t){for(var n in e)t[n]=e[n]}function i(e,t){var n=e.prototype;if(Object.create){var i=Object.create(t.prototype);n.__proto__=i}if(!(n instanceof t)){function s(){}s.prototype=t.prototype,s=new s,r(n,s),e.prototype=n=s}n.constructor!=e&&(typeof e!="function"&&console.error("unknow Class:"+e),n.constructor=e)}function B(e,t){if(t instanceof Error)var n=t;else n=this,Error.call(this,w[e]),this.message=w[e],Error.captureStackTrace&&Error.captureStackTrace(this,B);return n.code=e,t&&(this.message=this.message+": "+t),n}function j(){}function F(e,t){this._node=e,this._refresh=t,I(this)}function I(e){var t=e._node._inc||e._node.ownerDocument._inc;if(e._inc!=t){var n=e._refresh(e._node);gt(e,"length",n.length),r(n,e),e._inc=t}}function q(){}function R(e,t){var n=e.length;while(n--)if(e[n]===t)return n}function U(e,t,n,r){r?t[R(t,r)]=n:t[t.length++]=n;if(e){n.ownerElement=e;var i=e.ownerDocument;i&&(r&&Q(i,e,r),K(i,e,n))}}function z(e,t,n){var r=R(t,n);if(!(r>=0))throw B(L,new Error);var i=t.length-1;while(r<i)t[r]=t[++r];t.length=i;if(e){var s=e.ownerDocument;s&&(Q(s,e,n),n.ownerElement=null)}}function W(e){this._features={};if(e)for(var t in e)this._features=e[t]}function X(){}function V(e){return e=="<"&&"<"||e==">"&&">"||e=="&"&&"&"||e=='"'&&"""||"&#"+e.charCodeAt()+";"}function $(e,t){if(t(e))return!0;if(e=e.firstChild)do if($(e,t))return!0;while(e=e.nextSibling)}function J(){}function K(e,t,n){e&&e._inc++;var r=n.namespaceURI;r=="http://www.w3.org/2000/xmlns/"&&(t._nsMap[n.prefix?n.localName:""]=n.value)}function Q(e,t,n,r){e&&e._inc++;var i=n.namespaceURI;i=="http://www.w3.org/2000/xmlns/"&&delete t._nsMap[n.prefix?n.localName:""]}function G(e,t,n){if(e&&e._inc){e._inc++;var r=t.childNodes;if(n)r[r.length++]=n;else{var i=t.firstChild,s=0;while(i)r[s++]=i,i=i.nextSibling;r.length=s}}}function Y(e,t){var n=t.previousSibling,r=t.nextSibling;return n?n.nextSibling=r:e.firstChild=r,r?r.previousSibling=n:e.lastChild=n,G(e.ownerDocument,e),t}function Z(e,t,n){var r=t.parentNode;r&&r.removeChild(t);if(t.nodeType===g){var i=t.firstChild;if(i==null)return t;var s=t.lastChild}else i=s=t;var o=n?n.previousSibling:e.lastChild;i.previousSibling=o,s.nextSibling=n,o?o.nextSibling=i:e.firstChild=i,n==null?e.lastChild=s:n.previousSibling=s;do i.parentNode=e;while(i!==s&&(i=i.nextSibling));return G(e.ownerDocument||e,e),t.nodeType==g&&(t.firstChild=t.lastChild=null),t}function et(e,t){var n=t.parentNode;if(n){var r=e.lastChild;n.removeChild(t);var r=e.lastChild}var r=e.lastChild;return t.parentNode=e,t.previousSibling=r,t.nextSibling=null,r?r.nextSibling=t:e.firstChild=t,e.lastChild=t,G(e.ownerDocument,e,t),t}function tt(){this._nsMap={}}function nt(){}function rt(){}function it(){}function st(){}function ot(){}function ut(){}function at(){}function ft(){}function lt(){}function ct(){}function ht(){}function pt(){}function dt(e,t){switch(e.nodeType){case u:var n=e.attributes,r=n.length,i=e.firstChild,o=e.tagName,h=s===e.namespaceURI;t.push("<",o);for(var y=0;y<r;y++)dt(n.item(y),t,h);if(i||h&&!/^(?:meta|link|img|br|hr|input|button)$/i.test(o)){t.push(">");if(h&&/^script$/i.test(o))i&&t.push(i.data);else while(i)dt(i,t),i=i.nextSibling;t.push("</",o,">")}else t.push("/>");return;case v:case g:var i=e.firstChild;while(i)dt(i,t),i=i.nextSibling;return;case a:return t.push(" ",e.name,'="',e.value.replace(/[<&"]/g,V),'"');case f:return t.push(e.data.replace(/[<&]/g,V));case l:return t.push("<![CDATA[",e.data,"]]>");case d:return t.push("<!--",e.data,"-->");case m:var b=e.publicId,w=e.systemId;t.push("<!DOCTYPE ",e.name);if(b)t.push(' PUBLIC "',b),w&&w!="."&&t.push('" "',w),t.push('">');else if(w&&w!=".")t.push(' SYSTEM "',w,'">');else{var E=e.internalSubset;E&&t.push(" [",E,"]"),t.push(">")}return;case p:return t.push("<?",e.target," ",e.data,"?>");case c:return t.push("&",e.nodeName,";");default:t.push("??",e.nodeName)}}function vt(e,t,n){var r;switch(t.nodeType){case u:r=t.cloneNode(!1),r.ownerDocument=e;case g:break;case a:n=!0}r||(r=t.cloneNode(!1)),r.ownerDocument=e,r.parentNode=null;if(n){var i=t.firstChild;while(i)r.appendChild(vt(e,i,n)),i=i.nextSibling}return r}function mt(e,t,n){var r=new t.constructor;for(var i in t){var s=t[i];typeof s!="object"&&s!=r[i]&&(r[i]=s)}t.childNodes&&(r.childNodes=new j),r.ownerDocument=e;switch(r.nodeType){case u:var o=t.attributes,f=r.attributes=new q,l=o.length;f._ownerElement=r;for(var c=0;c<l;c++)r.setAttributeNode(mt(e,o.item(c),!0));break;case a:n=!0}if(n){var h=t.firstChild;while(h)r.appendChild(mt(e,h,n)),h=h.nextSibling}return r}function gt(e,t,n){e[t]=n}var s="http://www.w3.org/1999/xhtml",o={},u=o.ELEMENT_NODE=1,a=o.ATTRIBUTE_NODE=2,f=o.TEXT_NODE=3,l=o.CDATA_SECTION_NODE=4,c=o.ENTITY_REFERENCE_NODE=5,h=o.ENTITY_NODE=6,p=o.PROCESSING_INSTRUCTION_NODE=7,d=o.COMMENT_NODE=8,v=o.DOCUMENT_NODE=9,m=o.DOCUMENT_TYPE_NODE=10,g=o.DOCUMENT_FRAGMENT_NODE=11,y=o.NOTATION_NODE=12,b={},w={},E=b.INDEX_SIZE_ERR=(w[1]="Index size error",1),S=b.DOMSTRING_SIZE_ERR=(w[2]="DOMString size error",2),x=b.HIERARCHY_REQUEST_ERR=(w[3]="Hierarchy request error",3),T=b.WRONG_DOCUMENT_ERR=(w[4]="Wrong document",4),N=b.INVALID_CHARACTER_ERR=(w[5]="Invalid character",5),C=b.NO_DATA_ALLOWED_ERR=(w[6]="No data allowed",6),k=b.NO_MODIFICATION_ALLOWED_ERR=(w[7]="No modification allowed",7),L=b.NOT_FOUND_ERR=(w[8]="Not found",8),A=b.NOT_SUPPORTED_ERR=(w[9]="Not supported",9),O=b.INUSE_ATTRIBUTE_ERR=(w[10]="Attribute in use",10),M=b.INVALID_STATE_ERR=(w[11]="Invalid state",11),_=b.SYNTAX_ERR=(w[12]="Syntax error",12),D=b.INVALID_MODIFICATION_ERR=(w[13]="Invalid modification",13),P=b.NAMESPACE_ERR=(w[14]="Invalid namespace",14),H=b.INVALID_ACCESS_ERR=(w[15]="Invalid access",15);B.prototype=Error.prototype,r(b,B),j.prototype={length:0,item:function(e){return this[e]||null}},F.prototype.item=function(e){return I(this),this[e]},i(F,j),q.prototype={length:0,item:j.prototype.item,getNamedItem:function(e){var t=this.length;while(t--){var n=this[t];if(n.nodeName==e)return n}},setNamedItem:function(e){var t=e.ownerElement;if(t&&t!=this._ownerElement)throw new B(O);var n=this.getNamedItem(e.nodeName);return U(this._ownerElement,this,e,n),n},setNamedItemNS:function(e){var t=e.ownerElement,n;if(t&&t!=this._ownerElement)throw new B(O);return n=this.getNamedItemNS(e.namespaceURI,e.localName),U(this._ownerElement,this,e,n),n},removeNamedItem:function(e){var t=this.getNamedItem(e);return z(this._ownerElement,this,t),t},removeNamedItemNS:function(e,t){var n=this.getNamedItemNS(e,t);return z(this._ownerElement,this,n),n},getNamedItemNS:function(e,t){var n=this.length;while(n--){var r=this[n];if(r.localName==t&&r.namespaceURI==e)return r}return null}},W.prototype={hasFeature:function(e,t){var n=this._features[e.toLowerCase()];return n&&(!t||t in n)?!0:!1},createDocument:function(e,t,n){var r=new J;r.implementation=this,r.childNodes=new j,r.doctype=n,n&&r.appendChild(n);if(t){var i=r.createElementNS(e,t);r.appendChild(i)}return r},createDocumentType:function(e,t,n){var r=new ut;return r.name=e,r.nodeName=e,r.publicId=t,r.systemId=n,r}},X.prototype={firstChild:null,lastChild:null,previousSibling:null,nextSibling:null,attributes:null,parentNode:null,childNodes:null,ownerDocument:null,nodeValue:null,namespaceURI:null,prefix:null,localName:null,insertBefore:function(e,t){return Z(this,e,t)},replaceChild:function(e,t){this.insertBefore(e,t),t&&this.removeChild(t)},removeChild:function(e){return Y(this,e)},appendChild:function(e){return this.insertBefore(e,null)},hasChildNodes:function(){return this.firstChild!=null},cloneNode:function(e){return mt(this.ownerDocument||this,this,e)},normalize:function(){var e=this.firstChild;while(e){var t=e.nextSibling;t&&t.nodeType==f&&e.nodeType==f?(this.removeChild(t),e.appendData(t.data)):(e.normalize(),e=t)}},isSupported:function(e,t){return this.ownerDocument.implementation.hasFeature(e,t)},hasAttributes:function(){return this.attributes.length>0},lookupPrefix:function(e){var t=this;while(t){var n=t._nsMap;if(n)for(var r in n)if(n[r]==e)return r;t=t.nodeType==2?t.ownerDocument:t.parentNode}return null},lookupNamespaceURI:function(e){var t=this;while(t){var n=t._nsMap;if(n&&e in n)return n[e];t=t.nodeType==2?t.ownerDocument:t.parentNode}return null},isDefaultNamespace:function(e){var t=this.lookupPrefix(e);return t==null}},r(o,X),r(o,X.prototype),J.prototype={nodeName:"#document",nodeType:v,doctype:null,documentElement:null,_inc:1,insertBefore:function(e,t){if(e.nodeType==g){var n=e.firstChild;while(n){var r=n.nextSibling;this.insertBefore(n,t),n=r}return e}return this.documentElement==null&&e.nodeType==1&&(this.documentElement=e),Z(this,e,t),e.ownerDocument=this,e},removeChild:function(e){return this.documentElement==e&&(this.documentElement=null),Y(this,e)},importNode:function(e,t){return vt(this,e,t)},getElementById:function(e){var t=null;return $(this.documentElement,function(n){if(n.nodeType==1&&n.getAttribute("id")==e)return t=n,!0}),t},createElement:function(e){var t=new tt;t.ownerDocument=this,t.nodeName=e,t.tagName=e,t.childNodes=new j;var n=t.attributes=new q;return n._ownerElement=t,t},createDocumentFragment:function(){var e=new ct;return e.ownerDocument=this,e.childNodes=new j,e},createTextNode:function(e){var t=new it;return t.ownerDocument=this,t.appendData(e),t},createComment:function(e){var t=new st;return t.ownerDocument=this,t.appendData(e),t},createCDATASection:function(e){var t=new ot;return t.ownerDocument=this,t.appendData(e),t},createProcessingInstruction:function(e,t){var n=new ht;return n.ownerDocument=this,n.tagName=n.target=e,n.nodeValue=n.data=t,n},createAttribute:function(e){var t=new nt;return t.ownerDocument=this,t.name=e,t.nodeName=e,t.localName=e,t.specified=!0,t},createEntityReference:function(e){var t=new lt;return t.ownerDocument=this,t.nodeName=e,t},createElementNS:function(e,t){var n=new tt,r=t.split(":"),i=n.attributes=new q;return n.childNodes=new j,n.ownerDocument=this,n.nodeName=t,n.tagName=t,n.namespaceURI=e,r.length==2?(n.prefix=r[0],n.localName=r[1]):n.localName=t,i._ownerElement=n,n},createAttributeNS:function(e,t){var n=new nt,r=t.split(":");return n.ownerDocument=this,n.nodeName=t,n.name=t,n.namespaceURI=e,n.specified=!0,r.length==2?(n.prefix=r[0],n.localName=r[1]):n.localName=t,n}},i(J,X),tt.prototype={nodeType:u,hasAttribute:function(e){return this.getAttributeNode(e)!=null},getAttribute:function(e){var t=this.getAttributeNode(e);return t&&t.value||""},getAttributeNode:function(e){return this.attributes.getNamedItem(e)},setAttribute:function(e,t){var n=this.ownerDocument.createAttribute(e);n.value=n.nodeValue=""+t,this.setAttributeNode(n)},removeAttribute:function(e){var t=this.getAttributeNode(e);t&&this.removeAttributeNode(t)},appendChild:function(e){return e.nodeType===g?this.insertBefore(e,null):et(this,e)},setAttributeNode:function(e){return this.attributes.setNamedItem(e)},setAttributeNodeNS:function(e){return this.attributes.setNamedItemNS(e)},removeAttributeNode:function(e){return this.attributes.removeNamedItem(e.nodeName)},removeAttributeNS:function(e,t){var n=this.getAttributeNodeNS(e,t);n&&this.removeAttributeNode(n)},hasAttributeNS:function(e,t){return this.getAttributeNodeNS(e,t)!=null},getAttributeNS:function(e,t){var n=this.getAttributeNodeNS(e,t);return n&&n.value||""},setAttributeNS:function(e,t,n){var r=this.ownerDocument.createAttributeNS(e,t);r.value=r.nodeValue=""+n,this.setAttributeNode(r)},getAttributeNodeNS:function(e,t){return this.attributes.getNamedItemNS(e,t)},getElementsByTagName:function(e){return new F(this,function(t){var n=[];return $(t,function(r){r!==t&&r.nodeType==u&&(e==="*"||r.tagName==e)&&n.push(r)}),n})},getElementsByTagNameNS:function(e,t){return new F(this,function(n){var r=[];return $(n,function(i){i!==n&&i.nodeType===u&&(e==="*"||i.namespaceURI===e)&&(t==="*"||i.localName==t)&&r.push(i)}),r})}},J.prototype.getElementsByTagName=tt.prototype.getElementsByTagName,J.prototype.getElementsByTagNameNS=tt.prototype.getElementsByTagNameNS,i(tt,X),nt.prototype.nodeType=a,i(nt,X),rt.prototype={data:"",substringData:function(e,t){return this.data.substring(e,e+t)},appendData:function(e){e=this.data+e,this.nodeValue=this.data=e,this.length=e.length},insertData:function(e,t){this.replaceData(e,0,t)},appendChild:function(e){throw new Error(w[3])},deleteData:function(e,t){this.replaceData(e,t,"")},replaceData:function(e,t,n){var r=this.data.substring(0,e),i=this.data.substring(e+t);n=r+n+i,this.nodeValue=this.data=n,this.length=n.length}},i(rt,X),it.prototype={nodeName:"#text",nodeType:f,splitText:function(e){var t=this.data,n=t.substring(e);t=t.substring(0,e),this.data=this.nodeValue=t,this.length=t.length;var r=this.ownerDocument.createTextNode(n);return this.parentNode&&this.parentNode.insertBefore(r,this.nextSibling),r}},i(it,rt),st.prototype={nodeName:"#comment",nodeType:d},i(st,rt),ot.prototype={nodeName:"#cdata-section",nodeType:l},i(ot,rt),ut.prototype.nodeType=m,i(ut,X),at.prototype.nodeType=y,i(at,X),ft.prototype.nodeType=h,i(ft,X),lt.prototype.nodeType=c,i(lt,X),ct.prototype.nodeName="#document-fragment",ct.prototype.nodeType=g,i(ct,X),ht.prototype.nodeType=p,i(ht,X),pt.prototype.serializeToString=function(e){var t=[];return dt(e,t),t.join("")},X.prototype.toString=function(){return pt.prototype.serializeToString(this)};try{if(Object.defineProperty){Object.defineProperty(F.prototype,"length",{get:function(){return I(this),this.$$length}}),Object.defineProperty(X.prototype,"textContent",{get:function(){return yt(this)},set:function(e){switch(this.nodeType){case 1:case 11:while(this.firstChild)this.removeChild(this.firstChild);(e||String(e))&&this.appendChild(this.ownerDocument.createTextNode(e));break;default:this.data=e,this.value=value,this.nodeValue=e}}});function yt(e){switch(e.nodeType){case 1:case 11:var t=[];e=e.firstChild;while(e)e.nodeType!==7&&e.nodeType!==8&&t.push(yt(e)),e=e.nextSibling;return t.join("");default:return e.nodeValue}}gt=function(e,t,n){e["$$"+t]=n}}}catch(bt){}return W}),define("ace/mode/xml/dom-parser",["require","exports","module","ace/mode/xml/sax","ace/mode/xml/dom"],function(e,t,n){"use strict";function s(e){this.options=e||{locator:{}}}function o(e,t,n){function s(t){var s=e[t];if(!s)if(i)s=e.length==2?function(n){e(t,n)}:e;else{var o=arguments.length;while(--o)if(s=e[arguments[o]])break}r[t]=s&&function(e){s(e+f(n),e,n)}||function(){}}if(!e){if(t instanceof u)return t;e=t}var r={},i=e instanceof Function;return n=n||{},s("warning","warn"),s("error","warn","warning"),s("fatalError","warn","warning","error"),r}function u(){this.cdata=!1}function a(e,t){t.lineNumber=e.lineNumber,t.columnNumber=e.columnNumber}function f(e){if(e)return"\n@"+(e.systemId||"")+"#[line:"+e.lineNumber+",col:"+e.columnNumber+"]"}function l(e,t,n){return typeof e=="string"?e.substr(t,n):e.length>=t+n||t?new java.lang.String(e,t,n)+"":e}function c(e,t){e.currentElement?e.currentElement.appendChild(t):e.document.appendChild(t)}var r=e("./sax"),i=e("./dom");return s.prototype.parseFromString=function(e,t){var n=this.options,i=new r,s=n.domBuilder||new u,a=n.errorHandler,f=n.locator,l=n.xmlns||{},c={lt:"<",gt:">",amp:"&",quot:'"',apos:"'"};return f&&s.setDocumentLocator(f),i.errorHandler=o(a,s,f),i.domBuilder=n.domBuilder||s,/\/x?html?$/.test(t)&&(c.nbsp="\u00a0",c.copy="\u00a9",l[""]="http://www.w3.org/1999/xhtml"),e?i.parse(e,l,c):i.errorHandler.error("invalid document source"),s.document},u.prototype={startDocument:function(){this.document=(new i).createDocument(null,null,null),this.locator&&(this.document.documentURI=this.locator.systemId)},startElement:function(e,t,n,r){var i=this.document,s=i.createElementNS(e,n||t),o=r.length;c(this,s),this.currentElement=s,this.locator&&a(this.locator,s);for(var u=0;u<o;u++){var e=r.getURI(u),f=r.getValue(u),n=r.getQName(u),l=i.createAttributeNS(e,n);l.getOffset&&a(l.getOffset(1),l),l.value=l.nodeValue=f,s.setAttributeNode(l)}},endElement:function(e,t,n){var r=this.currentElement,i=r.tagName;this.currentElement=r.parentNode},startPrefixMapping:function(e,t){},endPrefixMapping:function(e){},processingInstruction:function(e,t){var n=this.document.createProcessingInstruction(e,t);this.locator&&a(this.locator,n),c(this,n)},ignorableWhitespace:function(e,t,n){},characters:function(e,t,n){e=l.apply(this,arguments);if(this.currentElement&&e){if(this.cdata){var r=this.document.createCDATASection(e);this.currentElement.appendChild(r)}else{var r=this.document.createTextNode(e);this.currentElement.appendChild(r)}this.locator&&a(this.locator,r)}},skippedEntity:function(e){},endDocument:function(){this.document.normalize()},setDocumentLocator:function(e){if(this.locator=e)e.lineNumber=0},comment:function(e,t,n){e=l.apply(this,arguments);var r=this.document.createComment(e);this.locator&&a(this.locator,r),c(this,r)},startCDATA:function(){this.cdata=!0},endCDATA:function(){this.cdata=!1},startDTD:function(e,t,n){var r=this.document.implementation;if(r&&r.createDocumentType){var i=r.createDocumentType(e,t,n);this.locator&&a(this.locator,i),c(this,i)}},warning:function(e){console.warn(e,f(this.locator))},error:function(e){console.error(e,f(this.locator))},fatalError:function(e){throw console.error(e,f(this.locator)),e}},"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(e){u.prototype[e]=function(){return null}}),{DOMParser:s}}),define("ace/mode/xml_worker",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/worker/mirror","ace/mode/xml/dom-parser"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("../worker/mirror").Mirror,o=e("./xml/dom-parser").DOMParser,u=t.Worker=function(e){s.call(this,e),this.setTimeout(400),this.context=null};r.inherits(u,s),function(){this.setOptions=function(e){this.context=e.context},this.onUpdate=function(){var e=this.doc.getValue();if(!e)return;var t=new o,n=[];t.options.errorHandler={fatalError:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"error"})},error:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"error"})},warning:function(e,t,r){n.push({row:r.lineNumber,column:r.columnNumber,text:t,type:"warning"})}},t.parseFromString(e),this.sender.emit("error",n)}}.call(u.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/config/ConfigServiceWithCacheTest.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.core.dto.ApolloNotificationMessages;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.service.ReleaseMessageService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.biz.utils.ReleaseMessageKeyGenerator;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConfigServiceWithCacheTest {
private ConfigServiceWithCache configServiceWithCache;
@Mock
private ReleaseService releaseService;
@Mock
private ReleaseMessageService releaseMessageService;
@Mock
private Release someRelease;
@Mock
private ReleaseMessage someReleaseMessage;
private String someAppId;
private String someClusterName;
private String someNamespaceName;
private String someKey;
private long someNotificationId;
private ApolloNotificationMessages someNotificationMessages;
@Before
public void setUp() throws Exception {
configServiceWithCache = new ConfigServiceWithCache();
ReflectionTestUtils.setField(configServiceWithCache, "releaseService", releaseService);
ReflectionTestUtils.setField(configServiceWithCache, "releaseMessageService", releaseMessageService);
configServiceWithCache.initialize();
someAppId = "someAppId";
someClusterName = "someClusterName";
someNamespaceName = "someNamespaceName";
someNotificationId = 1;
someKey = ReleaseMessageKeyGenerator.generate(someAppId, someClusterName, someNamespaceName);
someNotificationMessages = new ApolloNotificationMessages();
}
@Test
public void testFindActiveOne() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindActiveOneWithSameIdMultipleTimes() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindActiveOneWithMultipleIdMultipleTimes() throws Exception {
long someId = 1;
long anotherId = 2;
Release anotherRelease = mock(Release.class);
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
when(releaseService.findActiveOne(anotherId)).thenReturn(anotherRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(anotherRelease, configServiceWithCache.findActiveOne(anotherId, someNotificationMessages));
assertEquals(anotherRelease, configServiceWithCache.findActiveOne(anotherId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
verify(releaseService, times(1)).findActiveOne(anotherId);
}
@Test
public void testFindActiveOneWithReleaseNotFoundMultipleTimes() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(null);
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindLatestActiveRelease() throws Exception {
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release anotherRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
int retryTimes = 100;
for (int i = 0; i < retryTimes; i++) {
configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
}
assertEquals(someRelease, release);
assertEquals(someRelease, anotherRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithReleaseNotFound() throws Exception {
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn(null);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn(null);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release anotherRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
int retryTimes = 100;
for (int i = 0; i < retryTimes; i++) {
configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
}
assertNull(release);
assertNull(anotherRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithDirtyRelease() throws Exception {
long someNewNotificationId = someNotificationId + 1;
ReleaseMessage anotherReleaseMessage = mock(ReleaseMessage.class);
Release anotherRelease = mock(Release.class);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(anotherReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(anotherRelease);
when(anotherReleaseMessage.getId()).thenReturn(someNewNotificationId);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
someNotificationMessages.put(someKey, someNewNotificationId);
Release shouldBeNewRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(anotherRelease, shouldBeNewRelease);
verify(releaseMessageService, times(2)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(2)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithReleaseMessageNotification() throws Exception {
long someNewNotificationId = someNotificationId + 1;
ReleaseMessage anotherReleaseMessage = mock(ReleaseMessage.class);
Release anotherRelease = mock(Release.class);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(anotherReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(anotherRelease);
when(anotherReleaseMessage.getMessage()).thenReturn(someKey);
when(anotherReleaseMessage.getId()).thenReturn(someNewNotificationId);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
configServiceWithCache.handleMessage(anotherReleaseMessage, Topics.APOLLO_RELEASE_TOPIC);
Release shouldBeNewRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(anotherRelease, shouldBeNewRelease);
verify(releaseMessageService, times(2)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(2)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithIrrelevantMessages() throws Exception {
long someNewNotificationId = someNotificationId + 1;
String someIrrelevantKey = "someIrrelevantKey";
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
someNotificationMessages.put(someIrrelevantKey, someNewNotificationId);
Release shouldStillBeOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(someRelease, shouldStillBeOldRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
}
| /*
* 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.core.dto.ApolloNotificationMessages;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.service.ReleaseMessageService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.biz.utils.ReleaseMessageKeyGenerator;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConfigServiceWithCacheTest {
private ConfigServiceWithCache configServiceWithCache;
@Mock
private ReleaseService releaseService;
@Mock
private ReleaseMessageService releaseMessageService;
@Mock
private Release someRelease;
@Mock
private ReleaseMessage someReleaseMessage;
private String someAppId;
private String someClusterName;
private String someNamespaceName;
private String someKey;
private long someNotificationId;
private ApolloNotificationMessages someNotificationMessages;
@Before
public void setUp() throws Exception {
configServiceWithCache = new ConfigServiceWithCache();
ReflectionTestUtils.setField(configServiceWithCache, "releaseService", releaseService);
ReflectionTestUtils.setField(configServiceWithCache, "releaseMessageService", releaseMessageService);
configServiceWithCache.initialize();
someAppId = "someAppId";
someClusterName = "someClusterName";
someNamespaceName = "someNamespaceName";
someNotificationId = 1;
someKey = ReleaseMessageKeyGenerator.generate(someAppId, someClusterName, someNamespaceName);
someNotificationMessages = new ApolloNotificationMessages();
}
@Test
public void testFindActiveOne() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindActiveOneWithSameIdMultipleTimes() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindActiveOneWithMultipleIdMultipleTimes() throws Exception {
long someId = 1;
long anotherId = 2;
Release anotherRelease = mock(Release.class);
when(releaseService.findActiveOne(someId)).thenReturn(someRelease);
when(releaseService.findActiveOne(anotherId)).thenReturn(anotherRelease);
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(someRelease, configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertEquals(anotherRelease, configServiceWithCache.findActiveOne(anotherId, someNotificationMessages));
assertEquals(anotherRelease, configServiceWithCache.findActiveOne(anotherId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
verify(releaseService, times(1)).findActiveOne(anotherId);
}
@Test
public void testFindActiveOneWithReleaseNotFoundMultipleTimes() throws Exception {
long someId = 1;
when(releaseService.findActiveOne(someId)).thenReturn(null);
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
assertNull(configServiceWithCache.findActiveOne(someId, someNotificationMessages));
verify(releaseService, times(1)).findActiveOne(someId);
}
@Test
public void testFindLatestActiveRelease() throws Exception {
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release anotherRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
int retryTimes = 100;
for (int i = 0; i < retryTimes; i++) {
configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
}
assertEquals(someRelease, release);
assertEquals(someRelease, anotherRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithReleaseNotFound() throws Exception {
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn(null);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn(null);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release anotherRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
int retryTimes = 100;
for (int i = 0; i < retryTimes; i++) {
configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
}
assertNull(release);
assertNull(anotherRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithDirtyRelease() throws Exception {
long someNewNotificationId = someNotificationId + 1;
ReleaseMessage anotherReleaseMessage = mock(ReleaseMessage.class);
Release anotherRelease = mock(Release.class);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(anotherReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(anotherRelease);
when(anotherReleaseMessage.getId()).thenReturn(someNewNotificationId);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
someNotificationMessages.put(someKey, someNewNotificationId);
Release shouldBeNewRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(anotherRelease, shouldBeNewRelease);
verify(releaseMessageService, times(2)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(2)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithReleaseMessageNotification() throws Exception {
long someNewNotificationId = someNotificationId + 1;
ReleaseMessage anotherReleaseMessage = mock(ReleaseMessage.class);
Release anotherRelease = mock(Release.class);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(anotherReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(anotherRelease);
when(anotherReleaseMessage.getMessage()).thenReturn(someKey);
when(anotherReleaseMessage.getId()).thenReturn(someNewNotificationId);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
configServiceWithCache.handleMessage(anotherReleaseMessage, Topics.APOLLO_RELEASE_TOPIC);
Release shouldBeNewRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(anotherRelease, shouldBeNewRelease);
verify(releaseMessageService, times(2)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(2)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
@Test
public void testFindLatestActiveReleaseWithIrrelevantMessages() throws Exception {
long someNewNotificationId = someNotificationId + 1;
String someIrrelevantKey = "someIrrelevantKey";
when(releaseMessageService.findLatestReleaseMessageForMessages(Lists.newArrayList(someKey))).thenReturn
(someReleaseMessage);
when(releaseService.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName)).thenReturn
(someRelease);
when(someReleaseMessage.getId()).thenReturn(someNotificationId);
Release release = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName, someNamespaceName,
someNotificationMessages);
Release stillOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
someNotificationMessages.put(someIrrelevantKey, someNewNotificationId);
Release shouldStillBeOldRelease = configServiceWithCache.findLatestActiveRelease(someAppId, someClusterName,
someNamespaceName, someNotificationMessages);
assertEquals(someRelease, release);
assertEquals(someRelease, stillOldRelease);
assertEquals(someRelease, shouldStillBeOldRelease);
verify(releaseMessageService, times(1)).findLatestReleaseMessageForMessages(Lists.newArrayList(someKey));
verify(releaseService, times(1)).findLatestActiveRelease(someAppId, someClusterName, someNamespaceName);
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/images/community/jetbrains.svg | <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
>
<g>
<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
<stop offset="0" style="stop-color:#FCEE39"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.57" style="stop-color:#F26F4E"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
<stop offset="0" style="stop-color:#7C59A4"/>
<stop offset="0.3852" style="stop-color:#AF4C92"/>
<stop offset="0.7654" style="stop-color:#DC4183"/>
<stop offset="0.957" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.364" style="stop-color:#EE4E72"/>
<stop offset="1" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
<g id="XMLID_3008_">
<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
<g id="XMLID_3009_">
<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
L45.3,43.8z"/>
<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
l-1.5,0v2H50.6z"/>
<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
/>
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
C76.1,62.5,74.7,62,73.7,61.1z"/>
</g>
</g>
</g>
</svg>
| <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
>
<g>
<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
<stop offset="0" style="stop-color:#FCEE39"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.57" style="stop-color:#F26F4E"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
<stop offset="0" style="stop-color:#7C59A4"/>
<stop offset="0.3852" style="stop-color:#AF4C92"/>
<stop offset="0.7654" style="stop-color:#DC4183"/>
<stop offset="0.957" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.364" style="stop-color:#EE4E72"/>
<stop offset="1" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
<g id="XMLID_3008_">
<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
<g id="XMLID_3009_">
<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
L45.3,43.8z"/>
<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
l-1.5,0v2H50.6z"/>
<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
/>
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
C76.1,62.5,74.7,62,73.7,61.1z"/>
</g>
</g>
</g>
</svg>
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/ItemService.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.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ItemAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.NamespaceAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseAPI;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.ConfigTextResolver;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifier;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.HttpClientErrorException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.NamespaceAPI namespaceAPI;
private final AdminServiceAPI.ItemAPI itemAPI;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
private final ConfigTextResolver fileTextResolver;
private final ConfigTextResolver propertyResolver;
public ItemService(
final UserInfoHolder userInfoHolder,
final NamespaceAPI namespaceAPI,
final ItemAPI itemAPI,
final ReleaseAPI releaseAPI,
final @Qualifier("fileTextResolver") ConfigTextResolver fileTextResolver,
final @Qualifier("propertyResolver") ConfigTextResolver propertyResolver) {
this.userInfoHolder = userInfoHolder;
this.namespaceAPI = namespaceAPI;
this.itemAPI = itemAPI;
this.releaseAPI = releaseAPI;
this.fileTextResolver = fileTextResolver;
this.propertyResolver = propertyResolver;
}
/**
* parse config text and update config items
*
* @return parse result
*/
public void updateConfigItemByText(NamespaceTextModel model) {
String appId = model.getAppId();
Env env = model.getEnv();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
String configText = model.getConfigText();
ConfigTextResolver resolver =
model.getFormat() == ConfigFileFormat.Properties ? propertyResolver : fileTextResolver;
ItemChangeSets changeSets = resolver.resolve(namespaceId, configText,
itemAPI.findItems(appId, env, clusterName, namespaceName));
if (changeSets.isEmpty()) {
return;
}
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public void updateItems(String appId, Env env, String clusterName, String namespaceName, ItemChangeSets changeSets){
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
item.setNamespaceId(namespace.getId());
ItemDTO itemDTO = itemAPI.createItem(appId, env, clusterName, namespaceName, item);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return itemDTO;
}
public void updateItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
itemAPI.updateItem(appId, env, clusterName, namespaceName, item.getId(), item);
}
public void deleteItem(Env env, long itemId, String userId) {
itemAPI.deleteItem(env, itemId, userId);
}
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findItems(appId, env, clusterName, namespaceName);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findDeletedItems(appId, env, clusterName, namespaceName);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return itemAPI.loadItem(env, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
ItemDTO item = itemAPI.loadItemById(env, itemId);
if (item == null) {
throw new BadRequestException("item not found for itemId " + itemId);
}
return item;
}
public void syncItems(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> itemDiffs = compare(comparedNamespaces, sourceItems);
for (ItemDiffs itemDiff : itemDiffs) {
NamespaceIdentifier namespaceIdentifier = itemDiff.getNamespace();
ItemChangeSets changeSets = itemDiff.getDiffs();
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
String appId = namespaceIdentifier.getAppId();
Env env = namespaceIdentifier.getEnv();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.SYNC_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
}
public void revokeItem(String appId, Env env, String clusterName, String namespaceName) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
Map<String, String> releaseItemDTOs = new HashMap<>();
ReleaseDTO latestRelease = releaseAPI.loadLatestRelease(appId,env,clusterName,namespaceName);
if (latestRelease != null) {
releaseItemDTOs = GSON.fromJson(latestRelease.getConfigurations(), GsonType.CONFIG);
}
List<ItemDTO> baseItems = itemAPI.findItems(appId, env, clusterName, namespaceName);
Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems);
Map<String, ItemDTO> deletedItemDTOs = new HashMap<>();
//deleted items for comment
findDeletedItems(appId, env, clusterName, namespaceName).forEach(item -> {
deletedItemDTOs.put(item.getKey(),item);
});
ItemChangeSets changeSets = new ItemChangeSets();
AtomicInteger lineNum = new AtomicInteger(1);
releaseItemDTOs.forEach((key,value) -> {
ItemDTO oldItem = oldKeyMapItem.get(key);
if (oldItem == null) {
ItemDTO deletedItemDto = deletedItemDTOs.computeIfAbsent(key, k -> new ItemDTO());
changeSets.addCreateItem(buildNormalItem(0L, namespaceId,key,value,deletedItemDto.getComment(),lineNum.get()));
} else if (!oldItem.getValue().equals(value) || lineNum.get() != oldItem
.getLineNum()) {
changeSets.addUpdateItem(buildNormalItem(oldItem.getId(), namespaceId, key,
value, oldItem.getComment(), lineNum.get()));
}
oldKeyMapItem.remove(key);
lineNum.set(lineNum.get() + 1);
});
oldKeyMapItem.forEach((key, value) -> changeSets.addDeleteItem(oldKeyMapItem.get(key)));
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public List<ItemDiffs> compare(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> result = new LinkedList<>();
for (NamespaceIdentifier namespace : comparedNamespaces) {
ItemDiffs itemDiffs = new ItemDiffs(namespace);
try {
itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems));
} catch (BadRequestException e) {
itemDiffs.setDiffs(new ItemChangeSets());
itemDiffs.setExtInfo("该集群下没有名为 " + namespace.getNamespaceName() + " 的namespace");
}
result.add(itemDiffs);
}
return result;
}
private long getNamespaceId(NamespaceIdentifier namespaceIdentifier) {
String appId = namespaceIdentifier.getAppId();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
Env env = namespaceIdentifier.getEnv();
NamespaceDTO namespaceDTO = null;
try {
namespaceDTO = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
} catch (HttpClientErrorException e) {
if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
throw new BadRequestException(String.format(
"namespace not exist. appId:%s, env:%s, clusterName:%s, namespaceName:%s", appId, env, clusterName,
namespaceName));
}
throw e;
}
return namespaceDTO.getId();
}
private ItemChangeSets parseChangeSets(NamespaceIdentifier namespace, List<ItemDTO> sourceItems) {
ItemChangeSets changeSets = new ItemChangeSets();
List<ItemDTO>
targetItems =
itemAPI.findItems(namespace.getAppId(), namespace.getEnv(),
namespace.getClusterName(), namespace.getNamespaceName());
long namespaceId = getNamespaceId(namespace);
if (CollectionUtils.isEmpty(targetItems)) {//all source items is added
int lineNum = 1;
for (ItemDTO sourceItem : sourceItems) {
changeSets.addCreateItem(buildItem(namespaceId, lineNum++, sourceItem));
}
} else {
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", targetItems);
String key, sourceValue, sourceComment;
ItemDTO targetItem = null;
int maxLineNum = targetItems.size();//append to last
for (ItemDTO sourceItem : sourceItems) {
key = sourceItem.getKey();
sourceValue = sourceItem.getValue();
sourceComment = sourceItem.getComment();
targetItem = targetItemMap.get(key);
if (targetItem == null) {//added items
changeSets.addCreateItem(buildItem(namespaceId, ++maxLineNum, sourceItem));
} else if (isModified(sourceValue, targetItem.getValue(), sourceComment,
targetItem.getComment())) {//modified items
targetItem.setValue(sourceValue);
targetItem.setComment(sourceComment);
changeSets.addUpdateItem(targetItem);
}
}
}
return changeSets;
}
private ItemDTO buildItem(long namespaceId, int lineNum, ItemDTO sourceItem) {
ItemDTO createdItem = new ItemDTO();
BeanUtils.copyEntityProperties(sourceItem, createdItem);
createdItem.setLineNum(lineNum);
createdItem.setNamespaceId(namespaceId);
return createdItem;
}
private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) {
ItemDTO item = new ItemDTO(key, value, comment, lineNum);
item.setId(id);
item.setNamespaceId(namespaceId);
return item;
}
private boolean isModified(String sourceValue, String targetValue, String sourceComment, String targetComment) {
if (!sourceValue.equals(targetValue)) {
return true;
}
if (sourceComment == null) {
return !StringUtils.isEmpty(targetComment);
}
if (targetComment != null) {
return !sourceComment.equals(targetComment);
}
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.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ItemAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.NamespaceAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseAPI;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.ConfigTextResolver;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifier;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.HttpClientErrorException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.NamespaceAPI namespaceAPI;
private final AdminServiceAPI.ItemAPI itemAPI;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
private final ConfigTextResolver fileTextResolver;
private final ConfigTextResolver propertyResolver;
public ItemService(
final UserInfoHolder userInfoHolder,
final NamespaceAPI namespaceAPI,
final ItemAPI itemAPI,
final ReleaseAPI releaseAPI,
final @Qualifier("fileTextResolver") ConfigTextResolver fileTextResolver,
final @Qualifier("propertyResolver") ConfigTextResolver propertyResolver) {
this.userInfoHolder = userInfoHolder;
this.namespaceAPI = namespaceAPI;
this.itemAPI = itemAPI;
this.releaseAPI = releaseAPI;
this.fileTextResolver = fileTextResolver;
this.propertyResolver = propertyResolver;
}
/**
* parse config text and update config items
*
* @return parse result
*/
public void updateConfigItemByText(NamespaceTextModel model) {
String appId = model.getAppId();
Env env = model.getEnv();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
String configText = model.getConfigText();
ConfigTextResolver resolver =
model.getFormat() == ConfigFileFormat.Properties ? propertyResolver : fileTextResolver;
ItemChangeSets changeSets = resolver.resolve(namespaceId, configText,
itemAPI.findItems(appId, env, clusterName, namespaceName));
if (changeSets.isEmpty()) {
return;
}
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public void updateItems(String appId, Env env, String clusterName, String namespaceName, ItemChangeSets changeSets){
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
item.setNamespaceId(namespace.getId());
ItemDTO itemDTO = itemAPI.createItem(appId, env, clusterName, namespaceName, item);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return itemDTO;
}
public void updateItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
itemAPI.updateItem(appId, env, clusterName, namespaceName, item.getId(), item);
}
public void deleteItem(Env env, long itemId, String userId) {
itemAPI.deleteItem(env, itemId, userId);
}
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findItems(appId, env, clusterName, namespaceName);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findDeletedItems(appId, env, clusterName, namespaceName);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return itemAPI.loadItem(env, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
ItemDTO item = itemAPI.loadItemById(env, itemId);
if (item == null) {
throw new BadRequestException("item not found for itemId " + itemId);
}
return item;
}
public void syncItems(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> itemDiffs = compare(comparedNamespaces, sourceItems);
for (ItemDiffs itemDiff : itemDiffs) {
NamespaceIdentifier namespaceIdentifier = itemDiff.getNamespace();
ItemChangeSets changeSets = itemDiff.getDiffs();
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
String appId = namespaceIdentifier.getAppId();
Env env = namespaceIdentifier.getEnv();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.SYNC_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
}
public void revokeItem(String appId, Env env, String clusterName, String namespaceName) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
Map<String, String> releaseItemDTOs = new HashMap<>();
ReleaseDTO latestRelease = releaseAPI.loadLatestRelease(appId,env,clusterName,namespaceName);
if (latestRelease != null) {
releaseItemDTOs = GSON.fromJson(latestRelease.getConfigurations(), GsonType.CONFIG);
}
List<ItemDTO> baseItems = itemAPI.findItems(appId, env, clusterName, namespaceName);
Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems);
Map<String, ItemDTO> deletedItemDTOs = new HashMap<>();
//deleted items for comment
findDeletedItems(appId, env, clusterName, namespaceName).forEach(item -> {
deletedItemDTOs.put(item.getKey(),item);
});
ItemChangeSets changeSets = new ItemChangeSets();
AtomicInteger lineNum = new AtomicInteger(1);
releaseItemDTOs.forEach((key,value) -> {
ItemDTO oldItem = oldKeyMapItem.get(key);
if (oldItem == null) {
ItemDTO deletedItemDto = deletedItemDTOs.computeIfAbsent(key, k -> new ItemDTO());
changeSets.addCreateItem(buildNormalItem(0L, namespaceId,key,value,deletedItemDto.getComment(),lineNum.get()));
} else if (!oldItem.getValue().equals(value) || lineNum.get() != oldItem
.getLineNum()) {
changeSets.addUpdateItem(buildNormalItem(oldItem.getId(), namespaceId, key,
value, oldItem.getComment(), lineNum.get()));
}
oldKeyMapItem.remove(key);
lineNum.set(lineNum.get() + 1);
});
oldKeyMapItem.forEach((key, value) -> changeSets.addDeleteItem(oldKeyMapItem.get(key)));
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public List<ItemDiffs> compare(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> result = new LinkedList<>();
for (NamespaceIdentifier namespace : comparedNamespaces) {
ItemDiffs itemDiffs = new ItemDiffs(namespace);
try {
itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems));
} catch (BadRequestException e) {
itemDiffs.setDiffs(new ItemChangeSets());
itemDiffs.setExtInfo("该集群下没有名为 " + namespace.getNamespaceName() + " 的namespace");
}
result.add(itemDiffs);
}
return result;
}
private long getNamespaceId(NamespaceIdentifier namespaceIdentifier) {
String appId = namespaceIdentifier.getAppId();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
Env env = namespaceIdentifier.getEnv();
NamespaceDTO namespaceDTO = null;
try {
namespaceDTO = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
} catch (HttpClientErrorException e) {
if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
throw new BadRequestException(String.format(
"namespace not exist. appId:%s, env:%s, clusterName:%s, namespaceName:%s", appId, env, clusterName,
namespaceName));
}
throw e;
}
return namespaceDTO.getId();
}
private ItemChangeSets parseChangeSets(NamespaceIdentifier namespace, List<ItemDTO> sourceItems) {
ItemChangeSets changeSets = new ItemChangeSets();
List<ItemDTO>
targetItems =
itemAPI.findItems(namespace.getAppId(), namespace.getEnv(),
namespace.getClusterName(), namespace.getNamespaceName());
long namespaceId = getNamespaceId(namespace);
if (CollectionUtils.isEmpty(targetItems)) {//all source items is added
int lineNum = 1;
for (ItemDTO sourceItem : sourceItems) {
changeSets.addCreateItem(buildItem(namespaceId, lineNum++, sourceItem));
}
} else {
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", targetItems);
String key, sourceValue, sourceComment;
ItemDTO targetItem = null;
int maxLineNum = targetItems.size();//append to last
for (ItemDTO sourceItem : sourceItems) {
key = sourceItem.getKey();
sourceValue = sourceItem.getValue();
sourceComment = sourceItem.getComment();
targetItem = targetItemMap.get(key);
if (targetItem == null) {//added items
changeSets.addCreateItem(buildItem(namespaceId, ++maxLineNum, sourceItem));
} else if (isModified(sourceValue, targetItem.getValue(), sourceComment,
targetItem.getComment())) {//modified items
targetItem.setValue(sourceValue);
targetItem.setComment(sourceComment);
changeSets.addUpdateItem(targetItem);
}
}
}
return changeSets;
}
private ItemDTO buildItem(long namespaceId, int lineNum, ItemDTO sourceItem) {
ItemDTO createdItem = new ItemDTO();
BeanUtils.copyEntityProperties(sourceItem, createdItem);
createdItem.setLineNum(lineNum);
createdItem.setNamespaceId(namespaceId);
return createdItem;
}
private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) {
ItemDTO item = new ItemDTO(key, value, comment, lineNum);
item.setId(id);
item.setNamespaceId(namespaceId);
return item;
}
private boolean isModified(String sourceValue, String targetValue, String sourceComment, String targetComment) {
if (!sourceValue.equals(targetValue)) {
return true;
}
if (sourceComment == null) {
return !StringUtils.isEmpty(targetComment);
}
if (targetComment != null) {
return !sourceComment.equals(targetComment);
}
return false;
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/integration/ConfigIntegrationTest.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.integration;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.apollo.util.OrderedProperties;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
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.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.util.ReflectionTestUtils;
import com.ctrip.framework.apollo.BaseIntegrationTest;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.internals.RemoteConfigLongPollService;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.SettableFuture;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigIntegrationTest extends BaseIntegrationTest {
private String someReleaseKey;
private File configDir;
private String defaultNamespace;
private String someOtherNamespace;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Before
public void setUp() throws Exception {
super.setUp();
defaultNamespace = ConfigConsts.NAMESPACE_APPLICATION;
someOtherNamespace = "someOtherNamespace";
someReleaseKey = "1";
configDir = new File(ClassLoaderUtil.getClassPath() + "config-cache");
if (configDir.exists()) {
configDir.delete();
}
configDir.mkdirs();
remoteConfigLongPollService = ApolloInjector.getInstance(RemoteConfigLongPollService.class);
}
@Override
@After
public void tearDown() throws Exception {
ReflectionTestUtils.invokeMethod(remoteConfigLongPollService, "stopLongPollingRefresh");
recursiveDelete(configDir);
super.tearDown();
}
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
try {
Files.deleteIfExists(file.toPath());
} catch (IOException e) {
e.printStackTrace();
}
}
@Test
public void testGetConfigWithNoLocalFileButWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String someNonExistedKey = "someNonExistedKey";
String someDefaultValue = "someDefaultValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someDefaultValue, config.getProperty(someNonExistedKey, someDefaultValue));
}
@Test
public void testOrderGetConfigWithNoLocalFileButWithRemoteConfig() throws Exception {
setPropertiesOrderEnabled(true);
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
Map<String, String> configurations = new LinkedHashMap<>();
configurations.put(someKey1, someValue1);
configurations.put(someKey2, someValue2);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.copyOf(configurations));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
}
@Test
public void testGetConfigWithLocalFileAndWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
Properties properties = new Properties();
properties.put(someKey, someValue);
createLocalCachePropertyFile(properties);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, anotherValue));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testOrderGetConfigWithLocalFileAndWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String anotherValue1 = "anotherValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
setPropertiesOrderEnabled(true);
Properties properties = new OrderedProperties();
properties.put(someKey, someValue);
properties.put(someKey1, someValue1);
properties.put(someKey2, someValue2);
createLocalCachePropertyFile(properties);
Map<String, String> configurations = new LinkedHashMap<>();
configurations.put(someKey, anotherValue);
configurations.put(someKey1, anotherValue1);
configurations.put(someKey2, someValue2);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.copyOf(configurations));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(anotherValue, config.getProperty(someKey, null));
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey, it.next());
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
assertEquals(anotherValue1, config.getProperty(someKey1, ""));
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteConfigError() throws Exception {
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
String someKey = "someKey";
String someDefaultValue = "defaultValue" + Math.random();
assertEquals(someDefaultValue, config.getProperty(someKey, someDefaultValue));
}
@Test
public void testGetConfigWithLocalFileAndRemoteConfigError() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Properties properties = new Properties();
properties.put(someKey, someValue);
createLocalCachePropertyFile(properties);
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testOrderGetConfigWithLocalFileAndRemoteConfigError() throws Exception {
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
setPropertiesOrderEnabled(true);
Properties properties = new OrderedProperties();
properties.put(someKey1, someValue1);
properties.put(someKey2, someValue2);
createLocalCachePropertyFile(properties);
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue1, config.getProperty(someKey1, null));
assertEquals(someValue2, config.getProperty(someKey2, null));
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteMetaServiceRetry() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
boolean failAtFirstTime = true;
ContextHandler metaServerHandler = mockMetaServerHandler(failAtFirstTime);
startServerWithHandlers(metaServerHandler, configHandler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteConfigServiceRetry() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
boolean failedAtFirstTime = true;
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig, failedAtFirstTime);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testRefreshConfig() throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
int someRefreshInterval = 500;
TimeUnit someRefreshTimeUnit = TimeUnit.MILLISECONDS;
setRefreshInterval(someRefreshInterval);
setRefreshTimeUnit(someRefreshTimeUnit);
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
final List<ConfigChangeEvent> changeEvents = Lists.newArrayList();
final SettableFuture<Boolean> refreshFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
AtomicInteger counter = new AtomicInteger(0);
@Override
public void onChange(ConfigChangeEvent changeEvent) {
//only need to assert once
if (counter.incrementAndGet() > 1) {
return;
}
assertEquals(1, changeEvent.changedKeys().size());
assertTrue(changeEvent.isChanged(someKey));
assertEquals(someValue, changeEvent.getChange(someKey).getOldValue());
assertEquals(anotherValue, changeEvent.getChange(someKey).getNewValue());
// if there is any assertion failed above, this line won't be executed
changeEvents.add(changeEvent);
refreshFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
refreshFinished.get(someRefreshInterval * 5, someRefreshTimeUnit);
assertThat(
"Change event's size should equal to one or there must be some assertion failed in change listener",
1, equalTo(changeEvents.size()));
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testLongPollRefresh() throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(pollTimeoutInMS * 20, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testLongPollRefreshWithMultipleNamespacesAndOnlyOneNamespaceNotified()
throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config someOtherConfig = ConfigService.getConfig(someOtherNamespace);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
TimeUnit.MILLISECONDS.sleep(pollTimeoutInMS * 10);
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
}
@Test
public void testLongPollRefreshWithMultipleNamespacesAndMultipleNamespaceNotified()
throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId),
new ApolloConfigNotification(someOtherNamespace, someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config config = ConfigService.getAppConfig();
Config someOtherConfig = ConfigService.getConfig(someOtherNamespace);
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
final SettableFuture<Boolean> someOtherNamespacelongPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
someOtherConfig.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
someOtherNamespacelongPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(5000, TimeUnit.MILLISECONDS);
someOtherNamespacelongPollFinished.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
assertEquals(anotherValue, someOtherConfig.getProperty(someKey, null));
}
private ContextHandler mockPollNotificationHandler(final long pollResultTimeOutInMS,
final int statusCode,
final List<ApolloConfigNotification> result,
final boolean failedAtFirstTime) {
ContextHandler context = new ContextHandler("/notifications/v2");
context.setHandler(new AbstractHandler() {
AtomicInteger counter = new AtomicInteger(0);
@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;
}
try {
TimeUnit.MILLISECONDS.sleep(pollResultTimeOutInMS);
} catch (InterruptedException e) {
}
response.setContentType("application/json;charset=UTF-8");
response.setStatus(statusCode);
response.getWriter().println(gson.toJson(result));
baseRequest.setHandled(true);
}
});
return context;
}
private ContextHandler mockConfigServerHandler(final int statusCode, final ApolloConfig result,
final boolean failedAtFirstTime) {
ContextHandler context = new ContextHandler("/configs/*");
context.setHandler(new AbstractHandler() {
AtomicInteger counter = new AtomicInteger(0);
@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(statusCode);
response.getWriter().println(gson.toJson(result));
baseRequest.setHandled(true);
}
});
return context;
}
private ContextHandler mockConfigServerHandler(int statusCode, ApolloConfig result) {
return mockConfigServerHandler(statusCode, result, false);
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, defaultNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(configDir, assembleLocalCacheFileName());
try (FileOutputStream in = new FileOutputStream(file)) {
properties.store(in, "Persisted by ConfigIntegrationTest");
}
return file;
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someClusterName, defaultNamespace));
}
}
| /*
* 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.integration;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import com.ctrip.framework.apollo.util.OrderedProperties;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
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.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.util.ReflectionTestUtils;
import com.ctrip.framework.apollo.BaseIntegrationTest;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.internals.RemoteConfigLongPollService;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.SettableFuture;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigIntegrationTest extends BaseIntegrationTest {
private String someReleaseKey;
private File configDir;
private String defaultNamespace;
private String someOtherNamespace;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Before
public void setUp() throws Exception {
super.setUp();
defaultNamespace = ConfigConsts.NAMESPACE_APPLICATION;
someOtherNamespace = "someOtherNamespace";
someReleaseKey = "1";
configDir = new File(ClassLoaderUtil.getClassPath() + "config-cache");
if (configDir.exists()) {
configDir.delete();
}
configDir.mkdirs();
remoteConfigLongPollService = ApolloInjector.getInstance(RemoteConfigLongPollService.class);
}
@Override
@After
public void tearDown() throws Exception {
ReflectionTestUtils.invokeMethod(remoteConfigLongPollService, "stopLongPollingRefresh");
recursiveDelete(configDir);
super.tearDown();
}
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
try {
Files.deleteIfExists(file.toPath());
} catch (IOException e) {
e.printStackTrace();
}
}
@Test
public void testGetConfigWithNoLocalFileButWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String someNonExistedKey = "someNonExistedKey";
String someDefaultValue = "someDefaultValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someDefaultValue, config.getProperty(someNonExistedKey, someDefaultValue));
}
@Test
public void testOrderGetConfigWithNoLocalFileButWithRemoteConfig() throws Exception {
setPropertiesOrderEnabled(true);
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
Map<String, String> configurations = new LinkedHashMap<>();
configurations.put(someKey1, someValue1);
configurations.put(someKey2, someValue2);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.copyOf(configurations));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
}
@Test
public void testGetConfigWithLocalFileAndWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
Properties properties = new Properties();
properties.put(someKey, someValue);
createLocalCachePropertyFile(properties);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, anotherValue));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testOrderGetConfigWithLocalFileAndWithRemoteConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String anotherValue1 = "anotherValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
setPropertiesOrderEnabled(true);
Properties properties = new OrderedProperties();
properties.put(someKey, someValue);
properties.put(someKey1, someValue1);
properties.put(someKey2, someValue2);
createLocalCachePropertyFile(properties);
Map<String, String> configurations = new LinkedHashMap<>();
configurations.put(someKey, anotherValue);
configurations.put(someKey1, anotherValue1);
configurations.put(someKey2, someValue2);
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.copyOf(configurations));
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(anotherValue, config.getProperty(someKey, null));
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey, it.next());
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
assertEquals(anotherValue1, config.getProperty(someKey1, ""));
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteConfigError() throws Exception {
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
String someKey = "someKey";
String someDefaultValue = "defaultValue" + Math.random();
assertEquals(someDefaultValue, config.getProperty(someKey, someDefaultValue));
}
@Test
public void testGetConfigWithLocalFileAndRemoteConfigError() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Properties properties = new Properties();
properties.put(someKey, someValue);
createLocalCachePropertyFile(properties);
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testOrderGetConfigWithLocalFileAndRemoteConfigError() throws Exception {
String someKey1 = "someKey1";
String someValue1 = "someValue1";
String someKey2 = "someKey2";
String someValue2 = "someValue2";
setPropertiesOrderEnabled(true);
Properties properties = new OrderedProperties();
properties.put(someKey1, someValue1);
properties.put(someKey2, someValue2);
createLocalCachePropertyFile(properties);
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue1, config.getProperty(someKey1, null));
assertEquals(someValue2, config.getProperty(someKey2, null));
Set<String> propertyNames = config.getPropertyNames();
Iterator<String> it = propertyNames.iterator();
assertEquals(someKey1, it.next());
assertEquals(someKey2, it.next());
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteMetaServiceRetry() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
boolean failAtFirstTime = true;
ContextHandler metaServerHandler = mockMetaServerHandler(failAtFirstTime);
startServerWithHandlers(metaServerHandler, configHandler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testGetConfigWithNoLocalFileAndRemoteConfigServiceRetry() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
ApolloConfig apolloConfig = assembleApolloConfig(ImmutableMap.of(someKey, someValue));
boolean failedAtFirstTime = true;
ContextHandler handler =
mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig, failedAtFirstTime);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
}
@Test
public void testRefreshConfig() throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
int someRefreshInterval = 500;
TimeUnit someRefreshTimeUnit = TimeUnit.MILLISECONDS;
setRefreshInterval(someRefreshInterval);
setRefreshTimeUnit(someRefreshTimeUnit);
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler handler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
startServerWithHandlers(handler);
Config config = ConfigService.getAppConfig();
final List<ConfigChangeEvent> changeEvents = Lists.newArrayList();
final SettableFuture<Boolean> refreshFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
AtomicInteger counter = new AtomicInteger(0);
@Override
public void onChange(ConfigChangeEvent changeEvent) {
//only need to assert once
if (counter.incrementAndGet() > 1) {
return;
}
assertEquals(1, changeEvent.changedKeys().size());
assertTrue(changeEvent.isChanged(someKey));
assertEquals(someValue, changeEvent.getChange(someKey).getOldValue());
assertEquals(anotherValue, changeEvent.getChange(someKey).getNewValue());
// if there is any assertion failed above, this line won't be executed
changeEvents.add(changeEvent);
refreshFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
refreshFinished.get(someRefreshInterval * 5, someRefreshTimeUnit);
assertThat(
"Change event's size should equal to one or there must be some assertion failed in change listener",
1, equalTo(changeEvents.size()));
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testLongPollRefresh() throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(pollTimeoutInMS * 20, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
}
@Test
public void testLongPollRefreshWithMultipleNamespacesAndOnlyOneNamespaceNotified()
throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config someOtherConfig = ConfigService.getConfig(someOtherNamespace);
Config config = ConfigService.getAppConfig();
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
TimeUnit.MILLISECONDS.sleep(pollTimeoutInMS * 10);
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
}
@Test
public void testLongPollRefreshWithMultipleNamespacesAndMultipleNamespaceNotified()
throws Exception {
final String someKey = "someKey";
final String someValue = "someValue";
final String anotherValue = "anotherValue";
long someNotificationId = 1;
long pollTimeoutInMS = 50;
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig apolloConfig = assembleApolloConfig(configurations);
ContextHandler configHandler = mockConfigServerHandler(HttpServletResponse.SC_OK, apolloConfig);
ContextHandler pollHandler =
mockPollNotificationHandler(pollTimeoutInMS, HttpServletResponse.SC_OK,
Lists.newArrayList(
new ApolloConfigNotification(apolloConfig.getNamespaceName(), someNotificationId),
new ApolloConfigNotification(someOtherNamespace, someNotificationId)),
false);
startServerWithHandlers(configHandler, pollHandler);
Config config = ConfigService.getAppConfig();
Config someOtherConfig = ConfigService.getConfig(someOtherNamespace);
assertEquals(someValue, config.getProperty(someKey, null));
assertEquals(someValue, someOtherConfig.getProperty(someKey, null));
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
final SettableFuture<Boolean> someOtherNamespacelongPollFinished = SettableFuture.create();
config.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
longPollFinished.set(true);
}
});
someOtherConfig.addChangeListener(new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
someOtherNamespacelongPollFinished.set(true);
}
});
apolloConfig.getConfigurations().put(someKey, anotherValue);
longPollFinished.get(5000, TimeUnit.MILLISECONDS);
someOtherNamespacelongPollFinished.get(5000, TimeUnit.MILLISECONDS);
assertEquals(anotherValue, config.getProperty(someKey, null));
assertEquals(anotherValue, someOtherConfig.getProperty(someKey, null));
}
private ContextHandler mockPollNotificationHandler(final long pollResultTimeOutInMS,
final int statusCode,
final List<ApolloConfigNotification> result,
final boolean failedAtFirstTime) {
ContextHandler context = new ContextHandler("/notifications/v2");
context.setHandler(new AbstractHandler() {
AtomicInteger counter = new AtomicInteger(0);
@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;
}
try {
TimeUnit.MILLISECONDS.sleep(pollResultTimeOutInMS);
} catch (InterruptedException e) {
}
response.setContentType("application/json;charset=UTF-8");
response.setStatus(statusCode);
response.getWriter().println(gson.toJson(result));
baseRequest.setHandled(true);
}
});
return context;
}
private ContextHandler mockConfigServerHandler(final int statusCode, final ApolloConfig result,
final boolean failedAtFirstTime) {
ContextHandler context = new ContextHandler("/configs/*");
context.setHandler(new AbstractHandler() {
AtomicInteger counter = new AtomicInteger(0);
@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(statusCode);
response.getWriter().println(gson.toJson(result));
baseRequest.setHandled(true);
}
});
return context;
}
private ContextHandler mockConfigServerHandler(int statusCode, ApolloConfig result) {
return mockConfigServerHandler(statusCode, result, false);
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, defaultNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(configDir, assembleLocalCacheFileName());
try (FileOutputStream in = new FileOutputStream(file)) {
properties.store(in, "Persisted by ConfigIntegrationTest");
}
return file;
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someClusterName, defaultNamespace));
}
}
| -1 |
apolloconfig/apollo | 3,804 | feature: add the delegating password encoder for apollo-portal simple auth | ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-07-02T11:16:09Z | 2021-07-10T08:12:21Z | 907dbad14e2d76bf1ffa3645d115534632e28cc2 | 72a04989d049e182dd409e2a76e5c0e4448a8a2d | feature: add the delegating password encoder for apollo-portal simple auth. ## What's the purpose of this PR
the best algorithm for password storage should change some day in the future. the `DelegatingPasswordEncoder` can makes the algorithm upgrade seamless.
## Brief changelog
1. extend the `ApolloPortalDB`.`Users`.`Password` to 512
2. replace the `BCryptPasswordEncoder` with the `DelegatingPasswordEncoder` backend of the `BCryptPasswordEncoder`
3. add a `PlaceholderPasswordEncoder` which return a random string as encoded password and never matches any encoded password.
4. replace the random string password for oidc with the `DelegatingPasswordEncoder` backend of the `PlaceholderPasswordEncoder`
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/resources/datasource.xml | <!--
~ 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.
~
-->
<!--
for ctrip datasource
-->
<Datasources>
<Datasource
name="${pro_titan_dbname}"
testWhileIdle="true"
testOnBorrow="true"
testOnReturn="false"
validationQuery="SELECT 1"
initSql="set names utf8mb4"
validationInterval="30000"
timeBetweenEvictionRunsMillis="5000"
maxActive="100"
minIdle="10"
maxWait="10000"
initialSize="10"
removeAbandonedTimeout="60"
removeAbandoned="true"
logAbandoned="false"
minEvictableIdleTimeMillis="30000"
option="sendStringParametersAsUnicode=false"
/>
</Datasources>
| <!--
~ 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.
~
-->
<!--
for ctrip datasource
-->
<Datasources>
<Datasource
name="${pro_titan_dbname}"
testWhileIdle="true"
testOnBorrow="true"
testOnReturn="false"
validationQuery="SELECT 1"
initSql="set names utf8mb4"
validationInterval="30000"
timeBetweenEvictionRunsMillis="5000"
maxActive="100"
minIdle="10"
maxWait="10000"
initialSize="10"
removeAbandonedTimeout="60"
removeAbandoned="true"
logAbandoned="false"
minEvictableIdleTimeMillis="30000"
option="sendStringParametersAsUnicode=false"
/>
</Datasources>
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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)
------------------
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)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/openapi/v1/controller/ItemController.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.v1.controller;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.RequestPrecondition;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils;
import com.ctrip.framework.apollo.portal.service.ItemService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpStatusCodeException;
import javax.servlet.http.HttpServletRequest;
@RestController("openapiItemController")
@RequestMapping("/openapi/v1/envs/{env}")
public class ItemController {
private final ItemService itemService;
private final UserService userService;
public ItemController(final ItemService itemService, final UserService userService) {
this.itemService = itemService;
this.userService = userService;
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public OpenItemDTO getItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String key) {
ItemDTO itemDTO = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key);
return itemDTO == null ? null : OpenApiBeanUtils.transformFromItemDTO(itemDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items")
public OpenItemDTO createItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@RequestBody OpenItemDTO item, HttpServletRequest request) {
RequestPrecondition.checkArguments(
!StringUtils.isContainEmpty(item.getKey(), item.getDataChangeCreatedBy()),
"key and dataChangeCreatedBy should not be null or empty");
if (userService.findByUserId(item.getDataChangeCreatedBy()) == null) {
throw new BadRequestException("User " + item.getDataChangeCreatedBy() + " doesn't exist!");
}
if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 64){
throw new BadRequestException("Comment length should not exceed 64 characters");
}
ItemDTO toCreate = OpenApiBeanUtils.transformToItemDTO(item);
//protect
toCreate.setLineNum(0);
toCreate.setId(0);
toCreate.setDataChangeLastModifiedBy(toCreate.getDataChangeCreatedBy());
toCreate.setDataChangeLastModifiedTime(null);
toCreate.setDataChangeCreatedTime(null);
ItemDTO createdItem = itemService.createItem(appId, Env.valueOf(env),
clusterName, namespaceName, toCreate);
return OpenApiBeanUtils.transformFromItemDTO(createdItem);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public void updateItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String key, @RequestBody OpenItemDTO item,
@RequestParam(defaultValue = "false") boolean createIfNotExists, HttpServletRequest request) {
RequestPrecondition.checkArguments(item != null, "item payload can not be empty");
RequestPrecondition.checkArguments(
!StringUtils.isContainEmpty(item.getKey(), item.getDataChangeLastModifiedBy()),
"key and dataChangeLastModifiedBy can not be empty");
RequestPrecondition.checkArguments(item.getKey().equals(key), "Key in path and payload is not consistent");
if (userService.findByUserId(item.getDataChangeLastModifiedBy()) == null) {
throw new BadRequestException("user(dataChangeLastModifiedBy) not exists");
}
if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 64){
throw new BadRequestException("Comment length should not exceed 64 characters");
}
try {
ItemDTO toUpdateItem = itemService
.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, item.getKey());
//protect. only value,comment,lastModifiedBy can be modified
toUpdateItem.setComment(item.getComment());
toUpdateItem.setValue(item.getValue());
toUpdateItem.setDataChangeLastModifiedBy(item.getDataChangeLastModifiedBy());
itemService.updateItem(appId, Env.valueOf(env), clusterName, namespaceName, toUpdateItem);
} catch (Throwable ex) {
if (ex instanceof HttpStatusCodeException) {
// check createIfNotExists
if (((HttpStatusCodeException) ex).getStatusCode().equals(HttpStatus.NOT_FOUND) && createIfNotExists) {
createItem(appId, env, clusterName, namespaceName, item, request);
return;
}
}
throw ex;
}
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public void deleteItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String key, @RequestParam String operator,
HttpServletRequest request) {
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("user(operator) not exists");
}
ItemDTO toDeleteItem = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key);
if (toDeleteItem == null){
throw new BadRequestException("item not exists");
}
itemService.deleteItem(Env.valueOf(env), toDeleteItem.getId(), 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.openapi.v1.controller;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.RequestPrecondition;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils;
import com.ctrip.framework.apollo.portal.service.ItemService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpStatusCodeException;
import javax.servlet.http.HttpServletRequest;
@RestController("openapiItemController")
@RequestMapping("/openapi/v1/envs/{env}")
public class ItemController {
private final ItemService itemService;
private final UserService userService;
public ItemController(final ItemService itemService, final UserService userService) {
this.itemService = itemService;
this.userService = userService;
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public OpenItemDTO getItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String key) {
ItemDTO itemDTO = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key);
return itemDTO == null ? null : OpenApiBeanUtils.transformFromItemDTO(itemDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items")
public OpenItemDTO createItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@RequestBody OpenItemDTO item, HttpServletRequest request) {
RequestPrecondition.checkArguments(
!StringUtils.isContainEmpty(item.getKey(), item.getDataChangeCreatedBy()),
"key and dataChangeCreatedBy should not be null or empty");
if (userService.findByUserId(item.getDataChangeCreatedBy()) == null) {
throw new BadRequestException("User " + item.getDataChangeCreatedBy() + " doesn't exist!");
}
if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){
throw new BadRequestException("Comment length should not exceed 256 characters");
}
ItemDTO toCreate = OpenApiBeanUtils.transformToItemDTO(item);
//protect
toCreate.setLineNum(0);
toCreate.setId(0);
toCreate.setDataChangeLastModifiedBy(toCreate.getDataChangeCreatedBy());
toCreate.setDataChangeLastModifiedTime(null);
toCreate.setDataChangeCreatedTime(null);
ItemDTO createdItem = itemService.createItem(appId, Env.valueOf(env),
clusterName, namespaceName, toCreate);
return OpenApiBeanUtils.transformFromItemDTO(createdItem);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public void updateItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String key, @RequestBody OpenItemDTO item,
@RequestParam(defaultValue = "false") boolean createIfNotExists, HttpServletRequest request) {
RequestPrecondition.checkArguments(item != null, "item payload can not be empty");
RequestPrecondition.checkArguments(
!StringUtils.isContainEmpty(item.getKey(), item.getDataChangeLastModifiedBy()),
"key and dataChangeLastModifiedBy can not be empty");
RequestPrecondition.checkArguments(item.getKey().equals(key), "Key in path and payload is not consistent");
if (userService.findByUserId(item.getDataChangeLastModifiedBy()) == null) {
throw new BadRequestException("user(dataChangeLastModifiedBy) not exists");
}
if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){
throw new BadRequestException("Comment length should not exceed 256 characters");
}
try {
ItemDTO toUpdateItem = itemService
.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, item.getKey());
//protect. only value,comment,lastModifiedBy can be modified
toUpdateItem.setComment(item.getComment());
toUpdateItem.setValue(item.getValue());
toUpdateItem.setDataChangeLastModifiedBy(item.getDataChangeLastModifiedBy());
itemService.updateItem(appId, Env.valueOf(env), clusterName, namespaceName, toUpdateItem);
} catch (Throwable ex) {
if (ex instanceof HttpStatusCodeException) {
// check createIfNotExists
if (((HttpStatusCodeException) ex).getStatusCode().equals(HttpStatus.NOT_FOUND) && createIfNotExists) {
createItem(appId, env, clusterName, namespaceName, item, request);
return;
}
}
throw ex;
}
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}")
public void deleteItem(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String key, @RequestParam String operator,
HttpServletRequest request) {
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("user(operator) not exists");
}
ItemDTO toDeleteItem = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key);
if (toDeleteItem == null){
throw new BadRequestException("item not exists");
}
itemService.deleteItem(Env.valueOf(env), toDeleteItem.getId(), operator);
}
}
| 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/i18n/en.json | {
"Common.Title": "Apollo Configuration Center",
"Common.Ctrip": "Ctrip",
"Common.CtripDepartment": "Framework R&D Department",
"Common.Nav.ShowNavBar": "Display navigation bar",
"Common.Nav.HideNavBar": "Hide navigation bar",
"Common.Nav.Help": "Help",
"Common.Nav.AdminTools": "Admin Tools",
"Common.Nav.NonAdminTools": "Tools",
"Common.Nav.UserManage": "User Management",
"Common.Nav.SystemRoleManage": "System Permission Management",
"Common.Nav.OpenMange": "Open Platform Authorization Management",
"Common.Nav.SystemConfig": "System Configuration",
"Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace",
"Common.Nav.SystemInfo": "System Information",
"Common.Nav.ConfigExport": "Config Export",
"Common.Nav.Logout": "Logout",
"Common.Department": "Department",
"Common.Cluster": "Cluster",
"Common.Environment": "Environment",
"Common.Email": "Email",
"Common.AppId": "App Id",
"Common.Namespace": "Namespace",
"Common.AppName": "App Name",
"Common.AppOwner": "App Owner",
"Common.AppOwnerLong": "App Owner",
"Common.AppAdmin": "App Administrators",
"Common.ClusterName": "Cluster Name",
"Common.Submit": "Submit",
"Common.Save": "Save",
"Common.Created": "Create Successfully",
"Common.CreateFailed": "Fail to Create",
"Common.Deleted": "Delete Successfully",
"Common.DeleteFailed": "Fail to Delete",
"Common.ReturnToIndex": "Return to project page",
"Common.Cancel": "Cancel",
"Common.Ok": "OK",
"Common.Search": "Query",
"Common.IsRootUser": "Current page is only accessible to Apollo administrator.",
"Common.PleaseChooseDepartment": "Please select department",
"Common.PleaseChooseOwner": "Please select app owner",
"Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.",
"Component.DeleteNamespace.Title": "Delete Namespace",
"Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?",
"Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?",
"Component.GrayscalePublishRule.Title": "Edit Grayscale Rule",
"Component.GrayscalePublishRule.AppId": "Grayscale AppId",
"Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule",
"Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances",
"Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances",
"Component.GrayscalePublishRule.IP": "Grayscale IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)",
"Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ",
"Component.GrayscalePublishRule.EnterIp": "enter IP manually",
"Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.",
"Component.GrayscalePublishRule.Add": "Add",
"Component.ConfigItem.Title": "Add Configuration",
"Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)",
"Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration",
"Component.ConfigItem.ModifyItem": "Modify Configuration",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click",
"Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters",
"Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "Select Cluster",
"Component.MergePublish.Title": "Full Release",
"Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.",
"Component.MergePublish.NextStep": "After full release, choose which behavior you want",
"Component.MergePublish.DeleteGrayscale": "Delete grayscale version",
"Component.MergePublish.ReservedGrayscale": "Keep grayscale version",
"Component.Namespace.Branch.IsChanged": "Modified",
"Component.Namespace.Branch.ChangeUser": "Current Modifier",
"Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release",
"Component.Namespace.Branch.GrayscalePublish": "Grayscale Release",
"Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ",
"Component.Namespace.Branch.AllPublish": "Full Release",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version",
"Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale",
"Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.",
"Component.Namespace.Branch.Tab.Configuration": "Configuration",
"Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List",
"Component.Namespace.Branch.Tab.ChangeHistory": "Change History",
"Component.Namespace.Branch.Body.Item": "Grayscale Configuration",
"Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration",
"Component.Namespace.Branch.Body.PublishState": "Release Status",
"Component.Namespace.Branch.Body.ItemSort": "Sort",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value",
"Component.Namespace.Branch.Body.ItemComment": "Comment",
"Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.Branch.Body.ItemOperator": "Operation",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values",
"Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased",
"Component.Namespace.Branch.Body.ItemPublished": "Released",
"Component.Namespace.Branch.Body.ItemEffective": "Effective configuration",
"Component.Namespace.Branch.Body.ClickToSee": "Click to view",
"Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration",
"Component.Namespace.Branch.Body.Delete": "Deleted",
"Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version",
"Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration",
"Component.Namespace.Branch.Body.Modify": "Modified",
"Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version",
"Component.Namespace.Branch.Body.Added": "New",
"Component.Namespace.Branch.Body.Op.Modify": "Modify",
"Component.Namespace.Branch.Body.Op.Delete": "Delete",
"Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version",
"Component.Namespace.MasterBranch.Body.PublishState": "Release Status",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "Comment",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.MasterBranch.Body.ItemOperator": "Operation",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased",
"Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration",
"Component.Namespace.MasterBranch.Body.ItemPublished": "Released",
"Component.Namespace.MasterBranch.Body.AddedItem": "New configuration",
"Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List",
"Component.Namespace.Branch.GrayScaleRule.Operator": "Operation",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "Modify",
"Component.Namespace.Branch.GrayScaleRule.Delete": "Delete",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule",
"Component.Namespace.Branch.Instance.RefreshList": "Refresh List",
"Component.Namespace.Branch.Instance.ItemToSee": "View configuration",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time",
"Component.Namespace.Branch.Instance.LoadMore": "Refresh list",
"Component.Namespace.Branch.Instance.NoInstance": "No instance information",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "Add",
"Component.Namespace.Branch.History.Modified": "Update",
"Component.Namespace.Branch.History.Deleted": "Delete",
"Component.Namespace.Branch.History.LoadMore": "Load more",
"Component.Namespace.Branch.History.NoHistory": "No Change History",
"Component.Namespace.Header.Title.Private": "Private",
"Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}",
"Component.Namespace.Header.Title.Public": "Public",
"Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.",
"Component.Namespace.Header.Title.Extend": "Association",
"Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]",
"Component.Namespace.Header.Title.Master": "Main Version",
"Component.Namespace.Header.Title.Grayscale": "Grayscale Version",
"Component.Namespace.Master.LoadNamespace": "Load Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "Load Namespace",
"Component.Namespace.Master.Items.Changed": "Modified",
"Component.Namespace.Master.Items.ChangedUser": "Current modifier",
"Component.Namespace.Master.Items.Publish": "Release",
"Component.Namespace.Master.Items.PublishTips": "Release configuration",
"Component.Namespace.Master.Items.Rollback": "Rollback",
"Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration",
"Component.Namespace.Master.Items.PublishHistory": "Release History",
"Component.Namespace.Master.Items.PublishHistoryTips": "View the release history",
"Component.Namespace.Master.Items.Grant": "Authorize",
"Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission",
"Component.Namespace.Master.Items.Grayscale": "Grayscale",
"Component.Namespace.Master.Items.GrayscaleTips": "Create a test version",
"Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission",
"Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.",
"Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.",
"Component.Namespace.Master.Items.ItemList": "Table",
"Component.Namespace.Master.Items.ItemListByText": "Text",
"Component.Namespace.Master.Items.ItemHistory": "Change History",
"Component.Namespace.Master.Items.ItemInstance": "Instance List",
"Component.Namespace.Master.Items.CopyText": "Copy",
"Component.Namespace.Master.Items.GrammarCheck": "Syntax Check",
"Component.Namespace.Master.Items.CancelChanged": "Cancel",
"Component.Namespace.Master.Items.Change": "Modify",
"Component.Namespace.Master.Items.SummitChanged": "Submit",
"Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key",
"Component.Namespace.Master.Items.FilterItem": "Filter",
"Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes",
"Component.Namespace.Master.Items.RevokeItem" :"Revoke",
"Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments",
"Component.Namespace.Master.Items.SyncItem": "Synchronize",
"Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments",
"Component.Namespace.Master.Items.DiffItem": "Compare",
"Component.Namespace.Master.Items.AddItem": "Add Configuration",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.",
"Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter",
"Component.Namespace.Master.Items.Body.PublishState": "Release Status",
"Component.Namespace.Master.Items.Body.Sort": "Sort",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.Master.Items.Body.ItemOperator": "Operation",
"Component.Namespace.Master.Items.Body.NoPublish": "Unreleased",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values",
"Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value",
"Component.Namespace.Master.Items.Body.Published": "Released",
"Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration",
"Component.Namespace.Master.Items.Body.ClickToSee": "Click to view",
"Component.Namespace.Master.Items.Body.Grayscale": "Gray",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.",
"Component.Namespace.Master.Items.Body.NewAdded": "New",
"Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration",
"Component.Namespace.Master.Items.Body.Modified": "Modified",
"Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration",
"Component.Namespace.Master.Items.Body.Deleted": "Deleted",
"Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration",
"Component.Namespace.Master.Items.Body.ModifyTips": "Modify",
"Component.Namespace.Master.Items.Body.DeleteTips": "Delete",
"Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration",
"Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration",
"Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History",
"Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information",
"Component.PublishDeny.Title": "Release Restriction",
"Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.",
"Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)",
"Component.PublishDeny.EmergencyPublish": "Emergency Release",
"Component.PublishDeny.Close": "Close",
"Component.Publish.Title": "Release",
"Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})",
"Component.Publish.Grayscale": "Grayscale Release",
"Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)",
"Component.Publish.AllPublish": "Full Release",
"Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)",
"Component.Publish.ToSeeChange": "View changes",
"Component.Publish.PublishedValue": "Released values",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "Unreleased values",
"Component.Publish.ModifyUser": "Modifier",
"Component.Publish.ModifyTime": "Modified Time",
"Component.Publish.NewAdded": "New",
"Component.Publish.NewAddedTips": "New Configuration",
"Component.Publish.Modified": "Modified",
"Component.Publish.ModifiedTips": "Modified Configuration",
"Component.Publish.Deleted": "Deleted",
"Component.Publish.DeletedTips": "Deleted Configuration",
"Component.Publish.MasterValue": "Main version value",
"Component.Publish.GrayValue": "Grayscale version value",
"Component.Publish.GrayPublishedValue": "Released grayscale version value",
"Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value",
"Component.Publish.ItemNoChange": "No configuration changes",
"Component.Publish.GrayItemNoChange": "No configuration changes",
"Component.Publish.NoGrayItems": "No grayscale changes",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "Release",
"Component.Rollback.To": "roll back to",
"Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page",
"Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations",
"Component.Rollback.ClickToView": "Click to view",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "Before Rollback",
"Component.Rollback.RollbackAfterValue": "After Rollback",
"Component.Rollback.Added": "Add",
"Component.Rollback.Modified": "Update",
"Component.Rollback.Deleted": "Delete",
"Component.Rollback.NoChange": "No configuration changes",
"Component.Rollback.OpRollback": "Rollback",
"Component.ShowText.Title": "View",
"Login.Login": "Login",
"Login.UserNameOrPasswordIncorrect": "Incorrect username or password",
"Login.LogoutSuccessfully": "Logout Successfully",
"Index.MyProject": "My projects",
"Index.CreateProject": "Create project",
"Index.LoadMore": "Load more",
"Index.FavoriteItems": "Favorite projects",
"Index.Topping": "Top",
"Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.",
"Index.RecentlyViewedItems": "Recent projects",
"Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission",
"Index.Topped": "Top Successfully",
"Index.CancelledFavorite": "Remove favorite successfully",
"Cluster.CreateCluster": "Create Cluster",
"Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)",
"Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters",
"Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)",
"Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine",
"Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)",
"Cluster.ChooseEnvironment": "Environment",
"Cluster.LoadingEnvironmentError": "Error in loading environment information",
"Cluster.ClusterCreated": "Create cluster successfully",
"Cluster.ClusterCreateFailed": "Failed to create cluster",
"Cluster.PleaseChooseEnvironment": "Please select the environment",
"Config.Title": "Apollo Configuration Center",
"Config.AppIdNotFound": "doesn't exist, ",
"Config.ClickByCreate": "click to create",
"Config.EnvList": "Environments",
"Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters",
"Config.ProjectInfo": "Project Info",
"Config.ModifyBasicProjectInfo": "Modify project's basic information",
"Config.Favorite": "Favorite",
"Config.CancelFavorite": "Cancel Favorite",
"Config.MissEnv": "Missing environment",
"Config.MissNamespace": "Missing Namespace",
"Config.ProjectManage": "Manage Project",
"Config.AccessKeyManage": "Manage AccessKey",
"Config.CreateAppMissEnv": "Recover Environments",
"Config.CreateAppMissNamespace": "Recover Namespaces",
"Config.AddCluster": "Add Cluster",
"Config.AddNamespace": "Add Namespace",
"Config.CurrentlyOperatorEnv": "Current environment",
"Config.DoNotRemindAgain": "No longer prompt",
"Config.Note": "Note",
"Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!",
"Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.",
"Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.",
"Config.RevokeItem.DialogTitle": "Revoke configuration changes",
"Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?",
"Config.DeleteItem.DialogTitle": "Delete configuration",
"Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?",
"Config.PublishNoPermission.DialogTitle": "Release",
"Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.",
"Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission",
"Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.",
"Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission",
"Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission",
"Config.NamespaceLocked.DialogTitle": "Edit not allowed",
"Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.",
"Config.RollbackAlert.DialogTitle": "Rollback",
"Config.RollbackAlert.DialogContent": "Are you sure to roll back?",
"Config.EmergencyPublishAlert.DialogTitle": "Emergency release",
"Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?",
"Config.DeleteBranch.DialogTitle": "Delete grayscale",
"Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?",
"Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt",
"Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.",
"Config.MergeAndReleaseDeny.DialogTitle": "Full release",
"Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId",
"Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error",
"Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip",
"Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice",
"Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> 1. Create grayscale version <br> 2. Configure grayscale configuration items <br> 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.",
"Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.",
"Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.",
"Config.SystemError": "System error, please try again or contact the system administrator",
"Config.FavoriteSuccessfully": "Favorite Successfully",
"Config.FavoriteFailed": "Failed to favorite",
"Config.CancelledFavorite": "Cancel favorite successfully",
"Config.CancelFavoriteFailed": "Failed to cancel the favorite",
"Config.GetUserInfoFailed": "Failed to obtain user login information",
"Config.LoadingAllNamespaceError": "Failed to load configuration",
"Config.CancelFavoriteError": "Failure to Cancel Collection",
"Config.Deleted": "Delete Successfully",
"Config.DeleteFailed": "Failed to delete",
"Config.GrayscaleCreated": "Create Grayscale Successfully",
"Config.GrayscaleCreateFailed": "Failed to create grayscale",
"Config.BranchDeleted": "Delete branch successfully",
"Config.BranchDeleteFailed": "Failed to delete branch",
"Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete",
"Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.",
"Delete.Title": "Delete applications, clusters, AppNamespace",
"Delete.DeleteApp": "Delete application",
"Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)",
"Delete.AppIdTips": "(Please query application information before deleting)",
"Delete.AppInfo": "Application information",
"Delete.DeleteCluster": "Delete clusters",
"Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)",
"Delete.EnvName": "Environment Name",
"Delete.ClusterNameTips": "(Please query cluster information before deletion)",
"Delete.ClusterInfo": "Cluster information",
"Delete.DeleteNamespace": "Delete AppNamespace",
"Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!",
"Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace",
"Delete.AppNamespaceName": "AppNamespace name",
"Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace Information",
"Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators",
"Delete.PleaseEnterAppId": "Please enter appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!",
"Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?",
"Delete.Deleted": "Delete Successfully",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name",
"Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names",
"Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'",
"Namespace.Title": "New Namespace",
"Namespace.UnderstandMore": "(Click to learn more about Namespace)",
"Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace",
"Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace",
"Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application",
"Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.",
"Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.",
"Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.",
"Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.",
"Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace",
"Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.",
"Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot",
"Namespace.CreateNamespace": "Create Namespace",
"Namespace.AssociationPublicNamespace": "Associate Public Namespace",
"Namespace.ChooseCluster": "Select Cluster",
"Namespace.NamespaceName": "Name",
"Namespace.AutoAddDepartmentPrefix": "Add department prefix",
"Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)",
"Namespace.NamespaceType": "Type",
"Namespace.NamespaceType.Public": "Public",
"Namespace.NamespaceType.Private": "Private",
"Namespace.Remark": "Remarks",
"Namespace.Namespace": "Namespace",
"Namespace.PleaseChooseNamespace": "Please select namespace",
"Namespace.LoadingPublicNamespaceError": "Failed to load public namespace",
"Namespace.LoadingAppInfoError": "Failed to load App information",
"Namespace.PleaseChooseCluster": "Select Cluster",
"Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters",
"ServiceConfig.Title": "System Configuration",
"ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)",
"ServiceConfig.Key": "Key",
"ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)",
"ServiceConfig.Value": "Value",
"ServiceConfig.Comment": "Comment",
"ServiceConfig.Saved": "Save Successfully",
"ServiceConfig.SaveFailed": "Failed to Save",
"ServiceConfig.PleaseEnterKey": "Please enter key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.",
"AccessKey.Tips.1": "Add up to 5 access keys per environment.",
"AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.",
"AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):",
"AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret",
"AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET",
"AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)",
"AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.",
"AccessKey.ConfigAccessKeys.Secret": "Access Key Secret",
"AccessKey.ConfigAccessKeys.Status": "Status",
"AccessKey.ConfigAccessKeys.LastModify": "Last Modifier",
"AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time",
"AccessKey.ConfigAccessKeys.Operator": "Operation",
"AccessKey.Operator.Disable": "Disable",
"AccessKey.Operator.Enable": "Enable",
"AccessKey.Operator.Disabled": "Disabled",
"AccessKey.Operator.Enabled": "Enabled",
"AccessKey.Operator.Remove": "Remove",
"AccessKey.Operator.CreateSuccess": "Access key created successfully",
"AccessKey.Operator.DisabledSuccess": "Access key disabled successfully",
"AccessKey.Operator.EnabledSuccess": "Access key enabled successfully",
"AccessKey.Operator.RemoveSuccess": "Access key removed successfully",
"AccessKey.Operator.CreateError": "Access key created failed",
"AccessKey.Operator.DisabledError": "Access key disabled failed",
"AccessKey.Operator.EnabledError": "Access key enabled failed",
"AccessKey.Operator.RemoveError": "Access key removed failed",
"AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?",
"AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?",
"AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?",
"AccessKey.LoadError": "Error Loading access keys",
"SystemInfo.Title": "System Information",
"SystemInfo.SystemVersion": "System version",
"SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.",
"SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)",
"SystemInfo.MetaServerAddress": "Meta server address",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "Check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators",
"SystemRole.Title": "System Permission Management",
"SystemRole.AddCreateAppRoleToUser": "Create application permission for users",
"SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)",
"SystemRole.ChooseUser": "Select User",
"SystemRole.Add": "Add",
"SystemRole.AuthorizedUser": "Users with permission",
"SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions",
"SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)",
"SystemRole.AppIdTips": "(Please query the application information first)",
"SystemRole.AppInfo": "Application information",
"SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator",
"SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator",
"SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators",
"SystemRole.PleaseChooseUser": "Please select a user",
"SystemRole.Added": "Add Successfully",
"SystemRole.AddFailed": "Failed to add",
"SystemRole.Deleted": "Delete Successfully",
"SystemRole.DeleteFailed": "Failed to Delete",
"SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission",
"SystemRole.PleaseEnterAppId": "Please enter appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!",
"SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'",
"SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?",
"SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully",
"SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?",
"SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully",
"UserMange.Title": "User Management",
"UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)",
"UserMange.UserName": "User Login Name",
"UserMange.UserDisplayName": "User Display Name",
"UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.",
"UserMange.Pwd": "Password",
"UserMange.Email": "Email",
"UserMange.Created": "Create user successfully",
"UserMange.CreateFailed": "Failed to create user",
"Open.Manage.Title": "Open Platform",
"Open.Manage.CreateThirdApp": "Create third-party applications",
"Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)",
"Open.Manage.ThirdAppId": "Third party appId",
"Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)",
"Open.Manage.ThirdAppName": "Third party application name",
"Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"Open.Manage.ProjectOwner": "Owner",
"Open.Manage.Create": "Create",
"Open.Manage.GrantPermission": "Authorization",
"Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "Managed AppId",
"Open.Manage.ManagedNamespace": "Managed Namespace",
"Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)",
"Open.Manage.GrantType": "Authorization type",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "Environments",
"Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)",
"Open.Manage.PleaseEnterAppId": "Please enter appId",
"Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first",
"Open.Manage.GrantSuccessfully": "Authorize Successfully",
"Open.Manage.GrantFailed": "Failed to authorize",
"Namespace.Role.Title": "Permission Management",
"Namespace.Role.GrantModifyTo": "Permission to edit",
"Namespace.Role.GrantModifyTo2": "(Can edit the configuration)",
"Namespace.Role.AllEnv": "All environments",
"Namespace.Role.GrantPublishTo": "Permission to release",
"Namespace.Role.GrantPublishTo2": "(Can release the configuration)",
"Namespace.Role.Add": "Add",
"Namespace.Role.NoPermission": "You do not have permission!",
"Namespace.Role.InitNamespacePermissionError": "Error initializing authorization",
"Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'",
"Namespace.Role.GetGrantUserError": "Failed to load authorized users",
"Namespace.Role.PleaseChooseUser": "Please select the user",
"Namespace.Role.Added": "Add Successfully",
"Namespace.Role.AddFailed": "Failed to add",
"Namespace.Role.Deleted": "Delete Successfully",
"Namespace.Role.DeleteFailed": "Failed to Delete",
"Config.Sync.Title": "Synchronize Configuration",
"Config.Sync.FistStep": "(Step 1: Select Synchronization Information)",
"Config.Sync.SecondStep": "(Step 2: Check Diff)",
"Config.Sync.PreviousStep": "Previous step",
"Config.Sync.NextStep": "Next step",
"Config.Sync.Sync": "Synchronize",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration",
"Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.",
"Config.Sync.SyncNamespace": "Synchronized Namespace",
"Config.Sync.SyncToCluster": "Synchronize to which cluster",
"Config.Sync.NeedToSyncItem": "Configuration to synchronize",
"Config.Sync.SortByLastModifyTime": "Filter by last update time",
"Config.Sync.BeginTime": "Start time",
"Config.Sync.EndTime": "End time",
"Config.Sync.Filter": "Filter",
"Config.Sync.Rest": "Reset",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "No updated configuration",
"Config.Sync.IgnoreSync": "Ignore synchronization",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "Before Sync",
"Config.Sync.Step2SyncAfter": "After Sync",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "Operation",
"Config.Sync.NewAdd": "Add",
"Config.Sync.NoSyncItem": "Do not synchronize the configuration",
"Config.Sync.Delete": "Delete",
"Config.Sync.Update": "Update",
"Config.Sync.SyncSuccessfully": "Synchronize Successfully!",
"Config.Sync.SyncFailed": "Failed to Synchronize!",
"Config.Sync.LoadingItemsError": "Error loading configuration",
"Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization",
"Config.Sync.PleaseChooseCluster": "Select Cluster",
"Config.History.Title": "Release History",
"Config.History.MasterVersionPublish": "Main version release",
"Config.History.MasterVersionRollback": "Main version rollback",
"Config.History.GrayscaleOperator": "Grayscale operation",
"Config.History.PublishHistory": "Release History",
"Config.History.OperationType0": "Normal release",
"Config.History.OperationType1": "Rollback",
"Config.History.OperationType2": "Grayscale Release",
"Config.History.OperationType3": "Update Gray Rules",
"Config.History.OperationType4": "Full Grayscale Release",
"Config.History.OperationType5": "Grayscale Release(Main Version Release)",
"Config.History.OperationType6": "Grayscale Release(Main Version Rollback)",
"Config.History.OperationType7": "Abandon Grayscale",
"Config.History.OperationType8": "Delete Grayscale(Full Release)",
"Config.History.UrgentPublish": "Emergency Release",
"Config.History.LoadMore": "Load more",
"Config.History.Abandoned": "Abandoned",
"Config.History.RollbackTo": "Rollback To This Release",
"Config.History.RollbackToTips": "Rollback released configuration to this release",
"Config.History.ChangedItem": "Changed Configuration",
"Config.History.ChangedItemTips": "View changes between this release and the previous release",
"Config.History.AllItem": "Full Configuration",
"Config.History.AllItemTips": "View all configurations for this release",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "Add",
"Config.History.ChangeTypeModify": "Update",
"Config.History.ChangeTypeDelete": "Delete",
"Config.History.NoChange": "No configuration changes",
"Config.History.NoItem": "No configuration",
"Config.History.GrayscaleRule": "Grayscale Rule",
"Config.History.GrayscaleAppId": "Grayscale AppId",
"Config.History.GrayscaleIp": "Grayscale IP",
"Config.History.NoGrayscaleRule": "No Grayscale Rule",
"Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.",
"Config.History.NoPublishHistory": "No release history",
"Config.History.LoadingHistoryError": "No release history",
"Config.Diff.Title": "Compare Configuration",
"Config.Diff.FirstStep": "(Step 1: Select what to compare)",
"Config.Diff.SecondStep": "(Step 2: View the differences)",
"Config.Diff.PreviousStep": "Previous step",
"Config.Diff.NextStep": "Next step",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters",
"Config.Diff.DiffCluster": "Clusters to be compared",
"Config.Diff.HasDiffComment": "Whether to compare comments or not",
"Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters",
"ConfigExport.Title": "Config Export",
"ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects",
"ConfigExport.Download": "Download",
"App.CreateProject": "Create Project",
"App.AppIdTips": "(Application's unique identifiers)",
"App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)",
"App.AppAdminTips1": "(The application owner has project administrator permission by default.",
"App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)",
"App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize",
"App.Setting.Title": "Manage Project",
"App.Setting.Admin": "Administrators",
"App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)",
"App.Setting.Add": "Add",
"App.Setting.BasicInfo": "Basic information",
"App.Setting.ProjectName": "App Name",
"App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"App.Setting.ProjectOwner": "Owner",
"App.Setting.Modify": "Modify project information",
"App.Setting.Cancel": "Cancel",
"App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize",
"App.Setting.DeleteAdmin": "Delete Administrator",
"App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators",
"App.Setting.PleaseChooseUser": "Please select a user",
"App.Setting.Added": "Add Successfully",
"App.Setting.AddFailed": "Failed to Add",
"App.Setting.Deleted": "Delete Successfully",
"App.Setting.DeleteFailed": "Failed to Delete",
"App.Setting.Modified": "Update Successfully",
"Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters",
"Valdr.App.AppId.Required": "AppId cannot be empty",
"Valdr.App.appName.Size": "The app name cannot be longer than 128 characters",
"Valdr.App.appName.Required": "App name cannot be empty",
"Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters",
"Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty",
"Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters",
"Valdr.Item.Key.Size": "Key cannot be longer than 128 characters",
"Valdr.Item.Key.Required": "Key can't be empty",
"Valdr.Item.Comment.Size": "Comment length should not exceed 64 characters",
"Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters",
"Valdr.Release.ReleaseName.Required": "Release Name cannot be empty",
"Valdr.Release.Comment.Size": "Comment length should not exceed 64 characters",
"ApolloConfirmDialog.DefaultConfirmBtnName": "OK",
"ApolloConfirmDialog.SearchPlaceHolder": "Search items (App Id, App Name)",
"RulesModal.ChooseInstances": "Select from the list of instances",
"RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty",
"RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'",
"RulesModal.IpListCanNotBeNull": "IP list cannot be empty",
"ItemModal.KeyExists": "Key='{{key}}' already exists",
"ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect",
"ItemModal.AddFailed": "Failed to Add",
"ItemModal.PleaseChooseCluster": "Please Select Cluster",
"ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect",
"ItemModal.ModifyFailed": "Failed to Update",
"ItemModal.Tabs": "Tab-character",
"ItemModal.NewLine": "Newline-character",
"ItemModal.Space": "Blank-space",
"ApolloNsPanel.LoadingHistoryError": "Failed to load change history",
"ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history",
"ApolloNsPanel.Deleted": "Delete Successfully",
"ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully",
"ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules",
"ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect",
"ApolloNsPanel.ModifyFailed": "Failed to Update",
"ApolloNsPanel.GrammarIsRight": "Syntax is correct",
"ReleaseModal.Published": "Release Successfully",
"ReleaseModal.PublishFailed": "Failed to Release",
"ReleaseModal.GrayscalePublished": "Grayscale Release Successfully",
"ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release",
"ReleaseModal.AllPublished": "Full Release Successfully",
"ReleaseModal.AllPublishFailed": "Failed to Full Release",
"Rollback.NoRollbackList": "No released history to rollback",
"Rollback.SameAsCurrentRelease": "This release is the same as current release",
"Rollback.RollbackSuccessfully": "Rollback Successfully",
"Rollback.RollbackFailed": "Failed to Rollback",
"Revoke.RevokeFailed": "Failed to Revoke",
"Revoke.RevokeSuccessfully": "Revoke Successfully"
} | {
"Common.Title": "Apollo Configuration Center",
"Common.Ctrip": "Ctrip",
"Common.CtripDepartment": "Framework R&D Department",
"Common.Nav.ShowNavBar": "Display navigation bar",
"Common.Nav.HideNavBar": "Hide navigation bar",
"Common.Nav.Help": "Help",
"Common.Nav.AdminTools": "Admin Tools",
"Common.Nav.NonAdminTools": "Tools",
"Common.Nav.UserManage": "User Management",
"Common.Nav.SystemRoleManage": "System Permission Management",
"Common.Nav.OpenMange": "Open Platform Authorization Management",
"Common.Nav.SystemConfig": "System Configuration",
"Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace",
"Common.Nav.SystemInfo": "System Information",
"Common.Nav.ConfigExport": "Config Export",
"Common.Nav.Logout": "Logout",
"Common.Department": "Department",
"Common.Cluster": "Cluster",
"Common.Environment": "Environment",
"Common.Email": "Email",
"Common.AppId": "App Id",
"Common.Namespace": "Namespace",
"Common.AppName": "App Name",
"Common.AppOwner": "App Owner",
"Common.AppOwnerLong": "App Owner",
"Common.AppAdmin": "App Administrators",
"Common.ClusterName": "Cluster Name",
"Common.Submit": "Submit",
"Common.Save": "Save",
"Common.Created": "Create Successfully",
"Common.CreateFailed": "Fail to Create",
"Common.Deleted": "Delete Successfully",
"Common.DeleteFailed": "Fail to Delete",
"Common.ReturnToIndex": "Return to project page",
"Common.Cancel": "Cancel",
"Common.Ok": "OK",
"Common.Search": "Query",
"Common.IsRootUser": "Current page is only accessible to Apollo administrator.",
"Common.PleaseChooseDepartment": "Please select department",
"Common.PleaseChooseOwner": "Please select app owner",
"Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.",
"Component.DeleteNamespace.Title": "Delete Namespace",
"Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?",
"Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?",
"Component.GrayscalePublishRule.Title": "Edit Grayscale Rule",
"Component.GrayscalePublishRule.AppId": "Grayscale AppId",
"Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule",
"Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances",
"Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances",
"Component.GrayscalePublishRule.IP": "Grayscale IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)",
"Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ",
"Component.GrayscalePublishRule.EnterIp": "enter IP manually",
"Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.",
"Component.GrayscalePublishRule.Add": "Add",
"Component.ConfigItem.Title": "Add Configuration",
"Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)",
"Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration",
"Component.ConfigItem.ModifyItem": "Modify Configuration",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click",
"Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters",
"Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "Select Cluster",
"Component.MergePublish.Title": "Full Release",
"Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.",
"Component.MergePublish.NextStep": "After full release, choose which behavior you want",
"Component.MergePublish.DeleteGrayscale": "Delete grayscale version",
"Component.MergePublish.ReservedGrayscale": "Keep grayscale version",
"Component.Namespace.Branch.IsChanged": "Modified",
"Component.Namespace.Branch.ChangeUser": "Current Modifier",
"Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release",
"Component.Namespace.Branch.GrayscalePublish": "Grayscale Release",
"Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ",
"Component.Namespace.Branch.AllPublish": "Full Release",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version",
"Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale",
"Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.",
"Component.Namespace.Branch.Tab.Configuration": "Configuration",
"Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List",
"Component.Namespace.Branch.Tab.ChangeHistory": "Change History",
"Component.Namespace.Branch.Body.Item": "Grayscale Configuration",
"Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration",
"Component.Namespace.Branch.Body.PublishState": "Release Status",
"Component.Namespace.Branch.Body.ItemSort": "Sort",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value",
"Component.Namespace.Branch.Body.ItemComment": "Comment",
"Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.Branch.Body.ItemOperator": "Operation",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values",
"Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased",
"Component.Namespace.Branch.Body.ItemPublished": "Released",
"Component.Namespace.Branch.Body.ItemEffective": "Effective configuration",
"Component.Namespace.Branch.Body.ClickToSee": "Click to view",
"Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration",
"Component.Namespace.Branch.Body.Delete": "Deleted",
"Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version",
"Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration",
"Component.Namespace.Branch.Body.Modify": "Modified",
"Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version",
"Component.Namespace.Branch.Body.Added": "New",
"Component.Namespace.Branch.Body.Op.Modify": "Modify",
"Component.Namespace.Branch.Body.Op.Delete": "Delete",
"Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version",
"Component.Namespace.MasterBranch.Body.PublishState": "Release Status",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "Comment",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.MasterBranch.Body.ItemOperator": "Operation",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased",
"Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration",
"Component.Namespace.MasterBranch.Body.ItemPublished": "Released",
"Component.Namespace.MasterBranch.Body.AddedItem": "New configuration",
"Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List",
"Component.Namespace.Branch.GrayScaleRule.Operator": "Operation",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "Modify",
"Component.Namespace.Branch.GrayScaleRule.Delete": "Delete",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule",
"Component.Namespace.Branch.Instance.RefreshList": "Refresh List",
"Component.Namespace.Branch.Instance.ItemToSee": "View configuration",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time",
"Component.Namespace.Branch.Instance.LoadMore": "Refresh list",
"Component.Namespace.Branch.Instance.NoInstance": "No instance information",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "Add",
"Component.Namespace.Branch.History.Modified": "Update",
"Component.Namespace.Branch.History.Deleted": "Delete",
"Component.Namespace.Branch.History.LoadMore": "Load more",
"Component.Namespace.Branch.History.NoHistory": "No Change History",
"Component.Namespace.Header.Title.Private": "Private",
"Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}",
"Component.Namespace.Header.Title.Public": "Public",
"Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.",
"Component.Namespace.Header.Title.Extend": "Association",
"Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]",
"Component.Namespace.Header.Title.Master": "Main Version",
"Component.Namespace.Header.Title.Grayscale": "Grayscale Version",
"Component.Namespace.Master.LoadNamespace": "Load Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "Load Namespace",
"Component.Namespace.Master.Items.Changed": "Modified",
"Component.Namespace.Master.Items.ChangedUser": "Current modifier",
"Component.Namespace.Master.Items.Publish": "Release",
"Component.Namespace.Master.Items.PublishTips": "Release configuration",
"Component.Namespace.Master.Items.Rollback": "Rollback",
"Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration",
"Component.Namespace.Master.Items.PublishHistory": "Release History",
"Component.Namespace.Master.Items.PublishHistoryTips": "View the release history",
"Component.Namespace.Master.Items.Grant": "Authorize",
"Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission",
"Component.Namespace.Master.Items.Grayscale": "Grayscale",
"Component.Namespace.Master.Items.GrayscaleTips": "Create a test version",
"Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission",
"Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.",
"Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.",
"Component.Namespace.Master.Items.ItemList": "Table",
"Component.Namespace.Master.Items.ItemListByText": "Text",
"Component.Namespace.Master.Items.ItemHistory": "Change History",
"Component.Namespace.Master.Items.ItemInstance": "Instance List",
"Component.Namespace.Master.Items.CopyText": "Copy",
"Component.Namespace.Master.Items.GrammarCheck": "Syntax Check",
"Component.Namespace.Master.Items.CancelChanged": "Cancel",
"Component.Namespace.Master.Items.Change": "Modify",
"Component.Namespace.Master.Items.SummitChanged": "Submit",
"Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key",
"Component.Namespace.Master.Items.FilterItem": "Filter",
"Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes",
"Component.Namespace.Master.Items.RevokeItem" :"Revoke",
"Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments",
"Component.Namespace.Master.Items.SyncItem": "Synchronize",
"Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments",
"Component.Namespace.Master.Items.DiffItem": "Compare",
"Component.Namespace.Master.Items.AddItem": "Add Configuration",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.",
"Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter",
"Component.Namespace.Master.Items.Body.PublishState": "Release Status",
"Component.Namespace.Master.Items.Body.Sort": "Sort",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time",
"Component.Namespace.Master.Items.Body.ItemOperator": "Operation",
"Component.Namespace.Master.Items.Body.NoPublish": "Unreleased",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values",
"Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value",
"Component.Namespace.Master.Items.Body.Published": "Released",
"Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration",
"Component.Namespace.Master.Items.Body.ClickToSee": "Click to view",
"Component.Namespace.Master.Items.Body.Grayscale": "Gray",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.",
"Component.Namespace.Master.Items.Body.NewAdded": "New",
"Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration",
"Component.Namespace.Master.Items.Body.Modified": "Modified",
"Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration",
"Component.Namespace.Master.Items.Body.Deleted": "Deleted",
"Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration",
"Component.Namespace.Master.Items.Body.ModifyTips": "Modify",
"Component.Namespace.Master.Items.Body.DeleteTips": "Delete",
"Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration",
"Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration",
"Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History",
"Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information",
"Component.PublishDeny.Title": "Release Restriction",
"Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.",
"Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)",
"Component.PublishDeny.EmergencyPublish": "Emergency Release",
"Component.PublishDeny.Close": "Close",
"Component.Publish.Title": "Release",
"Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})",
"Component.Publish.Grayscale": "Grayscale Release",
"Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)",
"Component.Publish.AllPublish": "Full Release",
"Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)",
"Component.Publish.ToSeeChange": "View changes",
"Component.Publish.PublishedValue": "Released values",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "Unreleased values",
"Component.Publish.ModifyUser": "Modifier",
"Component.Publish.ModifyTime": "Modified Time",
"Component.Publish.NewAdded": "New",
"Component.Publish.NewAddedTips": "New Configuration",
"Component.Publish.Modified": "Modified",
"Component.Publish.ModifiedTips": "Modified Configuration",
"Component.Publish.Deleted": "Deleted",
"Component.Publish.DeletedTips": "Deleted Configuration",
"Component.Publish.MasterValue": "Main version value",
"Component.Publish.GrayValue": "Grayscale version value",
"Component.Publish.GrayPublishedValue": "Released grayscale version value",
"Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value",
"Component.Publish.ItemNoChange": "No configuration changes",
"Component.Publish.GrayItemNoChange": "No configuration changes",
"Component.Publish.NoGrayItems": "No grayscale changes",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "Release",
"Component.Rollback.To": "roll back to",
"Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page",
"Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations",
"Component.Rollback.ClickToView": "Click to view",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "Before Rollback",
"Component.Rollback.RollbackAfterValue": "After Rollback",
"Component.Rollback.Added": "Add",
"Component.Rollback.Modified": "Update",
"Component.Rollback.Deleted": "Delete",
"Component.Rollback.NoChange": "No configuration changes",
"Component.Rollback.OpRollback": "Rollback",
"Component.ShowText.Title": "View",
"Login.Login": "Login",
"Login.UserNameOrPasswordIncorrect": "Incorrect username or password",
"Login.LogoutSuccessfully": "Logout Successfully",
"Index.MyProject": "My projects",
"Index.CreateProject": "Create project",
"Index.LoadMore": "Load more",
"Index.FavoriteItems": "Favorite projects",
"Index.Topping": "Top",
"Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.",
"Index.RecentlyViewedItems": "Recent projects",
"Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission",
"Index.Topped": "Top Successfully",
"Index.CancelledFavorite": "Remove favorite successfully",
"Cluster.CreateCluster": "Create Cluster",
"Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)",
"Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters",
"Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)",
"Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine",
"Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)",
"Cluster.ChooseEnvironment": "Environment",
"Cluster.LoadingEnvironmentError": "Error in loading environment information",
"Cluster.ClusterCreated": "Create cluster successfully",
"Cluster.ClusterCreateFailed": "Failed to create cluster",
"Cluster.PleaseChooseEnvironment": "Please select the environment",
"Config.Title": "Apollo Configuration Center",
"Config.AppIdNotFound": "doesn't exist, ",
"Config.ClickByCreate": "click to create",
"Config.EnvList": "Environments",
"Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters",
"Config.ProjectInfo": "Project Info",
"Config.ModifyBasicProjectInfo": "Modify project's basic information",
"Config.Favorite": "Favorite",
"Config.CancelFavorite": "Cancel Favorite",
"Config.MissEnv": "Missing environment",
"Config.MissNamespace": "Missing Namespace",
"Config.ProjectManage": "Manage Project",
"Config.AccessKeyManage": "Manage AccessKey",
"Config.CreateAppMissEnv": "Recover Environments",
"Config.CreateAppMissNamespace": "Recover Namespaces",
"Config.AddCluster": "Add Cluster",
"Config.AddNamespace": "Add Namespace",
"Config.CurrentlyOperatorEnv": "Current environment",
"Config.DoNotRemindAgain": "No longer prompt",
"Config.Note": "Note",
"Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!",
"Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.",
"Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.",
"Config.RevokeItem.DialogTitle": "Revoke configuration changes",
"Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?",
"Config.DeleteItem.DialogTitle": "Delete configuration",
"Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?",
"Config.PublishNoPermission.DialogTitle": "Release",
"Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.",
"Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission",
"Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.",
"Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission",
"Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission",
"Config.NamespaceLocked.DialogTitle": "Edit not allowed",
"Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.",
"Config.RollbackAlert.DialogTitle": "Rollback",
"Config.RollbackAlert.DialogContent": "Are you sure to roll back?",
"Config.EmergencyPublishAlert.DialogTitle": "Emergency release",
"Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?",
"Config.DeleteBranch.DialogTitle": "Delete grayscale",
"Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?",
"Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt",
"Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.",
"Config.MergeAndReleaseDeny.DialogTitle": "Full release",
"Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId",
"Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error",
"Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip",
"Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice",
"Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> 1. Create grayscale version <br> 2. Configure grayscale configuration items <br> 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.",
"Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.",
"Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.",
"Config.SystemError": "System error, please try again or contact the system administrator",
"Config.FavoriteSuccessfully": "Favorite Successfully",
"Config.FavoriteFailed": "Failed to favorite",
"Config.CancelledFavorite": "Cancel favorite successfully",
"Config.CancelFavoriteFailed": "Failed to cancel the favorite",
"Config.GetUserInfoFailed": "Failed to obtain user login information",
"Config.LoadingAllNamespaceError": "Failed to load configuration",
"Config.CancelFavoriteError": "Failure to Cancel Collection",
"Config.Deleted": "Delete Successfully",
"Config.DeleteFailed": "Failed to delete",
"Config.GrayscaleCreated": "Create Grayscale Successfully",
"Config.GrayscaleCreateFailed": "Failed to create grayscale",
"Config.BranchDeleted": "Delete branch successfully",
"Config.BranchDeleteFailed": "Failed to delete branch",
"Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete",
"Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.",
"Delete.Title": "Delete applications, clusters, AppNamespace",
"Delete.DeleteApp": "Delete application",
"Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)",
"Delete.AppIdTips": "(Please query application information before deleting)",
"Delete.AppInfo": "Application information",
"Delete.DeleteCluster": "Delete clusters",
"Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)",
"Delete.EnvName": "Environment Name",
"Delete.ClusterNameTips": "(Please query cluster information before deletion)",
"Delete.ClusterInfo": "Cluster information",
"Delete.DeleteNamespace": "Delete AppNamespace",
"Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!",
"Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace",
"Delete.AppNamespaceName": "AppNamespace name",
"Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace Information",
"Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators",
"Delete.PleaseEnterAppId": "Please enter appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!",
"Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?",
"Delete.Deleted": "Delete Successfully",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name",
"Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names",
"Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'",
"Namespace.Title": "New Namespace",
"Namespace.UnderstandMore": "(Click to learn more about Namespace)",
"Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace",
"Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace",
"Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application",
"Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.",
"Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.",
"Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.",
"Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.",
"Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace",
"Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.",
"Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot",
"Namespace.CreateNamespace": "Create Namespace",
"Namespace.AssociationPublicNamespace": "Associate Public Namespace",
"Namespace.ChooseCluster": "Select Cluster",
"Namespace.NamespaceName": "Name",
"Namespace.AutoAddDepartmentPrefix": "Add department prefix",
"Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)",
"Namespace.NamespaceType": "Type",
"Namespace.NamespaceType.Public": "Public",
"Namespace.NamespaceType.Private": "Private",
"Namespace.Remark": "Remarks",
"Namespace.Namespace": "Namespace",
"Namespace.PleaseChooseNamespace": "Please select namespace",
"Namespace.LoadingPublicNamespaceError": "Failed to load public namespace",
"Namespace.LoadingAppInfoError": "Failed to load App information",
"Namespace.PleaseChooseCluster": "Select Cluster",
"Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters",
"ServiceConfig.Title": "System Configuration",
"ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)",
"ServiceConfig.Key": "Key",
"ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)",
"ServiceConfig.Value": "Value",
"ServiceConfig.Comment": "Comment",
"ServiceConfig.Saved": "Save Successfully",
"ServiceConfig.SaveFailed": "Failed to Save",
"ServiceConfig.PleaseEnterKey": "Please enter key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.",
"AccessKey.Tips.1": "Add up to 5 access keys per environment.",
"AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.",
"AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):",
"AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret",
"AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET",
"AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)",
"AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.",
"AccessKey.ConfigAccessKeys.Secret": "Access Key Secret",
"AccessKey.ConfigAccessKeys.Status": "Status",
"AccessKey.ConfigAccessKeys.LastModify": "Last Modifier",
"AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time",
"AccessKey.ConfigAccessKeys.Operator": "Operation",
"AccessKey.Operator.Disable": "Disable",
"AccessKey.Operator.Enable": "Enable",
"AccessKey.Operator.Disabled": "Disabled",
"AccessKey.Operator.Enabled": "Enabled",
"AccessKey.Operator.Remove": "Remove",
"AccessKey.Operator.CreateSuccess": "Access key created successfully",
"AccessKey.Operator.DisabledSuccess": "Access key disabled successfully",
"AccessKey.Operator.EnabledSuccess": "Access key enabled successfully",
"AccessKey.Operator.RemoveSuccess": "Access key removed successfully",
"AccessKey.Operator.CreateError": "Access key created failed",
"AccessKey.Operator.DisabledError": "Access key disabled failed",
"AccessKey.Operator.EnabledError": "Access key enabled failed",
"AccessKey.Operator.RemoveError": "Access key removed failed",
"AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?",
"AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?",
"AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?",
"AccessKey.LoadError": "Error Loading access keys",
"SystemInfo.Title": "System Information",
"SystemInfo.SystemVersion": "System version",
"SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.",
"SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)",
"SystemInfo.MetaServerAddress": "Meta server address",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "Check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators",
"SystemRole.Title": "System Permission Management",
"SystemRole.AddCreateAppRoleToUser": "Create application permission for users",
"SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)",
"SystemRole.ChooseUser": "Select User",
"SystemRole.Add": "Add",
"SystemRole.AuthorizedUser": "Users with permission",
"SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions",
"SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)",
"SystemRole.AppIdTips": "(Please query the application information first)",
"SystemRole.AppInfo": "Application information",
"SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator",
"SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator",
"SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators",
"SystemRole.PleaseChooseUser": "Please select a user",
"SystemRole.Added": "Add Successfully",
"SystemRole.AddFailed": "Failed to add",
"SystemRole.Deleted": "Delete Successfully",
"SystemRole.DeleteFailed": "Failed to Delete",
"SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission",
"SystemRole.PleaseEnterAppId": "Please enter appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!",
"SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'",
"SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?",
"SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully",
"SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?",
"SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully",
"UserMange.Title": "User Management",
"UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)",
"UserMange.UserName": "User Login Name",
"UserMange.UserDisplayName": "User Display Name",
"UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.",
"UserMange.Pwd": "Password",
"UserMange.Email": "Email",
"UserMange.Created": "Create user successfully",
"UserMange.CreateFailed": "Failed to create user",
"Open.Manage.Title": "Open Platform",
"Open.Manage.CreateThirdApp": "Create third-party applications",
"Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)",
"Open.Manage.ThirdAppId": "Third party appId",
"Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)",
"Open.Manage.ThirdAppName": "Third party application name",
"Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"Open.Manage.ProjectOwner": "Owner",
"Open.Manage.Create": "Create",
"Open.Manage.GrantPermission": "Authorization",
"Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "Managed AppId",
"Open.Manage.ManagedNamespace": "Managed Namespace",
"Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)",
"Open.Manage.GrantType": "Authorization type",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "Environments",
"Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)",
"Open.Manage.PleaseEnterAppId": "Please enter appId",
"Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first",
"Open.Manage.GrantSuccessfully": "Authorize Successfully",
"Open.Manage.GrantFailed": "Failed to authorize",
"Namespace.Role.Title": "Permission Management",
"Namespace.Role.GrantModifyTo": "Permission to edit",
"Namespace.Role.GrantModifyTo2": "(Can edit the configuration)",
"Namespace.Role.AllEnv": "All environments",
"Namespace.Role.GrantPublishTo": "Permission to release",
"Namespace.Role.GrantPublishTo2": "(Can release the configuration)",
"Namespace.Role.Add": "Add",
"Namespace.Role.NoPermission": "You do not have permission!",
"Namespace.Role.InitNamespacePermissionError": "Error initializing authorization",
"Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'",
"Namespace.Role.GetGrantUserError": "Failed to load authorized users",
"Namespace.Role.PleaseChooseUser": "Please select the user",
"Namespace.Role.Added": "Add Successfully",
"Namespace.Role.AddFailed": "Failed to add",
"Namespace.Role.Deleted": "Delete Successfully",
"Namespace.Role.DeleteFailed": "Failed to Delete",
"Config.Sync.Title": "Synchronize Configuration",
"Config.Sync.FistStep": "(Step 1: Select Synchronization Information)",
"Config.Sync.SecondStep": "(Step 2: Check Diff)",
"Config.Sync.PreviousStep": "Previous step",
"Config.Sync.NextStep": "Next step",
"Config.Sync.Sync": "Synchronize",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration",
"Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.",
"Config.Sync.SyncNamespace": "Synchronized Namespace",
"Config.Sync.SyncToCluster": "Synchronize to which cluster",
"Config.Sync.NeedToSyncItem": "Configuration to synchronize",
"Config.Sync.SortByLastModifyTime": "Filter by last update time",
"Config.Sync.BeginTime": "Start time",
"Config.Sync.EndTime": "End time",
"Config.Sync.Filter": "Filter",
"Config.Sync.Rest": "Reset",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "No updated configuration",
"Config.Sync.IgnoreSync": "Ignore synchronization",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "Before Sync",
"Config.Sync.Step2SyncAfter": "After Sync",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "Operation",
"Config.Sync.NewAdd": "Add",
"Config.Sync.NoSyncItem": "Do not synchronize the configuration",
"Config.Sync.Delete": "Delete",
"Config.Sync.Update": "Update",
"Config.Sync.SyncSuccessfully": "Synchronize Successfully!",
"Config.Sync.SyncFailed": "Failed to Synchronize!",
"Config.Sync.LoadingItemsError": "Error loading configuration",
"Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization",
"Config.Sync.PleaseChooseCluster": "Select Cluster",
"Config.History.Title": "Release History",
"Config.History.MasterVersionPublish": "Main version release",
"Config.History.MasterVersionRollback": "Main version rollback",
"Config.History.GrayscaleOperator": "Grayscale operation",
"Config.History.PublishHistory": "Release History",
"Config.History.OperationType0": "Normal release",
"Config.History.OperationType1": "Rollback",
"Config.History.OperationType2": "Grayscale Release",
"Config.History.OperationType3": "Update Gray Rules",
"Config.History.OperationType4": "Full Grayscale Release",
"Config.History.OperationType5": "Grayscale Release(Main Version Release)",
"Config.History.OperationType6": "Grayscale Release(Main Version Rollback)",
"Config.History.OperationType7": "Abandon Grayscale",
"Config.History.OperationType8": "Delete Grayscale(Full Release)",
"Config.History.UrgentPublish": "Emergency Release",
"Config.History.LoadMore": "Load more",
"Config.History.Abandoned": "Abandoned",
"Config.History.RollbackTo": "Rollback To This Release",
"Config.History.RollbackToTips": "Rollback released configuration to this release",
"Config.History.ChangedItem": "Changed Configuration",
"Config.History.ChangedItemTips": "View changes between this release and the previous release",
"Config.History.AllItem": "Full Configuration",
"Config.History.AllItemTips": "View all configurations for this release",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "Add",
"Config.History.ChangeTypeModify": "Update",
"Config.History.ChangeTypeDelete": "Delete",
"Config.History.NoChange": "No configuration changes",
"Config.History.NoItem": "No configuration",
"Config.History.GrayscaleRule": "Grayscale Rule",
"Config.History.GrayscaleAppId": "Grayscale AppId",
"Config.History.GrayscaleIp": "Grayscale IP",
"Config.History.NoGrayscaleRule": "No Grayscale Rule",
"Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.",
"Config.History.NoPublishHistory": "No release history",
"Config.History.LoadingHistoryError": "No release history",
"Config.Diff.Title": "Compare Configuration",
"Config.Diff.FirstStep": "(Step 1: Select what to compare)",
"Config.Diff.SecondStep": "(Step 2: View the differences)",
"Config.Diff.PreviousStep": "Previous step",
"Config.Diff.NextStep": "Next step",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters",
"Config.Diff.DiffCluster": "Clusters to be compared",
"Config.Diff.HasDiffComment": "Whether to compare comments or not",
"Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters",
"ConfigExport.Title": "Config Export",
"ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects",
"ConfigExport.Download": "Download",
"App.CreateProject": "Create Project",
"App.AppIdTips": "(Application's unique identifiers)",
"App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)",
"App.AppAdminTips1": "(The application owner has project administrator permission by default.",
"App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)",
"App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize",
"App.Setting.Title": "Manage Project",
"App.Setting.Admin": "Administrators",
"App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)",
"App.Setting.Add": "Add",
"App.Setting.BasicInfo": "Basic information",
"App.Setting.ProjectName": "App Name",
"App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)",
"App.Setting.ProjectOwner": "Owner",
"App.Setting.Modify": "Modify project information",
"App.Setting.Cancel": "Cancel",
"App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize",
"App.Setting.DeleteAdmin": "Delete Administrator",
"App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators",
"App.Setting.PleaseChooseUser": "Please select a user",
"App.Setting.Added": "Add Successfully",
"App.Setting.AddFailed": "Failed to Add",
"App.Setting.Deleted": "Delete Successfully",
"App.Setting.DeleteFailed": "Failed to Delete",
"App.Setting.Modified": "Update Successfully",
"Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters",
"Valdr.App.AppId.Required": "AppId cannot be empty",
"Valdr.App.appName.Size": "The app name cannot be longer than 128 characters",
"Valdr.App.appName.Required": "App name cannot be empty",
"Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters",
"Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty",
"Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters",
"Valdr.Item.Key.Size": "Key cannot be longer than 128 characters",
"Valdr.Item.Key.Required": "Key can't be empty",
"Valdr.Item.Comment.Size": "Comment length should not exceed 256 characters",
"Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters",
"Valdr.Release.ReleaseName.Required": "Release Name cannot be empty",
"Valdr.Release.Comment.Size": "Comment length should not exceed 256 characters",
"ApolloConfirmDialog.DefaultConfirmBtnName": "OK",
"ApolloConfirmDialog.SearchPlaceHolder": "Search items (App Id, App Name)",
"RulesModal.ChooseInstances": "Select from the list of instances",
"RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty",
"RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'",
"RulesModal.IpListCanNotBeNull": "IP list cannot be empty",
"ItemModal.KeyExists": "Key='{{key}}' already exists",
"ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect",
"ItemModal.AddFailed": "Failed to Add",
"ItemModal.PleaseChooseCluster": "Please Select Cluster",
"ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect",
"ItemModal.ModifyFailed": "Failed to Update",
"ItemModal.Tabs": "Tab-character",
"ItemModal.NewLine": "Newline-character",
"ItemModal.Space": "Blank-space",
"ApolloNsPanel.LoadingHistoryError": "Failed to load change history",
"ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history",
"ApolloNsPanel.Deleted": "Delete Successfully",
"ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully",
"ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules",
"ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect",
"ApolloNsPanel.ModifyFailed": "Failed to Update",
"ApolloNsPanel.GrammarIsRight": "Syntax is correct",
"ReleaseModal.Published": "Release Successfully",
"ReleaseModal.PublishFailed": "Failed to Release",
"ReleaseModal.GrayscalePublished": "Grayscale Release Successfully",
"ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release",
"ReleaseModal.AllPublished": "Full Release Successfully",
"ReleaseModal.AllPublishFailed": "Failed to Full Release",
"Rollback.NoRollbackList": "No released history to rollback",
"Rollback.SameAsCurrentRelease": "This release is the same as current release",
"Rollback.RollbackSuccessfully": "Rollback Successfully",
"Rollback.RollbackFailed": "Failed to Rollback",
"Revoke.RevokeFailed": "Failed to Revoke",
"Revoke.RevokeSuccessfully": "Revoke Successfully"
} | 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/i18n/zh-CN.json | {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.SystemRoleManage": "系统权限管理",
"Common.Nav.OpenMange": "开放平台授权管理",
"Common.Nav.SystemConfig": "系统参数",
"Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace",
"Common.Nav.SystemInfo": "系统信息",
"Common.Nav.ConfigExport": "配置导出",
"Common.Nav.Logout": "退出",
"Common.Department": "部门",
"Common.Cluster": "集群",
"Common.Environment": "环境",
"Common.Email": "邮箱",
"Common.AppId": "AppId",
"Common.Namespace": "Namespace",
"Common.AppName": "应用名称",
"Common.AppOwner": "负责人",
"Common.AppOwnerLong": "应用负责人",
"Common.AppAdmin": "项目管理员",
"Common.ClusterName": "集群名称",
"Common.Submit": "提交",
"Common.Save": "保存",
"Common.Created": "创建成功",
"Common.CreateFailed": "创建失败",
"Common.Deleted": "删除成功",
"Common.DeleteFailed": "删除失败",
"Common.ReturnToIndex": "返回到项目首页",
"Common.Cancel": "取消",
"Common.Ok": "确定",
"Common.Search": "查询",
"Common.IsRootUser": "当前页面只对Apollo管理员开放",
"Common.PleaseChooseDepartment": "请选择部门",
"Common.PleaseChooseOwner": "请选择应用负责人",
"Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试",
"Component.DeleteNamespace.Title": "删除Namespace",
"Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?",
"Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?",
"Component.GrayscalePublishRule.Title": "编辑灰度规则",
"Component.GrayscalePublishRule.AppId": "灰度的AppId",
"Component.GrayscalePublishRule.AcceptRule": "灰度应用规则",
"Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例",
"Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例",
"Component.GrayscalePublishRule.IP": "灰度的IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)",
"Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以",
"Component.GrayscalePublishRule.EnterIp": "手动输入IP",
"Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮",
"Component.GrayscalePublishRule.Add": "添加",
"Component.ConfigItem.Title": "添加配置项",
"Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)",
"Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项",
"Component.ConfigItem.ModifyItem": "修改配置项",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击",
"Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符",
"Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "选择集群",
"Component.MergePublish.Title": "全量发布",
"Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。",
"Component.MergePublish.NextStep": "全量发布后,您希望",
"Component.MergePublish.DeleteGrayscale": "删除灰度版本",
"Component.MergePublish.ReservedGrayscale": "保留灰度版本",
"Component.Namespace.Branch.IsChanged": "有修改",
"Component.Namespace.Branch.ChangeUser": "当前修改者",
"Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布",
"Component.Namespace.Branch.GrayscalePublish": "灰度发布",
"Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置",
"Component.Namespace.Branch.AllPublish": "全量发布",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本",
"Component.Namespace.Branch.DiscardGrayscale": "放弃灰度",
"Component.Namespace.Branch.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Branch.Tab.Configuration": "配置",
"Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表",
"Component.Namespace.Branch.Tab.ChangeHistory": "更改历史",
"Component.Namespace.Branch.Body.Item": "灰度的配置",
"Component.Namespace.Branch.Body.AddedItem": "新增灰度配置",
"Component.Namespace.Branch.Body.PublishState": "发布状态",
"Component.Namespace.Branch.Body.ItemSort": "排序",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值",
"Component.Namespace.Branch.Body.ItemComment": "备注",
"Component.Namespace.Branch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Branch.Body.ItemOperator": "操作",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.Branch.Body.ItemNoPublish": "未发布",
"Component.Namespace.Branch.Body.ItemPublished": "已发布",
"Component.Namespace.Branch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.Branch.Body.ClickToSee": "点击查看",
"Component.Namespace.Branch.Body.DeletedItem": "删除的配置",
"Component.Namespace.Branch.Body.Delete": "删",
"Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置",
"Component.Namespace.Branch.Body.ModifiedItem": "修改的配置",
"Component.Namespace.Branch.Body.Modify": "改",
"Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置",
"Component.Namespace.Branch.Body.Added": "新",
"Component.Namespace.Branch.Body.Op.Modify": "修改",
"Component.Namespace.Branch.Body.Op.Delete": "删除",
"Component.Namespace.MasterBranch.Body.Title": "主版本的配置",
"Component.Namespace.MasterBranch.Body.PublishState": "发布状态",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "备注",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.MasterBranch.Body.ItemOperator": "操作",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布",
"Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.MasterBranch.Body.ItemPublished": "已发布",
"Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置",
"Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找项目管理员申请权限.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表",
"Component.Namespace.Branch.GrayScaleRule.Operator": "操作",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "修改",
"Component.Namespace.Branch.GrayScaleRule.Delete": "删除",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则",
"Component.Namespace.Branch.Instance.RefreshList": "刷新列表",
"Component.Namespace.Branch.Instance.ItemToSee": "查看配置",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间",
"Component.Namespace.Branch.Instance.LoadMore": "刷新列表",
"Component.Namespace.Branch.Instance.NoInstance": "无实例信息",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "新增",
"Component.Namespace.Branch.History.Modified": "更新",
"Component.Namespace.Branch.History.Deleted": "删除",
"Component.Namespace.Branch.History.LoadMore": "加载更多",
"Component.Namespace.Branch.History.NoHistory": "无更改历史",
"Component.Namespace.Header.Title.Private": "私有",
"Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.Public": "公共",
"Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到",
"Component.Namespace.Header.Title.Extend": "关联",
"Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]",
"Component.Namespace.Header.Title.Master": "主版本",
"Component.Namespace.Header.Title.Grayscale": "灰度版本",
"Component.Namespace.Master.LoadNamespace": "加载Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "加载Namespace",
"Component.Namespace.Master.Items.Changed": "有修改",
"Component.Namespace.Master.Items.ChangedUser": "当前修改者",
"Component.Namespace.Master.Items.Publish": "发布",
"Component.Namespace.Master.Items.PublishTips": "发布配置",
"Component.Namespace.Master.Items.Rollback": "回滚",
"Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置",
"Component.Namespace.Master.Items.PublishHistory": "发布历史",
"Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史",
"Component.Namespace.Master.Items.Grant": "授权",
"Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限",
"Component.Namespace.Master.Items.Grayscale": "灰度",
"Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本",
"Component.Namespace.Master.Items.RequestPermission": "申请配置权限",
"Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请",
"Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Master.Items.ItemList": "表格",
"Component.Namespace.Master.Items.ItemListByText": "文本",
"Component.Namespace.Master.Items.ItemHistory": "更改历史",
"Component.Namespace.Master.Items.ItemInstance": "实例列表",
"Component.Namespace.Master.Items.CopyText": "复制文本",
"Component.Namespace.Master.Items.GrammarCheck": "语法检查",
"Component.Namespace.Master.Items.CancelChanged": "取消修改",
"Component.Namespace.Master.Items.Change": "修改配置",
"Component.Namespace.Master.Items.SummitChanged": "提交修改",
"Component.Namespace.Master.Items.SortByKey": "按Key过滤配置",
"Component.Namespace.Master.Items.FilterItem": "过滤配置",
"Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置",
"Component.Namespace.Master.Items.SyncItem": "同步配置",
"Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改",
"Component.Namespace.Master.Items.RevokeItem": "撤销配置",
"Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置",
"Component.Namespace.Master.Items.DiffItem": "比较配置",
"Component.Namespace.Master.Items.AddItem": "新增配置",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。",
"Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤",
"Component.Namespace.Master.Items.Body.PublishState": "发布状态",
"Component.Namespace.Master.Items.Body.Sort": "排序",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "备注",
"Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Master.Items.Body.ItemOperator": "操作",
"Component.Namespace.Master.Items.Body.NoPublish": "未发布",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值",
"Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值",
"Component.Namespace.Master.Items.Body.Published": "已发布",
"Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置",
"Component.Namespace.Master.Items.Body.ClickToSee": "点击查看",
"Component.Namespace.Master.Items.Body.Grayscale": "灰",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值",
"Component.Namespace.Master.Items.Body.NewAdded": "新",
"Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置",
"Component.Namespace.Master.Items.Body.Modified": "改",
"Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置",
"Component.Namespace.Master.Items.Body.Deleted": "删",
"Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置",
"Component.Namespace.Master.Items.Body.ModifyTips": "修改",
"Component.Namespace.Master.Items.Body.DeleteTips": "删除",
"Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置",
"Component.Namespace.Master.Items.Body.Public.Title": "公共的配置",
"Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史",
"Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息",
"Component.PublishDeny.Title": "发布受限",
"Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~",
"Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）",
"Component.PublishDeny.EmergencyPublish": "紧急发布",
"Component.PublishDeny.Close": "关闭",
"Component.Publish.Title": "发布",
"Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})",
"Component.Publish.Grayscale": "灰度发布",
"Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)",
"Component.Publish.AllPublish": "全量发布",
"Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)",
"Component.Publish.ToSeeChange": "查看变更",
"Component.Publish.PublishedValue": "发布的值",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "未发布的值",
"Component.Publish.ModifyUser": "修改人",
"Component.Publish.ModifyTime": "修改时间",
"Component.Publish.NewAdded": "新",
"Component.Publish.NewAddedTips": "新增的配置",
"Component.Publish.Modified": "改",
"Component.Publish.ModifiedTips": "修改的配置",
"Component.Publish.Deleted": "删",
"Component.Publish.DeletedTips": "删除的配置",
"Component.Publish.MasterValue": "主版本值",
"Component.Publish.GrayValue": "灰度版本的值",
"Component.Publish.GrayPublishedValue": "灰度版本发布的值",
"Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值",
"Component.Publish.ItemNoChange": "配置没有变化",
"Component.Publish.GrayItemNoChange": "灰度配置没有变化",
"Component.Publish.NoGrayItems": "没有灰度的配置项",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "发布",
"Component.Rollback.To": "回滚到",
"Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本",
"Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置",
"Component.Rollback.ClickToView": "点击查看",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "回滚前",
"Component.Rollback.RollbackAfterValue": "回滚后",
"Component.Rollback.Added": "新增",
"Component.Rollback.Modified": "更新",
"Component.Rollback.Deleted": "删除",
"Component.Rollback.NoChange": "配置没有变化",
"Component.Rollback.OpRollback": "回滚",
"Component.ShowText.Title": "查看",
"Login.Login": "登录",
"Login.UserNameOrPasswordIncorrect": "用户名或密码错误",
"Login.LogoutSuccessfully": "登出成功",
"Index.MyProject": "我的项目",
"Index.CreateProject": "创建项目",
"Index.LoadMore": "加载更多",
"Index.FavoriteItems": "收藏的项目",
"Index.Topping": "置顶",
"Index.FavoriteTip": "您还没有收藏过任何项目，在项目主页可以收藏项目哟~",
"Index.RecentlyViewedItems": "最近浏览的项目",
"Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败",
"Index.Topped": "置顶成功",
"Index.CancelledFavorite": "取消收藏成功",
"Cluster.CreateCluster": "新建集群",
"Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置",
"Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群",
"Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)",
"Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致",
"Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)",
"Cluster.ChooseEnvironment": "选择环境",
"Cluster.LoadingEnvironmentError": "加载环境信息出错",
"Cluster.ClusterCreated": "集群创建成功",
"Cluster.ClusterCreateFailed": "集群创建失败",
"Cluster.PleaseChooseEnvironment": "请选择环境",
"Config.Title": "Apollo配置中心",
"Config.AppIdNotFound": "不存在，",
"Config.ClickByCreate": "点击创建",
"Config.EnvList": "环境列表",
"Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置",
"Config.ProjectInfo": "项目信息",
"Config.ModifyBasicProjectInfo": "修改项目基本信息",
"Config.Favorite": "收藏",
"Config.CancelFavorite": "取消收藏",
"Config.MissEnv": "缺失的环境",
"Config.MissNamespace": "缺失的Namespace",
"Config.ProjectManage": "管理项目",
"Config.AccessKeyManage": "管理密钥",
"Config.CreateAppMissEnv": "补缺环境",
"Config.CreateAppMissNamespace": "补缺Namespace",
"Config.AddCluster": "添加集群",
"Config.AddNamespace": "添加Namespace",
"Config.CurrentlyOperatorEnv": "当前操作环境",
"Config.DoNotRemindAgain": "不再提示",
"Config.Note": "注意",
"Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！",
"Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。",
"Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。",
"Config.RevokeItem.DialogTitle": "撤销配置",
"Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?",
"Config.DeleteItem.DialogTitle": "删除配置",
"Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?",
"Config.PublishNoPermission.DialogTitle": "发布",
"Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找项目管理员 '{{masterUsers}}' 分配发布权限",
"Config.ModifyNoPermission.DialogTitle": "申请配置权限",
"Config.ModifyNoPermission.DialogContent": "请找项目管理员 '{{masterUsers}}' 分配编辑或发布权限",
"Config.MasterNoPermission.DialogTitle": "申请配置权限",
"Config.MasterNoPermission.DialogContent": "您不是项目管理员， 只有项目管理员才有添加集群、namespace的权限。如需管理员权限，请找项目管理员 '{{masterUsers}}' 分配管理员权限",
"Config.NamespaceLocked.DialogTitle": "编辑受限",
"Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.",
"Config.RollbackAlert.DialogTitle": "回滚",
"Config.RollbackAlert.DialogContent": "确定要回滚吗?",
"Config.EmergencyPublishAlert.DialogTitle": "紧急发布",
"Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?",
"Config.DeleteBranch.DialogTitle": "删除灰度",
"Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?",
"Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示",
"Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效",
"Config.MergeAndReleaseDeny.DialogTitle": "全量发布",
"Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId",
"Config.SyntaxCheckFailed.DialogTitle": "语法检查错误",
"Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示",
"Config.CreateBranchTips.DialogTitle": "创建灰度须知",
"Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br> 1.创建灰度版本 <br> 2.配置灰度配置项<br> 3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br> 4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br> 1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效",
"Config.ProjectMissEnvInfos": "当前项目有环境缺失，请点击页面左侧『补缺环境』补齐数据",
"Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据",
"Config.SystemError": "系统出错,请重试或联系系统负责人",
"Config.FavoriteSuccessfully": "收藏成功",
"Config.FavoriteFailed": "收藏失败",
"Config.CancelledFavorite": "取消收藏成功",
"Config.CancelFavoriteFailed": "取消收藏失败",
"Config.GetUserInfoFailed": "获取用户登录信息失败",
"Config.LoadingAllNamespaceError": "加载配置信息出错",
"Config.CancelFavoriteError": "取消收藏失败",
"Config.Deleted": "删除成功",
"Config.DeleteFailed": "删除失败",
"Config.GrayscaleCreated": "创建灰度成功",
"Config.GrayscaleCreateFailed": "创建灰度失败",
"Config.BranchDeleted": "分支删除成功",
"Config.BranchDeleteFailed": "分支删除失败",
"Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败",
"Config.DeleteNamespaceNoPermissionFailedTips": "您没有项目管理员权限，只有管理员才能删除Namespace，请找项目管理员 [{{users}}] 删除Namespace",
"Delete.Title": "删除应用、集群、AppNamespace",
"Delete.DeleteApp": "删除应用",
"Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)",
"Delete.AppIdTips": "(删除前请先查询应用信息)",
"Delete.AppInfo": "应用信息",
"Delete.DeleteCluster": "删除集群",
"Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)",
"Delete.EnvName": "环境名称",
"Delete.ClusterNameTips": "(删除前请先查询应用集群信息)",
"Delete.ClusterInfo": "集群信息",
"Delete.DeleteNamespace": "删除AppNamespace",
"Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到项目页面中自行删除！）",
"Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。",
"Delete.AppNamespaceName": "AppNamespace名称",
"Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace信息",
"Delete.IsRootUserTips": "当前页面只对Apollo管理员开放",
"Delete.PleaseEnterAppId": "请输入appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！",
"Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？",
"Delete.Deleted": "删除成功",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称",
"Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称",
"Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'",
"Namespace.Title": "新建Namespace",
"Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)",
"Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置",
"Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace",
"Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何项目读取",
"Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求",
"Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可",
"Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace",
"Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到",
"Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置",
"Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容",
"Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去",
"Namespace.CreateNamespace": "创建Namespace",
"Namespace.AssociationPublicNamespace": "关联公共Namespace",
"Namespace.ChooseCluster": "选择集群",
"Namespace.NamespaceName": "名称",
"Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀",
"Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)",
"Namespace.NamespaceType": "类型",
"Namespace.NamespaceType.Public": "public",
"Namespace.NamespaceType.Private": "private",
"Namespace.Remark": "备注",
"Namespace.Namespace": "namespace",
"Namespace.PleaseChooseNamespace": "请选择Namespace",
"Namespace.LoadingPublicNamespaceError": "加载公共namespace错误",
"Namespace.LoadingAppInfoError": "加载App信息出错",
"Namespace.PleaseChooseCluster": "请选择集群",
"Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符",
"ServiceConfig.Title": "应用配置",
"ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）",
"ServiceConfig.Key": "key",
"ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)",
"ServiceConfig.Value": "value",
"ServiceConfig.Comment": "comment",
"ServiceConfig.Saved": "保存成功",
"ServiceConfig.SaveFailed": "保存失败",
"ServiceConfig.PleaseEnterKey": "请输入key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项",
"AccessKey.Tips.1": "每个环境最多可添加5个访问密钥",
"AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置",
"AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：",
"AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret",
"AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET",
"AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret（注意多环境secret不一样）",
"AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥",
"AccessKey.ConfigAccessKeys.Secret": "访问密钥",
"AccessKey.ConfigAccessKeys.Status": "状态",
"AccessKey.ConfigAccessKeys.LastModify": "最后修改人",
"AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间",
"AccessKey.ConfigAccessKeys.Operator": "操作",
"AccessKey.Operator.Disable": "禁用",
"AccessKey.Operator.Enable": "启用",
"AccessKey.Operator.Disabled": "已禁用",
"AccessKey.Operator.Enabled": "已启用",
"AccessKey.Operator.Remove": "删除",
"AccessKey.Operator.CreateSuccess": "访问密钥创建成功",
"AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功",
"AccessKey.Operator.EnabledSuccess": "访问密钥启用成功",
"AccessKey.Operator.RemoveSuccess": "访问密钥删除成功",
"AccessKey.Operator.CreateError": "访问密钥创建失败",
"AccessKey.Operator.DisabledError": "访问密钥禁用失败",
"AccessKey.Operator.EnabledError": "访问密钥启用失败",
"AccessKey.Operator.RemoveError": "访问密钥删除失败",
"AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?",
"AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?",
"AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?",
"AccessKey.LoadError": "加载访问密钥出错",
"SystemInfo.Title": "系统信息",
"SystemInfo.SystemVersion": "系统版本",
"SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。",
"SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）",
"SystemInfo.MetaServerAddress": "Meta server地址",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.Title": "系统权限管理",
"SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限",
"SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建项目)",
"SystemRole.ChooseUser": "用户选择",
"SystemRole.Add": "添加",
"SystemRole.AuthorizedUser": "已拥有权限用户",
"SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限",
"SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改项目管理员)",
"SystemRole.AppIdTips": "(请先查询应用信息)",
"SystemRole.AppInfo": "应用信息",
"SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master",
"SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master",
"SystemRole.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.PleaseChooseUser": "请选择用户名",
"SystemRole.Added": "添加成功",
"SystemRole.AddFailed": "添加失败",
"SystemRole.Deleted": "删除成功",
"SystemRole.DeleteFailed": "删除失败",
"SystemRole.GetCanCreateProjectUsersError": "获取拥有创建项目权限的用户列表出错",
"SystemRole.PleaseEnterAppId": "请输入appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！",
"SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}",
"SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"UserMange.Title": "用户管理",
"UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）",
"UserMange.UserName": "用户登录账户",
"UserMange.UserDisplayName": "用户名称",
"UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。",
"UserMange.Pwd": "密码",
"UserMange.Email": "邮箱",
"UserMange.Created": "创建用户成功",
"UserMange.CreateFailed": "创建用户失败",
"Open.Manage.Title": "开放平台",
"Open.Manage.CreateThirdApp": "创建第三方应用",
"Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)",
"Open.Manage.ThirdAppId": "第三方应用ID",
"Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)",
"Open.Manage.ThirdAppName": "第三方应用名称",
"Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"Open.Manage.ProjectOwner": "项目负责人",
"Open.Manage.Create": "创建",
"Open.Manage.GrantPermission": "赋权",
"Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "被管理的AppId",
"Open.Manage.ManagedNamespace": "被管理的Namespace",
"Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Open.Manage.GrantType": "授权类型",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "环境",
"Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)",
"Open.Manage.PleaseEnterAppId": "请输入appId",
"Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建",
"Open.Manage.GrantSuccessfully": "赋权成功",
"Open.Manage.GrantFailed": "赋权失败",
"Namespace.Role.Title": "权限管理",
"Namespace.Role.GrantModifyTo": "修改权",
"Namespace.Role.GrantModifyTo2": "(可以修改配置)",
"Namespace.Role.AllEnv": "所有环境",
"Namespace.Role.GrantPublishTo": "发布权",
"Namespace.Role.GrantPublishTo2": "(可以发布配置)",
"Namespace.Role.Add": "添加",
"Namespace.Role.NoPermission": "您没有权限哟!",
"Namespace.Role.InitNamespacePermissionError": "初始化授权出错",
"Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错",
"Namespace.Role.GetGrantUserError": "加载授权用户出错",
"Namespace.Role.PleaseChooseUser": "请选择用户",
"Namespace.Role.Added": "添加成功",
"Namespace.Role.AddFailed": "添加失败",
"Namespace.Role.Deleted": "删除成功",
"Namespace.Role.DeleteFailed": "删除失败",
"Config.Sync.Title": "同步配置",
"Config.Sync.FistStep": "(第一步:选择同步信息)",
"Config.Sync.SecondStep": "(第二步:检查Diff)",
"Config.Sync.PreviousStep": "上一步",
"Config.Sync.NextStep": "下一步",
"Config.Sync.Sync": "同步",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致",
"Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效",
"Config.Sync.SyncNamespace": "同步的Namespace",
"Config.Sync.SyncToCluster": "同步到哪个集群",
"Config.Sync.NeedToSyncItem": "需要同步的配置",
"Config.Sync.SortByLastModifyTime": "按最后更新时间过滤",
"Config.Sync.BeginTime": "开始时间",
"Config.Sync.EndTime": "结束时间",
"Config.Sync.Filter": "过滤",
"Config.Sync.Rest": "重置",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "没有更新的配置",
"Config.Sync.IgnoreSync": "忽略同步",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "同步前",
"Config.Sync.Step2SyncAfter": "同步后",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "操作",
"Config.Sync.NewAdd": "新增",
"Config.Sync.NoSyncItem": "不同步该配置",
"Config.Sync.Delete": "删除",
"Config.Sync.Update": "更新",
"Config.Sync.SyncSuccessfully": "同步成功!",
"Config.Sync.SyncFailed": "同步失败!",
"Config.Sync.LoadingItemsError": "加载配置出错",
"Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置",
"Config.Sync.PleaseChooseCluster": "请选择集群",
"Config.History.Title": "发布历史",
"Config.History.MasterVersionPublish": "主版本发布",
"Config.History.MasterVersionRollback": "主版本回滚",
"Config.History.GrayscaleOperator": "灰度操作",
"Config.History.PublishHistory": "发布历史",
"Config.History.OperationType0": "普通发布",
"Config.History.OperationType1": "回滚",
"Config.History.OperationType2": "灰度发布",
"Config.History.OperationType3": "更新灰度规则",
"Config.History.OperationType4": "灰度全量发布",
"Config.History.OperationType5": "灰度发布(主版本发布)",
"Config.History.OperationType6": "灰度发布(主版本回滚)",
"Config.History.OperationType7": "放弃灰度",
"Config.History.OperationType8": "删除灰度(全量发布)",
"Config.History.UrgentPublish": "紧急发布",
"Config.History.LoadMore": "加载更多",
"Config.History.Abandoned": "已废弃",
"Config.History.RollbackTo": "回滚到此版本",
"Config.History.RollbackToTips": "回滚已发布的配置到此版本",
"Config.History.ChangedItem": "变更的配置",
"Config.History.ChangedItemTips": "查看此次发布与上次版本的变更",
"Config.History.AllItem": "全部配置",
"Config.History.AllItemTips": "查看此次发布的所有配置信息",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "新增",
"Config.History.ChangeTypeModify": "修改",
"Config.History.ChangeTypeDelete": "删除",
"Config.History.NoChange": "无配置更改",
"Config.History.NoItem": "无配置",
"Config.History.GrayscaleRule": "灰度规则",
"Config.History.GrayscaleAppId": "灰度的AppId",
"Config.History.GrayscaleIp": "灰度的IP",
"Config.History.NoGrayscaleRule": "无灰度规则",
"Config.History.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史",
"Config.History.NoPublishHistory": "无发布历史信息",
"Config.History.LoadingHistoryError": "无发布历史信息",
"Config.Diff.Title": "比较配置",
"Config.Diff.FirstStep": "(第一步:选择比较信息)",
"Config.Diff.SecondStep": "(第二步:查看差异配置)",
"Config.Diff.PreviousStep": "上一步",
"Config.Diff.NextStep": "下一步",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
"Config.Diff.DiffCluster": "要比较的集群",
"Config.Diff.HasDiffComment": "是否比较注释",
"Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
"ConfigExport.Title": "配置导出",
"ConfigExport.TitleTips" : "超级管理员会下载所有项目的配置，普通用户只会下载自己项目的配置",
"ConfigExport.Download": "下载",
"App.CreateProject": "创建项目",
"App.AppIdTips": "（应用唯一标识）",
"App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.AppOwnerTips": "(开启项目管理员分配权限控制后，应用负责人和项目管理员默认为本账号，不可选择)",
"App.AppAdminTips1": "(应用负责人默认具有项目管理员权限，",
"App.AppAdminTips2": "项目管理员可以创建Namespace和集群、分配用户权限)",
"App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.Title": "项目管理",
"App.Setting.Admin": "管理员",
"App.Setting.AdminTips": "(项目管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理项目、Namespace权限)",
"App.Setting.Add": "添加",
"App.Setting.BasicInfo": "基本信息",
"App.Setting.ProjectName": "项目名称",
"App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.Setting.ProjectOwner": "项目负责人",
"App.Setting.Modify": "修改项目信息",
"App.Setting.Cancel": "取消修改",
"App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.DeleteAdmin": "删除管理员",
"App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员",
"App.Setting.PleaseChooseUser": "请选择用户",
"App.Setting.Added": "添加成功",
"App.Setting.AddFailed": "添加失败",
"App.Setting.Deleted": "删除成功",
"App.Setting.DeleteFailed": "删除失败",
"App.Setting.Modified": "修改成功",
"Valdr.App.AppId.Size": "AppId长度不能多于64个字符",
"Valdr.App.AppId.Required": "AppId不能为空",
"Valdr.App.appName.Size": "应用名称长度不能多于128个字符",
"Valdr.App.appName.Required": "应用名称不能为空",
"Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符",
"Valdr.Cluster.ClusterName.Required": "集群名称不能为空",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空",
"Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Item.Key.Size": "Key长度不能多于128个字符",
"Valdr.Item.Key.Required": "Key不能为空",
"Valdr.Item.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符",
"Valdr.Release.ReleaseName.Required": "Release Name不能为空",
"Valdr.Release.Comment.Size": "备注长度不能多于64个字符",
"ApolloConfirmDialog.DefaultConfirmBtnName": "确认",
"ApolloConfirmDialog.SearchPlaceHolder": "搜索项目(AppId、项目名)",
"RulesModal.ChooseInstances": "从实例列表中选择",
"RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空",
"RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则",
"RulesModal.IpListCanNotBeNull": "IP列表不能为空",
"ItemModal.KeyExists": "key='{{key}}' 已存在",
"ItemModal.AddedTips": "添加成功,如需生效请发布",
"ItemModal.AddFailed": "添加失败",
"ItemModal.PleaseChooseCluster": "请选择集群",
"ItemModal.ModifiedTips": "更新成功, 如需生效请发布",
"ItemModal.ModifyFailed": "更新失败",
"ItemModal.Tabs": "制表符",
"ItemModal.NewLine": "换行符",
"ItemModal.Space": "空格",
"ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错",
"ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错",
"ApolloNsPanel.Deleted": "删除成功",
"ApolloNsPanel.GrayscaleModified": "灰度规则更新成功",
"ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败",
"ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布",
"ApolloNsPanel.ModifyFailed": "更新失败",
"ApolloNsPanel.GrammarIsRight": "语法正确！",
"ReleaseModal.Published": "发布成功",
"ReleaseModal.PublishFailed": "发布失败",
"ReleaseModal.GrayscalePublished": "灰度发布成功",
"ReleaseModal.GrayscalePublishFailed": "灰度发布失败",
"ReleaseModal.AllPublished": "全量发布成功",
"ReleaseModal.AllPublishFailed": "全量发布失败",
"Rollback.NoRollbackList": "没有可以回滚的发布历史",
"Rollback.SameAsCurrentRelease": "该版本与当前版本相同",
"Rollback.RollbackSuccessfully": "回滚成功",
"Rollback.RollbackFailed": "回滚失败",
"Revoke.RevokeFailed": "撤销失败",
"Revoke.RevokeSuccessfully": "撤销成功"
}
| {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.SystemRoleManage": "系统权限管理",
"Common.Nav.OpenMange": "开放平台授权管理",
"Common.Nav.SystemConfig": "系统参数",
"Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace",
"Common.Nav.SystemInfo": "系统信息",
"Common.Nav.ConfigExport": "配置导出",
"Common.Nav.Logout": "退出",
"Common.Department": "部门",
"Common.Cluster": "集群",
"Common.Environment": "环境",
"Common.Email": "邮箱",
"Common.AppId": "AppId",
"Common.Namespace": "Namespace",
"Common.AppName": "应用名称",
"Common.AppOwner": "负责人",
"Common.AppOwnerLong": "应用负责人",
"Common.AppAdmin": "项目管理员",
"Common.ClusterName": "集群名称",
"Common.Submit": "提交",
"Common.Save": "保存",
"Common.Created": "创建成功",
"Common.CreateFailed": "创建失败",
"Common.Deleted": "删除成功",
"Common.DeleteFailed": "删除失败",
"Common.ReturnToIndex": "返回到项目首页",
"Common.Cancel": "取消",
"Common.Ok": "确定",
"Common.Search": "查询",
"Common.IsRootUser": "当前页面只对Apollo管理员开放",
"Common.PleaseChooseDepartment": "请选择部门",
"Common.PleaseChooseOwner": "请选择应用负责人",
"Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试",
"Component.DeleteNamespace.Title": "删除Namespace",
"Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?",
"Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?",
"Component.GrayscalePublishRule.Title": "编辑灰度规则",
"Component.GrayscalePublishRule.AppId": "灰度的AppId",
"Component.GrayscalePublishRule.AcceptRule": "灰度应用规则",
"Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例",
"Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例",
"Component.GrayscalePublishRule.IP": "灰度的IP",
"Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)",
"Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以",
"Component.GrayscalePublishRule.EnterIp": "手动输入IP",
"Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮",
"Component.GrayscalePublishRule.Add": "添加",
"Component.ConfigItem.Title": "添加配置项",
"Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)",
"Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项",
"Component.ConfigItem.ModifyItem": "修改配置项",
"Component.ConfigItem.ItemKey": "Key",
"Component.ConfigItem.ItemValue": "Value",
"Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击",
"Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符",
"Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符",
"Component.ConfigItem.ItemComment": "Comment",
"Component.ConfigItem.ChooseCluster": "选择集群",
"Component.MergePublish.Title": "全量发布",
"Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。",
"Component.MergePublish.NextStep": "全量发布后,您希望",
"Component.MergePublish.DeleteGrayscale": "删除灰度版本",
"Component.MergePublish.ReservedGrayscale": "保留灰度版本",
"Component.Namespace.Branch.IsChanged": "有修改",
"Component.Namespace.Branch.ChangeUser": "当前修改者",
"Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布",
"Component.Namespace.Branch.GrayscalePublish": "灰度发布",
"Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置",
"Component.Namespace.Branch.AllPublish": "全量发布",
"Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本",
"Component.Namespace.Branch.DiscardGrayscale": "放弃灰度",
"Component.Namespace.Branch.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Branch.Tab.Configuration": "配置",
"Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则",
"Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表",
"Component.Namespace.Branch.Tab.ChangeHistory": "更改历史",
"Component.Namespace.Branch.Body.Item": "灰度的配置",
"Component.Namespace.Branch.Body.AddedItem": "新增灰度配置",
"Component.Namespace.Branch.Body.PublishState": "发布状态",
"Component.Namespace.Branch.Body.ItemSort": "排序",
"Component.Namespace.Branch.Body.ItemKey": "Key",
"Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值",
"Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值",
"Component.Namespace.Branch.Body.ItemComment": "备注",
"Component.Namespace.Branch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Branch.Body.ItemOperator": "操作",
"Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.Branch.Body.ItemNoPublish": "未发布",
"Component.Namespace.Branch.Body.ItemPublished": "已发布",
"Component.Namespace.Branch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.Branch.Body.ClickToSee": "点击查看",
"Component.Namespace.Branch.Body.DeletedItem": "删除的配置",
"Component.Namespace.Branch.Body.Delete": "删",
"Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置",
"Component.Namespace.Branch.Body.ModifiedItem": "修改的配置",
"Component.Namespace.Branch.Body.Modify": "改",
"Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置",
"Component.Namespace.Branch.Body.Added": "新",
"Component.Namespace.Branch.Body.Op.Modify": "修改",
"Component.Namespace.Branch.Body.Op.Delete": "删除",
"Component.Namespace.MasterBranch.Body.Title": "主版本的配置",
"Component.Namespace.MasterBranch.Body.PublishState": "发布状态",
"Component.Namespace.MasterBranch.Body.ItemKey": "Key",
"Component.Namespace.MasterBranch.Body.ItemValue": "Value",
"Component.Namespace.MasterBranch.Body.ItemComment": "备注",
"Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人",
"Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.MasterBranch.Body.ItemOperator": "操作",
"Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值",
"Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布",
"Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置",
"Component.Namespace.MasterBranch.Body.ItemPublished": "已发布",
"Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置",
"Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置",
"Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找项目管理员申请权限.",
"Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId",
"Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表",
"Component.Namespace.Branch.GrayScaleRule.Operator": "操作",
"Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL",
"Component.Namespace.Branch.GrayScaleRule.Modify": "修改",
"Component.Namespace.Branch.GrayScaleRule.Delete": "删除",
"Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则",
"Component.Namespace.Branch.Instance.RefreshList": "刷新列表",
"Component.Namespace.Branch.Instance.ItemToSee": "查看配置",
"Component.Namespace.Branch.Instance.InstanceAppId": "App ID",
"Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name",
"Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center",
"Component.Namespace.Branch.Instance.InstanceIp": "IP",
"Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间",
"Component.Namespace.Branch.Instance.LoadMore": "刷新列表",
"Component.Namespace.Branch.Instance.NoInstance": "无实例信息",
"Component.Namespace.Branch.History.ItemType": "Type",
"Component.Namespace.Branch.History.ItemKey": "Key",
"Component.Namespace.Branch.History.ItemOldValue": "Old Value",
"Component.Namespace.Branch.History.ItemNewValue": "New Value",
"Component.Namespace.Branch.History.ItemComment": "Comment",
"Component.Namespace.Branch.History.NewAdded": "新增",
"Component.Namespace.Branch.History.Modified": "更新",
"Component.Namespace.Branch.History.Deleted": "删除",
"Component.Namespace.Branch.History.LoadMore": "加载更多",
"Component.Namespace.Branch.History.NoHistory": "无更改历史",
"Component.Namespace.Header.Title.Private": "私有",
"Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.Public": "公共",
"Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到",
"Component.Namespace.Header.Title.Extend": "关联",
"Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到",
"Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]",
"Component.Namespace.Header.Title.Master": "主版本",
"Component.Namespace.Header.Title.Grayscale": "灰度版本",
"Component.Namespace.Master.LoadNamespace": "加载Namespace",
"Component.Namespace.Master.LoadNamespaceTips": "加载Namespace",
"Component.Namespace.Master.Items.Changed": "有修改",
"Component.Namespace.Master.Items.ChangedUser": "当前修改者",
"Component.Namespace.Master.Items.Publish": "发布",
"Component.Namespace.Master.Items.PublishTips": "发布配置",
"Component.Namespace.Master.Items.Rollback": "回滚",
"Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置",
"Component.Namespace.Master.Items.PublishHistory": "发布历史",
"Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史",
"Component.Namespace.Master.Items.Grant": "授权",
"Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限",
"Component.Namespace.Master.Items.Grayscale": "灰度",
"Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本",
"Component.Namespace.Master.Items.RequestPermission": "申请配置权限",
"Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请",
"Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace",
"Component.Namespace.Master.Items.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。",
"Component.Namespace.Master.Items.ItemList": "表格",
"Component.Namespace.Master.Items.ItemListByText": "文本",
"Component.Namespace.Master.Items.ItemHistory": "更改历史",
"Component.Namespace.Master.Items.ItemInstance": "实例列表",
"Component.Namespace.Master.Items.CopyText": "复制文本",
"Component.Namespace.Master.Items.GrammarCheck": "语法检查",
"Component.Namespace.Master.Items.CancelChanged": "取消修改",
"Component.Namespace.Master.Items.Change": "修改配置",
"Component.Namespace.Master.Items.SummitChanged": "提交修改",
"Component.Namespace.Master.Items.SortByKey": "按Key过滤配置",
"Component.Namespace.Master.Items.FilterItem": "过滤配置",
"Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置",
"Component.Namespace.Master.Items.SyncItem": "同步配置",
"Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改",
"Component.Namespace.Master.Items.RevokeItem": "撤销配置",
"Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置",
"Component.Namespace.Master.Items.DiffItem": "比较配置",
"Component.Namespace.Master.Items.AddItem": "新增配置",
"Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。",
"Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤",
"Component.Namespace.Master.Items.Body.PublishState": "发布状态",
"Component.Namespace.Master.Items.Body.Sort": "排序",
"Component.Namespace.Master.Items.Body.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.ItemValue": "Value",
"Component.Namespace.Master.Items.Body.ItemComment": "备注",
"Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人",
"Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间",
"Component.Namespace.Master.Items.Body.ItemOperator": "操作",
"Component.Namespace.Master.Items.Body.NoPublish": "未发布",
"Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值",
"Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值",
"Component.Namespace.Master.Items.Body.Published": "已发布",
"Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置",
"Component.Namespace.Master.Items.Body.ClickToSee": "点击查看",
"Component.Namespace.Master.Items.Body.Grayscale": "灰",
"Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值",
"Component.Namespace.Master.Items.Body.NewAdded": "新",
"Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置",
"Component.Namespace.Master.Items.Body.Modified": "改",
"Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置",
"Component.Namespace.Master.Items.Body.Deleted": "删",
"Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置",
"Component.Namespace.Master.Items.Body.ModifyTips": "修改",
"Component.Namespace.Master.Items.Body.DeleteTips": "删除",
"Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置",
"Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置",
"Component.Namespace.Master.Items.Body.Public.Title": "公共的配置",
"Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者",
"Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace",
"Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置",
"Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置",
"Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置",
"Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值",
"Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值",
"Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type",
"Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key",
"Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value",
"Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment",
"Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增",
"Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新",
"Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除",
"Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史",
"Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例",
"Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例",
"Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例",
"Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表",
"Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置",
"Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多",
"Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID",
"Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name",
"Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center",
"Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP",
"Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间",
"Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息",
"Component.PublishDeny.Title": "发布受限",
"Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~",
"Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）",
"Component.PublishDeny.EmergencyPublish": "紧急发布",
"Component.PublishDeny.Close": "关闭",
"Component.Publish.Title": "发布",
"Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})",
"Component.Publish.Grayscale": "灰度发布",
"Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)",
"Component.Publish.AllPublish": "全量发布",
"Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)",
"Component.Publish.ToSeeChange": "查看变更",
"Component.Publish.PublishedValue": "发布的值",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
"Component.Publish.NoPublishedValue": "未发布的值",
"Component.Publish.ModifyUser": "修改人",
"Component.Publish.ModifyTime": "修改时间",
"Component.Publish.NewAdded": "新",
"Component.Publish.NewAddedTips": "新增的配置",
"Component.Publish.Modified": "改",
"Component.Publish.ModifiedTips": "修改的配置",
"Component.Publish.Deleted": "删",
"Component.Publish.DeletedTips": "删除的配置",
"Component.Publish.MasterValue": "主版本值",
"Component.Publish.GrayValue": "灰度版本的值",
"Component.Publish.GrayPublishedValue": "灰度版本发布的值",
"Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值",
"Component.Publish.ItemNoChange": "配置没有变化",
"Component.Publish.GrayItemNoChange": "灰度配置没有变化",
"Component.Publish.NoGrayItems": "没有灰度的配置项",
"Component.Publish.Release": "Release Name",
"Component.Publish.ReleaseComment": "Comment",
"Component.Publish.OpPublish": "发布",
"Component.Rollback.To": "回滚到",
"Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本",
"Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置",
"Component.Rollback.ClickToView": "点击查看",
"Component.Rollback.ItemType": "Type",
"Component.Rollback.ItemKey": "Key",
"Component.Rollback.RollbackBeforeValue": "回滚前",
"Component.Rollback.RollbackAfterValue": "回滚后",
"Component.Rollback.Added": "新增",
"Component.Rollback.Modified": "更新",
"Component.Rollback.Deleted": "删除",
"Component.Rollback.NoChange": "配置没有变化",
"Component.Rollback.OpRollback": "回滚",
"Component.ShowText.Title": "查看",
"Login.Login": "登录",
"Login.UserNameOrPasswordIncorrect": "用户名或密码错误",
"Login.LogoutSuccessfully": "登出成功",
"Index.MyProject": "我的项目",
"Index.CreateProject": "创建项目",
"Index.LoadMore": "加载更多",
"Index.FavoriteItems": "收藏的项目",
"Index.Topping": "置顶",
"Index.FavoriteTip": "您还没有收藏过任何项目，在项目主页可以收藏项目哟~",
"Index.RecentlyViewedItems": "最近浏览的项目",
"Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败",
"Index.Topped": "置顶成功",
"Index.CancelledFavorite": "取消收藏成功",
"Cluster.CreateCluster": "新建集群",
"Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置",
"Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群",
"Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)",
"Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致",
"Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)",
"Cluster.ChooseEnvironment": "选择环境",
"Cluster.LoadingEnvironmentError": "加载环境信息出错",
"Cluster.ClusterCreated": "集群创建成功",
"Cluster.ClusterCreateFailed": "集群创建失败",
"Cluster.PleaseChooseEnvironment": "请选择环境",
"Config.Title": "Apollo配置中心",
"Config.AppIdNotFound": "不存在，",
"Config.ClickByCreate": "点击创建",
"Config.EnvList": "环境列表",
"Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置",
"Config.ProjectInfo": "项目信息",
"Config.ModifyBasicProjectInfo": "修改项目基本信息",
"Config.Favorite": "收藏",
"Config.CancelFavorite": "取消收藏",
"Config.MissEnv": "缺失的环境",
"Config.MissNamespace": "缺失的Namespace",
"Config.ProjectManage": "管理项目",
"Config.AccessKeyManage": "管理密钥",
"Config.CreateAppMissEnv": "补缺环境",
"Config.CreateAppMissNamespace": "补缺Namespace",
"Config.AddCluster": "添加集群",
"Config.AddNamespace": "添加Namespace",
"Config.CurrentlyOperatorEnv": "当前操作环境",
"Config.DoNotRemindAgain": "不再提示",
"Config.Note": "注意",
"Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！",
"Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。",
"Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。",
"Config.RevokeItem.DialogTitle": "撤销配置",
"Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?",
"Config.DeleteItem.DialogTitle": "删除配置",
"Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?",
"Config.PublishNoPermission.DialogTitle": "发布",
"Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找项目管理员 '{{masterUsers}}' 分配发布权限",
"Config.ModifyNoPermission.DialogTitle": "申请配置权限",
"Config.ModifyNoPermission.DialogContent": "请找项目管理员 '{{masterUsers}}' 分配编辑或发布权限",
"Config.MasterNoPermission.DialogTitle": "申请配置权限",
"Config.MasterNoPermission.DialogContent": "您不是项目管理员， 只有项目管理员才有添加集群、namespace的权限。如需管理员权限，请找项目管理员 '{{masterUsers}}' 分配管理员权限",
"Config.NamespaceLocked.DialogTitle": "编辑受限",
"Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.",
"Config.RollbackAlert.DialogTitle": "回滚",
"Config.RollbackAlert.DialogContent": "确定要回滚吗?",
"Config.EmergencyPublishAlert.DialogTitle": "紧急发布",
"Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?",
"Config.DeleteBranch.DialogTitle": "删除灰度",
"Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?",
"Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示",
"Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效",
"Config.MergeAndReleaseDeny.DialogTitle": "全量发布",
"Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置",
"Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示",
"Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则",
"Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息",
"Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示",
"Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId",
"Config.SyntaxCheckFailed.DialogTitle": "语法检查错误",
"Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示",
"Config.CreateBranchTips.DialogTitle": "创建灰度须知",
"Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br> 1.创建灰度版本 <br> 2.配置灰度配置项<br> 3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br> 4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br> 1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效",
"Config.ProjectMissEnvInfos": "当前项目有环境缺失，请点击页面左侧『补缺环境』补齐数据",
"Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据",
"Config.SystemError": "系统出错,请重试或联系系统负责人",
"Config.FavoriteSuccessfully": "收藏成功",
"Config.FavoriteFailed": "收藏失败",
"Config.CancelledFavorite": "取消收藏成功",
"Config.CancelFavoriteFailed": "取消收藏失败",
"Config.GetUserInfoFailed": "获取用户登录信息失败",
"Config.LoadingAllNamespaceError": "加载配置信息出错",
"Config.CancelFavoriteError": "取消收藏失败",
"Config.Deleted": "删除成功",
"Config.DeleteFailed": "删除失败",
"Config.GrayscaleCreated": "创建灰度成功",
"Config.GrayscaleCreateFailed": "创建灰度失败",
"Config.BranchDeleted": "分支删除成功",
"Config.BranchDeleteFailed": "分支删除失败",
"Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace",
"Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败",
"Config.DeleteNamespaceNoPermissionFailedTips": "您没有项目管理员权限，只有管理员才能删除Namespace，请找项目管理员 [{{users}}] 删除Namespace",
"Delete.Title": "删除应用、集群、AppNamespace",
"Delete.DeleteApp": "删除应用",
"Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)",
"Delete.AppIdTips": "(删除前请先查询应用信息)",
"Delete.AppInfo": "应用信息",
"Delete.DeleteCluster": "删除集群",
"Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)",
"Delete.EnvName": "环境名称",
"Delete.ClusterNameTips": "(删除前请先查询应用集群信息)",
"Delete.ClusterInfo": "集群信息",
"Delete.DeleteNamespace": "删除AppNamespace",
"Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到项目页面中自行删除！）",
"Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。",
"Delete.AppNamespaceName": "AppNamespace名称",
"Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Delete.AppNamespaceInfo": "AppNamespace信息",
"Delete.IsRootUserTips": "当前页面只对Apollo管理员开放",
"Delete.PleaseEnterAppId": "请输入appId",
"Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！",
"Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'",
"Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？",
"Delete.Deleted": "删除成功",
"Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称",
"Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'",
"Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称",
"Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'",
"Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'",
"Namespace.Title": "新建Namespace",
"Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)",
"Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置",
"Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace",
"Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何项目读取",
"Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求",
"Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可",
"Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace",
"Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到",
"Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置",
"Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容",
"Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去",
"Namespace.CreateNamespace": "创建Namespace",
"Namespace.AssociationPublicNamespace": "关联公共Namespace",
"Namespace.ChooseCluster": "选择集群",
"Namespace.NamespaceName": "名称",
"Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀",
"Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)",
"Namespace.NamespaceType": "类型",
"Namespace.NamespaceType.Public": "public",
"Namespace.NamespaceType.Private": "private",
"Namespace.Remark": "备注",
"Namespace.Namespace": "namespace",
"Namespace.PleaseChooseNamespace": "请选择Namespace",
"Namespace.LoadingPublicNamespaceError": "加载公共namespace错误",
"Namespace.LoadingAppInfoError": "加载App信息出错",
"Namespace.PleaseChooseCluster": "请选择集群",
"Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符",
"ServiceConfig.Title": "应用配置",
"ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）",
"ServiceConfig.Key": "key",
"ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)",
"ServiceConfig.Value": "value",
"ServiceConfig.Comment": "comment",
"ServiceConfig.Saved": "保存成功",
"ServiceConfig.SaveFailed": "保存失败",
"ServiceConfig.PleaseEnterKey": "请输入key",
"ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项",
"ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项",
"AccessKey.Tips.1": "每个环境最多可添加5个访问密钥",
"AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置",
"AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：",
"AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret",
"AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET",
"AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret（注意多环境secret不一样）",
"AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥",
"AccessKey.ConfigAccessKeys.Secret": "访问密钥",
"AccessKey.ConfigAccessKeys.Status": "状态",
"AccessKey.ConfigAccessKeys.LastModify": "最后修改人",
"AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间",
"AccessKey.ConfigAccessKeys.Operator": "操作",
"AccessKey.Operator.Disable": "禁用",
"AccessKey.Operator.Enable": "启用",
"AccessKey.Operator.Disabled": "已禁用",
"AccessKey.Operator.Enabled": "已启用",
"AccessKey.Operator.Remove": "删除",
"AccessKey.Operator.CreateSuccess": "访问密钥创建成功",
"AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功",
"AccessKey.Operator.EnabledSuccess": "访问密钥启用成功",
"AccessKey.Operator.RemoveSuccess": "访问密钥删除成功",
"AccessKey.Operator.CreateError": "访问密钥创建失败",
"AccessKey.Operator.DisabledError": "访问密钥禁用失败",
"AccessKey.Operator.EnabledError": "访问密钥启用失败",
"AccessKey.Operator.RemoveError": "访问密钥删除失败",
"AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?",
"AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?",
"AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?",
"AccessKey.LoadError": "加载访问密钥出错",
"SystemInfo.Title": "系统信息",
"SystemInfo.SystemVersion": "系统版本",
"SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。",
"SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。",
"SystemInfo.Active": "Active",
"SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）",
"SystemInfo.MetaServerAddress": "Meta server地址",
"SystemInfo.ConfigServices": "Config Services",
"SystemInfo.ConfigServices.Name": "Name",
"SystemInfo.ConfigServices.InstanceId": "Instance Id",
"SystemInfo.ConfigServices.HomePageUrl": "Home Page Url",
"SystemInfo.ConfigServices.CheckHealth": "Check Health",
"SystemInfo.NoConfigServiceTips": "No config service found!",
"SystemInfo.Check": "check",
"SystemInfo.AdminServices": "Admin Services",
"SystemInfo.AdminServices.Name": "Name",
"SystemInfo.AdminServices.InstanceId": "Instance Id",
"SystemInfo.AdminServices.HomePageUrl": "Home Page Url",
"SystemInfo.AdminServices.CheckHealth": "Check Health",
"SystemInfo.NoAdminServiceTips": "No admin service found!",
"SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.Title": "系统权限管理",
"SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限",
"SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建项目)",
"SystemRole.ChooseUser": "用户选择",
"SystemRole.Add": "添加",
"SystemRole.AuthorizedUser": "已拥有权限用户",
"SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限",
"SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改项目管理员)",
"SystemRole.AppIdTips": "(请先查询应用信息)",
"SystemRole.AppInfo": "应用信息",
"SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master",
"SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master",
"SystemRole.IsRootUser": "当前页面只对Apollo管理员开放",
"SystemRole.PleaseChooseUser": "请选择用户名",
"SystemRole.Added": "添加成功",
"SystemRole.AddFailed": "添加失败",
"SystemRole.Deleted": "删除成功",
"SystemRole.DeleteFailed": "删除失败",
"SystemRole.GetCanCreateProjectUsersError": "获取拥有创建项目权限的用户列表出错",
"SystemRole.PleaseEnterAppId": "请输入appId",
"SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！",
"SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}",
"SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？",
"SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功",
"UserMange.Title": "用户管理",
"UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）",
"UserMange.UserName": "用户登录账户",
"UserMange.UserDisplayName": "用户名称",
"UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。",
"UserMange.Pwd": "密码",
"UserMange.Email": "邮箱",
"UserMange.Created": "创建用户成功",
"UserMange.CreateFailed": "创建用户失败",
"Open.Manage.Title": "开放平台",
"Open.Manage.CreateThirdApp": "创建第三方应用",
"Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)",
"Open.Manage.ThirdAppId": "第三方应用ID",
"Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)",
"Open.Manage.ThirdAppName": "第三方应用名称",
"Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"Open.Manage.ProjectOwner": "项目负责人",
"Open.Manage.Create": "创建",
"Open.Manage.GrantPermission": "赋权",
"Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)",
"Open.Manage.Token": "Token",
"Open.Manage.ManagedAppId": "被管理的AppId",
"Open.Manage.ManagedNamespace": "被管理的Namespace",
"Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)",
"Open.Manage.GrantType": "授权类型",
"Open.Manage.GrantType.Namespace": "Namespace",
"Open.Manage.GrantType.App": "App",
"Open.Manage.GrantEnv": "环境",
"Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)",
"Open.Manage.PleaseEnterAppId": "请输入appId",
"Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建",
"Open.Manage.GrantSuccessfully": "赋权成功",
"Open.Manage.GrantFailed": "赋权失败",
"Namespace.Role.Title": "权限管理",
"Namespace.Role.GrantModifyTo": "修改权",
"Namespace.Role.GrantModifyTo2": "(可以修改配置)",
"Namespace.Role.AllEnv": "所有环境",
"Namespace.Role.GrantPublishTo": "发布权",
"Namespace.Role.GrantPublishTo2": "(可以发布配置)",
"Namespace.Role.Add": "添加",
"Namespace.Role.NoPermission": "您没有权限哟!",
"Namespace.Role.InitNamespacePermissionError": "初始化授权出错",
"Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错",
"Namespace.Role.GetGrantUserError": "加载授权用户出错",
"Namespace.Role.PleaseChooseUser": "请选择用户",
"Namespace.Role.Added": "添加成功",
"Namespace.Role.AddFailed": "添加失败",
"Namespace.Role.Deleted": "删除成功",
"Namespace.Role.DeleteFailed": "删除失败",
"Config.Sync.Title": "同步配置",
"Config.Sync.FistStep": "(第一步:选择同步信息)",
"Config.Sync.SecondStep": "(第二步:检查Diff)",
"Config.Sync.PreviousStep": "上一步",
"Config.Sync.NextStep": "下一步",
"Config.Sync.Sync": "同步",
"Config.Sync.Tips": "Tips",
"Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致",
"Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效",
"Config.Sync.SyncNamespace": "同步的Namespace",
"Config.Sync.SyncToCluster": "同步到哪个集群",
"Config.Sync.NeedToSyncItem": "需要同步的配置",
"Config.Sync.SortByLastModifyTime": "按最后更新时间过滤",
"Config.Sync.BeginTime": "开始时间",
"Config.Sync.EndTime": "结束时间",
"Config.Sync.Filter": "过滤",
"Config.Sync.Rest": "重置",
"Config.Sync.ItemKey": "Key",
"Config.Sync.ItemValue": "Value",
"Config.Sync.ItemCreateTime": "Create Time",
"Config.Sync.ItemUpdateTime": "Update Time",
"Config.Sync.NoNeedSyncItem": "没有更新的配置",
"Config.Sync.IgnoreSync": "忽略同步",
"Config.Sync.Step2Type": "Type",
"Config.Sync.Step2Key": "Key",
"Config.Sync.Step2SyncBefore": "同步前",
"Config.Sync.Step2SyncAfter": "同步后",
"Config.Sync.Step2Comment": "Comment",
"Config.Sync.Step2Operator": "操作",
"Config.Sync.NewAdd": "新增",
"Config.Sync.NoSyncItem": "不同步该配置",
"Config.Sync.Delete": "删除",
"Config.Sync.Update": "更新",
"Config.Sync.SyncSuccessfully": "同步成功!",
"Config.Sync.SyncFailed": "同步失败!",
"Config.Sync.LoadingItemsError": "加载配置出错",
"Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置",
"Config.Sync.PleaseChooseCluster": "请选择集群",
"Config.History.Title": "发布历史",
"Config.History.MasterVersionPublish": "主版本发布",
"Config.History.MasterVersionRollback": "主版本回滚",
"Config.History.GrayscaleOperator": "灰度操作",
"Config.History.PublishHistory": "发布历史",
"Config.History.OperationType0": "普通发布",
"Config.History.OperationType1": "回滚",
"Config.History.OperationType2": "灰度发布",
"Config.History.OperationType3": "更新灰度规则",
"Config.History.OperationType4": "灰度全量发布",
"Config.History.OperationType5": "灰度发布(主版本发布)",
"Config.History.OperationType6": "灰度发布(主版本回滚)",
"Config.History.OperationType7": "放弃灰度",
"Config.History.OperationType8": "删除灰度(全量发布)",
"Config.History.UrgentPublish": "紧急发布",
"Config.History.LoadMore": "加载更多",
"Config.History.Abandoned": "已废弃",
"Config.History.RollbackTo": "回滚到此版本",
"Config.History.RollbackToTips": "回滚已发布的配置到此版本",
"Config.History.ChangedItem": "变更的配置",
"Config.History.ChangedItemTips": "查看此次发布与上次版本的变更",
"Config.History.AllItem": "全部配置",
"Config.History.AllItemTips": "查看此次发布的所有配置信息",
"Config.History.ChangeType": "Type",
"Config.History.ChangeKey": "Key",
"Config.History.ChangeValue": "Value",
"Config.History.ChangeOldValue": "Old Value",
"Config.History.ChangeNewValue": "New Value",
"Config.History.ChangeTypeNew": "新增",
"Config.History.ChangeTypeModify": "修改",
"Config.History.ChangeTypeDelete": "删除",
"Config.History.NoChange": "无配置更改",
"Config.History.NoItem": "无配置",
"Config.History.GrayscaleRule": "灰度规则",
"Config.History.GrayscaleAppId": "灰度的AppId",
"Config.History.GrayscaleIp": "灰度的IP",
"Config.History.NoGrayscaleRule": "无灰度规则",
"Config.History.NoPermissionTips": "您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史",
"Config.History.NoPublishHistory": "无发布历史信息",
"Config.History.LoadingHistoryError": "无发布历史信息",
"Config.Diff.Title": "比较配置",
"Config.Diff.FirstStep": "(第一步:选择比较信息)",
"Config.Diff.SecondStep": "(第二步:查看差异配置)",
"Config.Diff.PreviousStep": "上一步",
"Config.Diff.NextStep": "下一步",
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
"Config.Diff.DiffCluster": "要比较的集群",
"Config.Diff.HasDiffComment": "是否比较注释",
"Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
"ConfigExport.Title": "配置导出",
"ConfigExport.TitleTips" : "超级管理员会下载所有项目的配置，普通用户只会下载自己项目的配置",
"ConfigExport.Download": "下载",
"App.CreateProject": "创建项目",
"App.AppIdTips": "（应用唯一标识）",
"App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.AppOwnerTips": "(开启项目管理员分配权限控制后，应用负责人和项目管理员默认为本账号，不可选择)",
"App.AppAdminTips1": "(应用负责人默认具有项目管理员权限，",
"App.AppAdminTips2": "项目管理员可以创建Namespace和集群、分配用户权限)",
"App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.Title": "项目管理",
"App.Setting.Admin": "管理员",
"App.Setting.AdminTips": "(项目管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理项目、Namespace权限)",
"App.Setting.Add": "添加",
"App.Setting.BasicInfo": "基本信息",
"App.Setting.ProjectName": "项目名称",
"App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)",
"App.Setting.ProjectOwner": "项目负责人",
"App.Setting.Modify": "修改项目信息",
"App.Setting.Cancel": "取消修改",
"App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限",
"App.Setting.DeleteAdmin": "删除管理员",
"App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员",
"App.Setting.PleaseChooseUser": "请选择用户",
"App.Setting.Added": "添加成功",
"App.Setting.AddFailed": "添加失败",
"App.Setting.Deleted": "删除成功",
"App.Setting.DeleteFailed": "删除失败",
"App.Setting.Modified": "修改成功",
"Valdr.App.AppId.Size": "AppId长度不能多于64个字符",
"Valdr.App.AppId.Required": "AppId不能为空",
"Valdr.App.appName.Size": "应用名称长度不能多于128个字符",
"Valdr.App.appName.Required": "应用名称不能为空",
"Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符",
"Valdr.Cluster.ClusterName.Required": "集群名称不能为空",
"Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符",
"Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空",
"Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符",
"Valdr.Item.Key.Size": "Key长度不能多于128个字符",
"Valdr.Item.Key.Required": "Key不能为空",
"Valdr.Item.Comment.Size": "备注长度不能多于256个字符",
"Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符",
"Valdr.Release.ReleaseName.Required": "Release Name不能为空",
"Valdr.Release.Comment.Size": "备注长度不能多于256个字符",
"ApolloConfirmDialog.DefaultConfirmBtnName": "确认",
"ApolloConfirmDialog.SearchPlaceHolder": "搜索项目(AppId、项目名)",
"RulesModal.ChooseInstances": "从实例列表中选择",
"RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'",
"RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空",
"RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则",
"RulesModal.IpListCanNotBeNull": "IP列表不能为空",
"ItemModal.KeyExists": "key='{{key}}' 已存在",
"ItemModal.AddedTips": "添加成功,如需生效请发布",
"ItemModal.AddFailed": "添加失败",
"ItemModal.PleaseChooseCluster": "请选择集群",
"ItemModal.ModifiedTips": "更新成功, 如需生效请发布",
"ItemModal.ModifyFailed": "更新失败",
"ItemModal.Tabs": "制表符",
"ItemModal.NewLine": "换行符",
"ItemModal.Space": "空格",
"ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错",
"ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错",
"ApolloNsPanel.Deleted": "删除成功",
"ApolloNsPanel.GrayscaleModified": "灰度规则更新成功",
"ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败",
"ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布",
"ApolloNsPanel.ModifyFailed": "更新失败",
"ApolloNsPanel.GrammarIsRight": "语法正确！",
"ReleaseModal.Published": "发布成功",
"ReleaseModal.PublishFailed": "发布失败",
"ReleaseModal.GrayscalePublished": "灰度发布成功",
"ReleaseModal.GrayscalePublishFailed": "灰度发布失败",
"ReleaseModal.AllPublished": "全量发布成功",
"ReleaseModal.AllPublishFailed": "全量发布失败",
"Rollback.NoRollbackList": "没有可以回滚的发布历史",
"Rollback.SameAsCurrentRelease": "该版本与当前版本相同",
"Rollback.RollbackSuccessfully": "回滚成功",
"Rollback.RollbackFailed": "回滚失败",
"Revoke.RevokeFailed": "撤销失败",
"Revoke.RevokeSuccessfully": "撤销成功"
}
| 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/valdr.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.
*
*/
app_module.config(appValdr);
setting_module.config(appValdr);
function appValdr(valdrProvider) {
valdrProvider.addConstraints({
'App': {
'appId': {
'size': {
'max': 64,
'message': 'Valdr.App.AppId.Size'
},
'required': {
'message': 'Valdr.App.AppId.Required'
}
},
'appName': {
'size': {
'max': 128,
'message': 'Valdr.App.appName.Size'
},
'required': {
'message': 'Valdr.App.appName.Required'
}
}
}
})
}
cluster_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'Cluster': {
'clusterName': {
'size': {
'max': 32,
'message': 'Valdr.Cluster.ClusterName.Size'
},
'required': {
'message': 'Valdr.Cluster.ClusterName.Required'
}
}
}
})
});
namespace_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'AppNamespace': {
'namespaceName': {
'size': {
'max': 32,
'message': 'Valdr.AppNamespace.NamespaceName.Size'
},
'required': {
'message': 'Valdr.AppNamespace.NamespaceName.Required'
}
},
'comment': {
'size': {
'max': 64,
'message': 'Valdr.AppNamespace.Comment.Size'
}
}
}
})
});
application_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'Item': {
'key': {
'size': {
'max': 128,
'message': 'Valdr.Item.Key.Size'
},
'required': {
'message': 'Valdr.Item.Key.Required'
}
},
'comment': {
'size': {
'max': 64,
'message': 'Valdr.Item.Comment.Size'
}
}
},
'Release': {
'releaseName': {
'size': {
'max': 64,
'message': 'Valdr.Release.ReleaseName.Size'
},
'required': {
'message': 'Valdr.Release.ReleaseName.Size'
}
},
'comment': {
'size': {
'max': 64,
'message': 'Valdr.Release.Comment.Size'
}
}
}
})
});
| /*
* 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.
*
*/
app_module.config(appValdr);
setting_module.config(appValdr);
function appValdr(valdrProvider) {
valdrProvider.addConstraints({
'App': {
'appId': {
'size': {
'max': 64,
'message': 'Valdr.App.AppId.Size'
},
'required': {
'message': 'Valdr.App.AppId.Required'
}
},
'appName': {
'size': {
'max': 128,
'message': 'Valdr.App.appName.Size'
},
'required': {
'message': 'Valdr.App.appName.Required'
}
}
}
})
}
cluster_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'Cluster': {
'clusterName': {
'size': {
'max': 32,
'message': 'Valdr.Cluster.ClusterName.Size'
},
'required': {
'message': 'Valdr.Cluster.ClusterName.Required'
}
}
}
})
});
namespace_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'AppNamespace': {
'namespaceName': {
'size': {
'max': 32,
'message': 'Valdr.AppNamespace.NamespaceName.Size'
},
'required': {
'message': 'Valdr.AppNamespace.NamespaceName.Required'
}
},
'comment': {
'size': {
'max': 64,
'message': 'Valdr.AppNamespace.Comment.Size'
}
}
}
})
});
application_module.config(function (valdrProvider) {
valdrProvider.addConstraints({
'Item': {
'key': {
'size': {
'max': 128,
'message': 'Valdr.Item.Key.Size'
},
'required': {
'message': 'Valdr.Item.Key.Required'
}
},
'comment': {
'size': {
'max': 256,
'message': 'Valdr.Item.Comment.Size'
}
}
},
'Release': {
'releaseName': {
'size': {
'max': 64,
'message': 'Valdr.Release.ReleaseName.Size'
},
'required': {
'message': 'Valdr.Release.ReleaseName.Size'
}
},
'comment': {
'size': {
'max': 256,
'message': 'Valdr.Release.Comment.Size'
}
}
}
})
});
| 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo-open-api-platform.md | ### 一、 什么是开放平台？
Apollo提供了一套的Http REST接口，使第三方应用能够自己管理配置。虽然Apollo系统本身提供了Portal来管理配置，但是在有些情景下，应用需要通过程序去管理配置。
### 二、 第三方应用接入Apollo开放平台
#### 2.1 注册第三方应用
第三方应用负责人需要向Apollo管理员提供一些第三方应用基本信息。
基本信息如下：
* 第三方应用的AppId、应用名、部门
* 第三方应用负责人
Apollo管理员在 http://{portal_address}/open/manage.html 创建第三方应用，创建之前最好先查询此AppId是否已经创建。创建成功之后会生成一个token，如下图所示：
#### 2.2 给已注册的第三方应用授权
第三方应用不应该能操作任何Namespace的配置，所以需要给token绑定可以操作的Namespace。Apollo管理员在 http://{portal_address}/open/manage.html 页面给token赋权。赋权之后，第三方应用就可以通过Apollo提供的Http REST接口来管理已授权的Namespace的配置了。
#### 2.3 第三方应用调用Apollo Open API
##### 2.3.1 调用Http REST接口
任何语言的第三方应用都可以调用Apollo的Open API，在调用接口时，需要设置注意以下两点：
* Http Header中增加一个Authorization字段，字段值为申请的token
* Http Header的Content-Type字段需要设置成application/json;charset=UTF-8
##### 2.3.2 Java应用通过apollo-openapi调用Apollo Open API
从1.1.0版本开始，Apollo提供了[apollo-openapi](https://github.com/ctripcorp/apollo/tree/master/apollo-openapi)客户端，所以Java语言的第三方应用可以更方便地调用Apollo Open API。
首先引入`apollo-openapi`依赖：
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>1.7.0</version>
</dependency>
```
在程序中构造`ApolloOpenApiClient`：
```java
String portalUrl = "http://localhost:8070"; // portal url
String token = "e16e5cd903fd0c97a116c873b448544b9d086de9"; // 申请的token
ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder()
.withPortalUrl(portalUrl)
.withToken(token)
.build();
```
后续就可以通过`ApolloOpenApiClient`的接口直接操作Apollo Open API了，接口说明参见下面的Rest接口文档。
##### 2.3.3 .Net core应用调用Apollo Open API
.Net core也提供了open api的客户端，详见https://github.com/ctripcorp/apollo.net/pull/77
### 三、 接口文档
#### 3.1 URL路径参数说明
参数名 | 参数说明
--- | ---
env | 所管理的配置环境
appId | 所管理的配置AppId
clusterName | 所管理的配置集群名， 一般情况下传入 default 即可。如果是特殊集群，传入相应集群的名称即可
namespaceName | 所管理的Namespace的名称，如果是非properties格式，需要加上后缀名，如`sample.yml`
#### 3.2 API接口列表
##### 3.2.1 获取App的环境，集群信息
* **URL** : http://{portal_address}/openapi/v1/apps/{appId}/envclusters
* **Method** : GET
* **Request Params** : 无
* **返回值Sample**：
``` json
[
{
"env":"FAT",
"clusters":[ //集群列表
"default",
"FAT381"
]
},
{
"env":"UAT",
"clusters":[
"default"
]
},
{
"env":"PRO",
"clusters":[
"default",
"SHAOY",
"SHAJQ"
]
}
]
```
##### 3.2.2 获取App信息
* **URL** : http://{portal_address}/openapi/v1/apps
* **Method** : GET
* **Request Params** :
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
appIds | false | String | appId列表，以逗号分隔，如果为空则返回所有App信息
* **返回值Sample**：
``` json
[
{
"name":"first_app",
"appId":"100003171",
"orgId":"development",
"orgName":"研发部",
"ownerName":"apollo",
"ownerEmail":"test@test.com",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2019-05-08T09:13:31.000+0800",
"dataChangeLastModifiedTime":"2019-05-08T09:13:31.000+0800"
},
{
"name":"apollo-demo",
"appId":"100004458",
"orgId":"development",
"orgName":"产品研发部",
"ownerName":"apollo",
"ownerEmail":"apollo@cmcm.com",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2019-04-08T13:58:36.000+0800"
}
]
```
##### 3.2.3 获取集群接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample**：
``` json
{
"name":"default",
"appId":"100004458",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800"
}
```
##### 3.2.4 创建集群接口
可以通过此接口创建集群，调用此接口需要授予第三方APP对目标APP的管理权限。
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
name | true | String | Cluster的名字
appId | true | String | Cluster所属的AppId
dataChangeCreatedBy | true | String | namespace的创建人，格式为域账号，也就是sso系统的User ID
* **返回值 Sample** ：
``` json
{
"name":"someClusterName",
"appId":"100004458",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800"
}
```
##### 3.2.5 获取集群下所有Namespace信息接口
* **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces
* **Method**: GET
* **Request Params**: 无
* **返回值Sample**:
``` json
[
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "application",
"comment": "default app namespace",
"format": "properties", //Namespace格式可能取值为：properties、xml、json、yml、yaml
"isPublic": false, //是否为公共的Namespace
"items": [ // Namespace下所有的配置集合
{
"key": "batch",
"value": "100",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800",
"dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800"
},
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "FX.apollo",
"comment": "apollo public namespace",
"format": "properties",
"isPublic": true,
"items": [
{
"key": "request.timeout",
"value": "3000",
"comment": "",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:08:30.000+0800",
"dataChangeLastModifiedTime": "2016-08-01T13:56:25.000+0800"
},
{
"id": 1116,
"key": "batch",
"value": "3000",
"comment": "",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-28T15:13:42.000+0800",
"dataChangeLastModifiedTime": "2016-08-01T13:51:00.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:08:13.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:08:13.000+0800"
}
]
```
##### 3.2.6 获取某个Namespace信息接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "application",
"comment": "default app namespace",
"format": "properties", //Namespace格式可能取值为：properties、xml、json、yml、yaml
"isPublic": false, //是否为公共的Namespace
"items": [ // Namespace下所有的配置集合
{
"key": "batch",
"value": "100",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800",
"dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800"
}
```
##### 3.2.7 创建Namespace
可以通过此接口创建Namespace，调用此接口需要授予第三方APP对目标APP的管理权限。
* **URL** ： http://{portal_address}/openapi/v1/apps/{appId}/appnamespaces
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
name | true | String | Namespace的名字
appId | true | String | Namespace所属的AppId
format |true | String | Namespace的格式，**只能是以下类型： properties、xml、json、yml、yaml**
isPublic |true | boolean | 是否是公共文件
comment |false | String | Namespace说明
dataChangeCreatedBy | true | String | namespace的创建人，格式为域账号，也就是sso系统的User ID
* **返回值 Sample** ：
``` json
{
"name": "FX.public-0420-11",
"appId": "100003173",
"format": "properties",
"isPublic": true,
"comment": "test",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2017-04-20T18:25:49.033+0800",
"dataChangeLastModifiedTime": "2017-04-20T18:25:49.033+0800"
}
```
* **返回值说明** ：
> 如果是properties文件，name = ${appId所属的部门}.${传入的name值} ，例如调用接口传入的name=xy-z, format=properties，应用的部门为框架（FX）,那么name=FX.xy-z
> 如果不是properties文件 name = ${appId所属的部门}.${传入的name值}.${format}，例如调用接口传入的name=xy-z, format=json，应用的部门为框架（FX）,那么name=FX.xy-z.json
##### 3.2.8 获取某个Namespace当前编辑人接口
Apollo在生产环境（PRO）有限制规则：每次发布只能有一个人编辑配置，且该次发布的人不能是该次发布的编辑人。
也就是说如果一个用户A修改了某个namespace的配置，那么在这个namespace发布前，只能由A修改，其它用户无法修改。同时，该用户A无法发布自己修改的配置，必须找另一个有发布权限的人操作。
这个接口就是用来获取当前namespace是否有人锁定的接口。在非生产环境（FAT、UAT），该接口始终返回没有人锁定。
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock
* **Method** ： GET
* **Request Params** ：无
* **返回值 Sample（未锁定）** ：
``` json
{
"namespaceName": "application",
"isLocked": false
}
```
* **返回值Sample(被锁定)** ：
``` json
{
"namespaceName": "application",
"isLocked": true,
"lockedBy": "song_s" //锁owner
}
```
##### 3.2.9 读取配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"key": "timeout",
"value": "3000",
"comment": "超时时间",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800",
"dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800"
}
```
##### 3.2.10 新增配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
key | true | String | 配置的key，长度不能超过128个字符。非properties格式，key固定为`content`
value | true | String | 配置的value，长度不能超过20000个字符，非properties格式，value为文件全部内容
comment | false | String | 配置的备注,长度不能超过1024个字符
dataChangeCreatedBy | true | String | item的创建人，格式为域账号，也就是sso系统的User ID
* **Request body sample** :
``` json
{
"key":"timeout",
"value":"3000",
"comment":"超时时间",
"dataChangeCreatedBy":"zhanglea"
}
```
* **返回值Sample** ：
``` json
{
"key": "timeout",
"value": "3000",
"comment": "超时时间",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800",
"dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800"
}
```
##### 3.2.11 修改配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}
* **Method** ： PUT
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
createIfNotExists | false | Boolean | 当配置不存在时是否自动创建
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
key | true | String | 配置的key，需和url中的key值一致。非properties格式，key固定为`content`
value | true | String | 配置的value，长度不能超过20000个字符，非properties格式，value为文件全部内容
comment | false | String | 配置的备注,长度不能超过1024个字符
dataChangeLastModifiedBy | true | String | item的修改人，格式为域账号，也就是sso系统的User ID
dataChangeCreatedBy | false | String | 当createIfNotExists为true时必选。item的创建人，格式为域账号，也就是sso系统的User ID
* **Request body sample** :
```json
{
"key":"timeout",
"value":"3000",
"comment":"超时时间",
"dataChangeLastModifiedBy":"zhanglea"
}
```
* **返回值** ：无
##### 3.2.12 删除配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}?operator={operator}
* **Method** ： DELETE
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
key | true | String | 配置的key。非properties格式，key固定为`content`
operator | true | String | 删除配置的操作者，域账号
* **返回值** ： 无
##### 3.2.13 发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases
* **Method** ： POST
* **Request Params** ：无
* **Request Body** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
releaseTitle | true | String | 此次发布的标题，长度不能超过64个字符
releaseComment | false | String | 发布的备注，长度不能超过256个字符
releasedBy | true | String | 发布人，域账号，注意：如果`ApolloConfigDB.ServerConfig`中的`namespace.lock.switch`设置为true的话（默认是false），那么该环境不允许发布人和编辑人为同一人。所以如果编辑人是zhanglea，发布人就不能再是zhanglea。
* **Request Body example** ：
```json
{
"releaseTitle":"2016-08-11",
"releaseComment":"修改timeout值",
"releasedBy":"zhanglea"
}
```
* **返回值Sample** ：
``` json
{
"appId": "test-0620-01",
"clusterName": "test",
"namespaceName": "application",
"name": "2016-08-11",
"configurations": {
"timeout": "3000",
},
"comment": "修改timeout值",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800",
"dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800"
}
```
##### 3.2.14 获取某个Namespace当前生效的已发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"appId": "test-0620-01",
"clusterName": "test",
"namespaceName": "application",
"name": "2016-08-11",
"configurations": {
"timeout": "3000",
},
"comment": "修改timeout值",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800",
"dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800"
}
```
##### 3.2.15 回滚已发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/releases/{releaseId}/rollback
* **Method** ： PUT
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
operator | true | String | 删除配置的操作者，域账号
* **返回值** ： 无
### 四、错误码说明
正常情况下，接口返回的Http状态码是200，下面列举了Apollo会返回的非200错误码说明。
#### 4.1 400 - Bad Request
客户端传入参数的错误，如操作人不存在，namespace不存在等等，客户端需要根据提示信息检查对应的参数是否正确。
#### 4.2 401 - Unauthorized
接口传入的token非法或者已过期，客户端需要检查token是否传入正确。
#### 4.3 403 - Forbidden
接口要访问的资源未得到授权，比如只授权了对A应用下Namespace的管理权限，但是却尝试管理B应用下的配置。
#### 4.4 404 - Not Found
接口要访问的资源不存在，一般是URL或URL的参数错误。
#### 4.5 405 - Method Not Allowed
接口访问的Method不正确，比如应该使用POST的接口使用了GET访问等，客户端需要检查接口访问方式是否正确。
#### 4.6 500 - Internal Server Error
其它类型的错误默认都会返回500，对这类错误如果应用无法根据提示信息找到原因的话，可以找Apollo研发团队一起排查问题。
| ### 一、 什么是开放平台？
Apollo提供了一套的Http REST接口，使第三方应用能够自己管理配置。虽然Apollo系统本身提供了Portal来管理配置，但是在有些情景下，应用需要通过程序去管理配置。
### 二、 第三方应用接入Apollo开放平台
#### 2.1 注册第三方应用
第三方应用负责人需要向Apollo管理员提供一些第三方应用基本信息。
基本信息如下：
* 第三方应用的AppId、应用名、部门
* 第三方应用负责人
Apollo管理员在 http://{portal_address}/open/manage.html 创建第三方应用，创建之前最好先查询此AppId是否已经创建。创建成功之后会生成一个token，如下图所示：
#### 2.2 给已注册的第三方应用授权
第三方应用不应该能操作任何Namespace的配置，所以需要给token绑定可以操作的Namespace。Apollo管理员在 http://{portal_address}/open/manage.html 页面给token赋权。赋权之后，第三方应用就可以通过Apollo提供的Http REST接口来管理已授权的Namespace的配置了。
#### 2.3 第三方应用调用Apollo Open API
##### 2.3.1 调用Http REST接口
任何语言的第三方应用都可以调用Apollo的Open API，在调用接口时，需要设置注意以下两点：
* Http Header中增加一个Authorization字段，字段值为申请的token
* Http Header的Content-Type字段需要设置成application/json;charset=UTF-8
##### 2.3.2 Java应用通过apollo-openapi调用Apollo Open API
从1.1.0版本开始，Apollo提供了[apollo-openapi](https://github.com/ctripcorp/apollo/tree/master/apollo-openapi)客户端，所以Java语言的第三方应用可以更方便地调用Apollo Open API。
首先引入`apollo-openapi`依赖：
```xml
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>1.7.0</version>
</dependency>
```
在程序中构造`ApolloOpenApiClient`：
```java
String portalUrl = "http://localhost:8070"; // portal url
String token = "e16e5cd903fd0c97a116c873b448544b9d086de9"; // 申请的token
ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder()
.withPortalUrl(portalUrl)
.withToken(token)
.build();
```
后续就可以通过`ApolloOpenApiClient`的接口直接操作Apollo Open API了，接口说明参见下面的Rest接口文档。
##### 2.3.3 .Net core应用调用Apollo Open API
.Net core也提供了open api的客户端，详见https://github.com/ctripcorp/apollo.net/pull/77
### 三、 接口文档
#### 3.1 URL路径参数说明
参数名 | 参数说明
--- | ---
env | 所管理的配置环境
appId | 所管理的配置AppId
clusterName | 所管理的配置集群名， 一般情况下传入 default 即可。如果是特殊集群，传入相应集群的名称即可
namespaceName | 所管理的Namespace的名称，如果是非properties格式，需要加上后缀名，如`sample.yml`
#### 3.2 API接口列表
##### 3.2.1 获取App的环境，集群信息
* **URL** : http://{portal_address}/openapi/v1/apps/{appId}/envclusters
* **Method** : GET
* **Request Params** : 无
* **返回值Sample**：
``` json
[
{
"env":"FAT",
"clusters":[ //集群列表
"default",
"FAT381"
]
},
{
"env":"UAT",
"clusters":[
"default"
]
},
{
"env":"PRO",
"clusters":[
"default",
"SHAOY",
"SHAJQ"
]
}
]
```
##### 3.2.2 获取App信息
* **URL** : http://{portal_address}/openapi/v1/apps
* **Method** : GET
* **Request Params** :
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
appIds | false | String | appId列表，以逗号分隔，如果为空则返回所有App信息
* **返回值Sample**：
``` json
[
{
"name":"first_app",
"appId":"100003171",
"orgId":"development",
"orgName":"研发部",
"ownerName":"apollo",
"ownerEmail":"test@test.com",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2019-05-08T09:13:31.000+0800",
"dataChangeLastModifiedTime":"2019-05-08T09:13:31.000+0800"
},
{
"name":"apollo-demo",
"appId":"100004458",
"orgId":"development",
"orgName":"产品研发部",
"ownerName":"apollo",
"ownerEmail":"apollo@cmcm.com",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2019-04-08T13:58:36.000+0800"
}
]
```
##### 3.2.3 获取集群接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample**：
``` json
{
"name":"default",
"appId":"100004458",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800"
}
```
##### 3.2.4 创建集群接口
可以通过此接口创建集群，调用此接口需要授予第三方APP对目标APP的管理权限。
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
name | true | String | Cluster的名字
appId | true | String | Cluster所属的AppId
dataChangeCreatedBy | true | String | namespace的创建人，格式为域账号，也就是sso系统的User ID
* **返回值 Sample** ：
``` json
{
"name":"someClusterName",
"appId":"100004458",
"dataChangeCreatedBy":"apollo",
"dataChangeLastModifiedBy":"apollo",
"dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800",
"dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800"
}
```
##### 3.2.5 获取集群下所有Namespace信息接口
* **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces
* **Method**: GET
* **Request Params**: 无
* **返回值Sample**:
``` json
[
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "application",
"comment": "default app namespace",
"format": "properties", //Namespace格式可能取值为：properties、xml、json、yml、yaml
"isPublic": false, //是否为公共的Namespace
"items": [ // Namespace下所有的配置集合
{
"key": "batch",
"value": "100",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800",
"dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800"
},
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "FX.apollo",
"comment": "apollo public namespace",
"format": "properties",
"isPublic": true,
"items": [
{
"key": "request.timeout",
"value": "3000",
"comment": "",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:08:30.000+0800",
"dataChangeLastModifiedTime": "2016-08-01T13:56:25.000+0800"
},
{
"id": 1116,
"key": "batch",
"value": "3000",
"comment": "",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-28T15:13:42.000+0800",
"dataChangeLastModifiedTime": "2016-08-01T13:51:00.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:08:13.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:08:13.000+0800"
}
]
```
##### 3.2.6 获取某个Namespace信息接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"appId": "100003171",
"clusterName": "default",
"namespaceName": "application",
"comment": "default app namespace",
"format": "properties", //Namespace格式可能取值为：properties、xml、json、yml、yaml
"isPublic": false, //是否为公共的Namespace
"items": [ // Namespace下所有的配置集合
{
"key": "batch",
"value": "100",
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800",
"dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800"
}
],
"dataChangeCreatedBy": "song_s",
"dataChangeLastModifiedBy": "song_s",
"dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800",
"dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800"
}
```
##### 3.2.7 创建Namespace
可以通过此接口创建Namespace，调用此接口需要授予第三方APP对目标APP的管理权限。
* **URL** ： http://{portal_address}/openapi/v1/apps/{appId}/appnamespaces
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
name | true | String | Namespace的名字
appId | true | String | Namespace所属的AppId
format |true | String | Namespace的格式，**只能是以下类型： properties、xml、json、yml、yaml**
isPublic |true | boolean | 是否是公共文件
comment |false | String | Namespace说明
dataChangeCreatedBy | true | String | namespace的创建人，格式为域账号，也就是sso系统的User ID
* **返回值 Sample** ：
``` json
{
"name": "FX.public-0420-11",
"appId": "100003173",
"format": "properties",
"isPublic": true,
"comment": "test",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2017-04-20T18:25:49.033+0800",
"dataChangeLastModifiedTime": "2017-04-20T18:25:49.033+0800"
}
```
* **返回值说明** ：
> 如果是properties文件，name = ${appId所属的部门}.${传入的name值} ，例如调用接口传入的name=xy-z, format=properties，应用的部门为框架（FX）,那么name=FX.xy-z
> 如果不是properties文件 name = ${appId所属的部门}.${传入的name值}.${format}，例如调用接口传入的name=xy-z, format=json，应用的部门为框架（FX）,那么name=FX.xy-z.json
##### 3.2.8 获取某个Namespace当前编辑人接口
Apollo在生产环境（PRO）有限制规则：每次发布只能有一个人编辑配置，且该次发布的人不能是该次发布的编辑人。
也就是说如果一个用户A修改了某个namespace的配置，那么在这个namespace发布前，只能由A修改，其它用户无法修改。同时，该用户A无法发布自己修改的配置，必须找另一个有发布权限的人操作。
这个接口就是用来获取当前namespace是否有人锁定的接口。在非生产环境（FAT、UAT），该接口始终返回没有人锁定。
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock
* **Method** ： GET
* **Request Params** ：无
* **返回值 Sample（未锁定）** ：
``` json
{
"namespaceName": "application",
"isLocked": false
}
```
* **返回值Sample(被锁定)** ：
``` json
{
"namespaceName": "application",
"isLocked": true,
"lockedBy": "song_s" //锁owner
}
```
##### 3.2.9 读取配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"key": "timeout",
"value": "3000",
"comment": "超时时间",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800",
"dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800"
}
```
##### 3.2.10 新增配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items
* **Method** ： POST
* **Request Params** ：无
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
key | true | String | 配置的key，长度不能超过128个字符。非properties格式，key固定为`content`
value | true | String | 配置的value，长度不能超过20000个字符，非properties格式，value为文件全部内容
comment | false | String | 配置的备注,长度不能超过256个字符
dataChangeCreatedBy | true | String | item的创建人，格式为域账号，也就是sso系统的User ID
* **Request body sample** :
``` json
{
"key":"timeout",
"value":"3000",
"comment":"超时时间",
"dataChangeCreatedBy":"zhanglea"
}
```
* **返回值Sample** ：
``` json
{
"key": "timeout",
"value": "3000",
"comment": "超时时间",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800",
"dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800"
}
```
##### 3.2.11 修改配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}
* **Method** ： PUT
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
createIfNotExists | false | Boolean | 当配置不存在时是否自动创建
* **请求内容(Request Body, JSON格式)** ：
参数名 | 必选 | 类型 | 说明
---- | --- | --- | ---
key | true | String | 配置的key，需和url中的key值一致。非properties格式，key固定为`content`
value | true | String | 配置的value，长度不能超过20000个字符，非properties格式，value为文件全部内容
comment | false | String | 配置的备注,长度不能超过256个字符
dataChangeLastModifiedBy | true | String | item的修改人，格式为域账号，也就是sso系统的User ID
dataChangeCreatedBy | false | String | 当createIfNotExists为true时必选。item的创建人，格式为域账号，也就是sso系统的User ID
* **Request body sample** :
```json
{
"key":"timeout",
"value":"3000",
"comment":"超时时间",
"dataChangeLastModifiedBy":"zhanglea"
}
```
* **返回值** ：无
##### 3.2.12 删除配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}?operator={operator}
* **Method** ： DELETE
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
key | true | String | 配置的key。非properties格式，key固定为`content`
operator | true | String | 删除配置的操作者，域账号
* **返回值** ： 无
##### 3.2.13 发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases
* **Method** ： POST
* **Request Params** ：无
* **Request Body** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
releaseTitle | true | String | 此次发布的标题，长度不能超过64个字符
releaseComment | false | String | 发布的备注，长度不能超过256个字符
releasedBy | true | String | 发布人，域账号，注意：如果`ApolloConfigDB.ServerConfig`中的`namespace.lock.switch`设置为true的话（默认是false），那么该环境不允许发布人和编辑人为同一人。所以如果编辑人是zhanglea，发布人就不能再是zhanglea。
* **Request Body example** ：
```json
{
"releaseTitle":"2016-08-11",
"releaseComment":"修改timeout值",
"releasedBy":"zhanglea"
}
```
* **返回值Sample** ：
``` json
{
"appId": "test-0620-01",
"clusterName": "test",
"namespaceName": "application",
"name": "2016-08-11",
"configurations": {
"timeout": "3000",
},
"comment": "修改timeout值",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800",
"dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800"
}
```
##### 3.2.14 获取某个Namespace当前生效的已发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest
* **Method** ： GET
* **Request Params** ：无
* **返回值Sample** ：
``` json
{
"appId": "test-0620-01",
"clusterName": "test",
"namespaceName": "application",
"name": "2016-08-11",
"configurations": {
"timeout": "3000",
},
"comment": "修改timeout值",
"dataChangeCreatedBy": "zhanglea",
"dataChangeLastModifiedBy": "zhanglea",
"dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800",
"dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800"
}
```
##### 3.2.15 回滚已发布配置接口
* **URL** ： http://{portal_address}/openapi/v1/envs/{env}/releases/{releaseId}/rollback
* **Method** ： PUT
* **Request Params** ：
参数名 | 必选 | 类型 | 说明
--- | --- | --- | ---
operator | true | String | 删除配置的操作者，域账号
* **返回值** ： 无
### 四、错误码说明
正常情况下，接口返回的Http状态码是200，下面列举了Apollo会返回的非200错误码说明。
#### 4.1 400 - Bad Request
客户端传入参数的错误，如操作人不存在，namespace不存在等等，客户端需要根据提示信息检查对应的参数是否正确。
#### 4.2 401 - Unauthorized
接口传入的token非法或者已过期，客户端需要检查token是否传入正确。
#### 4.3 403 - Forbidden
接口要访问的资源未得到授权，比如只授权了对A应用下Namespace的管理权限，但是却尝试管理B应用下的配置。
#### 4.4 404 - Not Found
接口要访问的资源不存在，一般是URL或URL的参数错误。
#### 4.5 405 - Method Not Allowed
接口访问的Method不正确，比如应该使用POST的接口使用了GET访问等，客户端需要检查接口访问方式是否正确。
#### 4.6 500 - Internal Server Error
其它类型的错误默认都会返回500，对这类错误如果应用无法根据提示信息找到原因的话，可以找Apollo研发团队一起排查问题。
| 1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/AppUtils.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.
*
*/
appUtil.service('AppUtil', ['toastr', '$window', '$q', '$translate', 'prefixLocation', function (toastr, $window, $q, $translate, prefixLocation) {
function parseErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
var msg = "Code:" + response.status;
if (response.data.message != null) {
msg += " Msg:" + response.data.message;
}
return msg;
}
function parsePureErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
if (response.data.message != null) {
return response.data.message;
}
return "";
}
function ajax(resource, requestParams, requestBody) {
var d = $q.defer();
if (requestBody) {
resource(requestParams, requestBody, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
} else {
resource(requestParams, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
}
return d.promise;
}
return {
prefixPath: function(){
return prefixLocation;
},
errorMsg: parseErrorMsg,
pureErrorMsg: parsePureErrorMsg,
ajax: ajax,
showErrorMsg: function (response, title) {
toastr.error(parseErrorMsg(response), title);
},
parseParams: function (query, notJumpToHomePage) {
if (!query) {
//如果不传这个参数或者false则返回到首页(参数出错)
if (!notJumpToHomePage) {
$window.location.href = prefixLocation + '/index.html';
} else {
return {};
}
}
if (query.indexOf('/') == 0) {
query = query.substring(1, query.length);
}
var anchorIndex = query.indexOf('#');
if (anchorIndex >= 0) {
query = query.substring(0, anchorIndex);
}
var params = query.split("&");
var result = {};
params.forEach(function (param) {
var kv = param.split("=");
result[kv[0]] = decodeURIComponent(kv[1]);
});
return result;
},
collectData: function (response) {
var data = [];
response.entities.forEach(function (entity) {
if (entity.code == 200) {
data.push(entity.body);
} else {
toastr.warning(entity.message);
}
});
return data;
},
showModal: function (modal) {
$(modal).modal("show");
},
hideModal: function (modal) {
$(modal).modal("hide");
},
checkIPV4: function (ip) {
return /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(ip);
}
}
}]);
| /*
* 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.
*
*/
appUtil.service('AppUtil', ['toastr', '$window', '$q', '$translate', 'prefixLocation', function (toastr, $window, $q, $translate, prefixLocation) {
function parseErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
var msg = "Code:" + response.status;
if (response.data.message != null) {
msg += " Msg:" + response.data.message;
}
return msg;
}
function parsePureErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
if (response.data.message != null) {
return response.data.message;
}
return "";
}
function ajax(resource, requestParams, requestBody) {
var d = $q.defer();
if (requestBody) {
resource(requestParams, requestBody, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
} else {
resource(requestParams, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
}
return d.promise;
}
return {
prefixPath: function(){
return prefixLocation;
},
errorMsg: parseErrorMsg,
pureErrorMsg: parsePureErrorMsg,
ajax: ajax,
showErrorMsg: function (response, title) {
toastr.error(parseErrorMsg(response), title);
},
parseParams: function (query, notJumpToHomePage) {
if (!query) {
//如果不传这个参数或者false则返回到首页(参数出错)
if (!notJumpToHomePage) {
$window.location.href = prefixLocation + '/index.html';
} else {
return {};
}
}
if (query.indexOf('/') == 0) {
query = query.substring(1, query.length);
}
var anchorIndex = query.indexOf('#');
if (anchorIndex >= 0) {
query = query.substring(0, anchorIndex);
}
var params = query.split("&");
var result = {};
params.forEach(function (param) {
var kv = param.split("=");
result[kv[0]] = decodeURIComponent(kv[1]);
});
return result;
},
collectData: function (response) {
var data = [];
response.entities.forEach(function (entity) {
if (entity.code == 200) {
data.push(entity.body);
} else {
toastr.warning(entity.message);
}
});
return data;
},
showModal: function (modal) {
$(modal).modal("show");
},
hideModal: function (modal) {
$(modal).modal("hide");
},
checkIPV4: function (ip) {
return /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(ip);
}
}
}]);
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/NamespacePublishInfoTest.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.service;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.Collections;
import java.util.Map;
import java.util.Random;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.when;
public class NamespacePublishInfoTest extends AbstractUnitTest {
@Mock
private ClusterService clusterService;
@Mock
private ReleaseService releaseService;
@Mock
private ItemService itemService;
@Mock
private NamespaceRepository namespaceRepository;
@InjectMocks
private NamespaceService namespaceService;
private String testApp = "testApp";
@Test
public void testNamespaceNotEverPublishedButHasItems() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(itemService.findLastOne(anyLong())).thenReturn(item);
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertTrue(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
@Test
public void testNamespaceEverPublishedAndNotModifiedAfter() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
Release release = createRelease("{\"a\":\"b\"}");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(releaseService.findLatestActiveRelease(namespace)).thenReturn(release);
when(itemService.findItemsModifiedAfterDate(anyLong(), any())).thenReturn(Collections.singletonList(item));
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertFalse(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
@Test
public void testNamespaceEverPublishedAndModifiedAfter() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
Release release = createRelease("{\"a\":\"c\"}");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(releaseService.findLatestActiveRelease(namespace)).thenReturn(release);
when(itemService.findItemsModifiedAfterDate(anyLong(), any())).thenReturn(Collections.singletonList(item));
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertTrue(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
private Cluster createCluster(String clusterName) {
Cluster cluster = new Cluster();
cluster.setAppId(testApp);
cluster.setName(clusterName);
cluster.setParentClusterId(0);
return cluster;
}
private Namespace createNamespace(String clusterName, String namespaceName) {
Namespace namespace = new Namespace();
namespace.setAppId(testApp);
namespace.setClusterName(clusterName);
namespace.setNamespaceName(namespaceName);
namespace.setId(new Random().nextLong());
return namespace;
}
private Item createItem(long namespaceId, String key, String value) {
Item item = new Item();
item.setNamespaceId(namespaceId);
item.setKey(key);
item.setValue(value);
return item;
}
private Release createRelease(String configuration) {
Release release = new Release();
release.setConfigurations(configuration);
return release;
}
}
| /*
* 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.service;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.Collections;
import java.util.Map;
import java.util.Random;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.when;
public class NamespacePublishInfoTest extends AbstractUnitTest {
@Mock
private ClusterService clusterService;
@Mock
private ReleaseService releaseService;
@Mock
private ItemService itemService;
@Mock
private NamespaceRepository namespaceRepository;
@InjectMocks
private NamespaceService namespaceService;
private String testApp = "testApp";
@Test
public void testNamespaceNotEverPublishedButHasItems() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(itemService.findLastOne(anyLong())).thenReturn(item);
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertTrue(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
@Test
public void testNamespaceEverPublishedAndNotModifiedAfter() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
Release release = createRelease("{\"a\":\"b\"}");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(releaseService.findLatestActiveRelease(namespace)).thenReturn(release);
when(itemService.findItemsModifiedAfterDate(anyLong(), any())).thenReturn(Collections.singletonList(item));
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertFalse(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
@Test
public void testNamespaceEverPublishedAndModifiedAfter() {
Cluster cluster = createCluster(ConfigConsts.CLUSTER_NAME_DEFAULT);
Namespace namespace = createNamespace(ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION);
Item item = createItem(namespace.getId(), "a", "b");
Release release = createRelease("{\"a\":\"c\"}");
when(clusterService.findParentClusters(testApp)).thenReturn(Collections.singletonList(cluster));
when(namespaceRepository.findByAppIdAndClusterNameOrderByIdAsc(testApp, ConfigConsts.CLUSTER_NAME_DEFAULT))
.thenReturn(Collections.singletonList(namespace));
when(releaseService.findLatestActiveRelease(namespace)).thenReturn(release);
when(itemService.findItemsModifiedAfterDate(anyLong(), any())).thenReturn(Collections.singletonList(item));
Map<String, Boolean> result = namespaceService.namespacePublishInfo(testApp);
Assert.assertEquals(1, result.size());
Assert.assertTrue(result.get(ConfigConsts.CLUSTER_NAME_DEFAULT));
}
private Cluster createCluster(String clusterName) {
Cluster cluster = new Cluster();
cluster.setAppId(testApp);
cluster.setName(clusterName);
cluster.setParentClusterId(0);
return cluster;
}
private Namespace createNamespace(String clusterName, String namespaceName) {
Namespace namespace = new Namespace();
namespace.setAppId(testApp);
namespace.setClusterName(clusterName);
namespace.setNamespaceName(namespaceName);
namespace.setId(new Random().nextLong());
return namespace;
}
private Item createItem(long namespaceId, String key, String value) {
Item item = new Item();
item.setNamespaceId(namespaceId);
item.setKey(key);
item.setValue(value);
return item;
}
private Release createRelease(String configuration) {
Release release = new Release();
release.setConfigurations(configuration);
return release;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/SpringValueRegistry.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.core.utils.ApolloThreadFactory;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.Multimaps;
import org.springframework.beans.factory.BeanFactory;
public class SpringValueRegistry {
private static final long CLEAN_INTERVAL_IN_SECONDS = 5;
private final Map<BeanFactory, Multimap<String, SpringValue>> registry = Maps.newConcurrentMap();
private final AtomicBoolean initialized = new AtomicBoolean(false);
private final Object LOCK = new Object();
public void register(BeanFactory beanFactory, String key, SpringValue springValue) {
if (!registry.containsKey(beanFactory)) {
synchronized (LOCK) {
if (!registry.containsKey(beanFactory)) {
registry.put(beanFactory, Multimaps.synchronizedListMultimap(LinkedListMultimap.<String, SpringValue>create()));
}
}
}
registry.get(beanFactory).put(key, springValue);
// lazy initialize
if (initialized.compareAndSet(false, true)) {
initialize();
}
}
public Collection<SpringValue> get(BeanFactory beanFactory, String key) {
Multimap<String, SpringValue> beanFactorySpringValues = registry.get(beanFactory);
if (beanFactorySpringValues == null) {
return null;
}
return beanFactorySpringValues.get(key);
}
private void initialize() {
Executors.newSingleThreadScheduledExecutor(ApolloThreadFactory.create("SpringValueRegistry", true)).scheduleAtFixedRate(
new Runnable() {
@Override
public void run() {
try {
scanAndClean();
} catch (Throwable ex) {
ex.printStackTrace();
}
}
}, CLEAN_INTERVAL_IN_SECONDS, CLEAN_INTERVAL_IN_SECONDS, TimeUnit.SECONDS);
}
private void scanAndClean() {
Iterator<Multimap<String, SpringValue>> iterator = registry.values().iterator();
while (!Thread.currentThread().isInterrupted() && iterator.hasNext()) {
Multimap<String, SpringValue> springValues = iterator.next();
Iterator<Entry<String, SpringValue>> springValueIterator = springValues.entries().iterator();
while (springValueIterator.hasNext()) {
Entry<String, SpringValue> springValue = springValueIterator.next();
if (!springValue.getValue().isTargetBeanValid()) {
// clear unused spring values
springValueIterator.remove();
}
}
}
}
}
| /*
* 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.core.utils.ApolloThreadFactory;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.Multimaps;
import org.springframework.beans.factory.BeanFactory;
public class SpringValueRegistry {
private static final long CLEAN_INTERVAL_IN_SECONDS = 5;
private final Map<BeanFactory, Multimap<String, SpringValue>> registry = Maps.newConcurrentMap();
private final AtomicBoolean initialized = new AtomicBoolean(false);
private final Object LOCK = new Object();
public void register(BeanFactory beanFactory, String key, SpringValue springValue) {
if (!registry.containsKey(beanFactory)) {
synchronized (LOCK) {
if (!registry.containsKey(beanFactory)) {
registry.put(beanFactory, Multimaps.synchronizedListMultimap(LinkedListMultimap.<String, SpringValue>create()));
}
}
}
registry.get(beanFactory).put(key, springValue);
// lazy initialize
if (initialized.compareAndSet(false, true)) {
initialize();
}
}
public Collection<SpringValue> get(BeanFactory beanFactory, String key) {
Multimap<String, SpringValue> beanFactorySpringValues = registry.get(beanFactory);
if (beanFactorySpringValues == null) {
return null;
}
return beanFactorySpringValues.get(key);
}
private void initialize() {
Executors.newSingleThreadScheduledExecutor(ApolloThreadFactory.create("SpringValueRegistry", true)).scheduleAtFixedRate(
new Runnable() {
@Override
public void run() {
try {
scanAndClean();
} catch (Throwable ex) {
ex.printStackTrace();
}
}
}, CLEAN_INTERVAL_IN_SECONDS, CLEAN_INTERVAL_IN_SECONDS, TimeUnit.SECONDS);
}
private void scanAndClean() {
Iterator<Multimap<String, SpringValue>> iterator = registry.values().iterator();
while (!Thread.currentThread().isInterrupted() && iterator.hasNext()) {
Multimap<String, SpringValue> springValues = iterator.next();
Iterator<Entry<String, SpringValue>> springValueIterator = springValues.entries().iterator();
while (springValueIterator.hasNext()) {
Entry<String, SpringValue> springValue = springValueIterator.next();
if (!springValue.getValue().isTargetBeanValid()) {
// clear unused spring values
springValueIterator.remove();
}
}
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/core/dto/ServiceDTO.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.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
return instanceId;
}
public void setAppName(String appName) {
this.appName = appName;
}
public void setHomepageUrl(String homepageUrl) {
this.homepageUrl = homepageUrl;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ServiceDTO{");
sb.append("appName='").append(appName).append('\'');
sb.append(", instanceId='").append(instanceId).append('\'');
sb.append(", homepageUrl='").append(homepageUrl).append('\'');
sb.append('}');
return sb.toString();
}
}
| /*
* 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.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
return instanceId;
}
public void setAppName(String appName) {
this.appName = appName;
}
public void setHomepageUrl(String homepageUrl) {
this.homepageUrl = homepageUrl;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ServiceDTO{");
sb.append("appName='").append(appName).append('\'');
sb.append(", instanceId='").append(instanceId).append('\'');
sb.append(", homepageUrl='").append(homepageUrl).append('\'');
sb.append('}');
return sb.toString();
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/ProxyInputStream.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.
*
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
* file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* to You 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;
import static com.ctrip.framework.foundation.internals.io.IOUtils.EOF;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
/**
* A Proxy stream which acts as expected, that is it passes the method calls on to the proxied stream and doesn't change
* which methods are being called.
* <p>
* It is an alternative base class to FilterInputStream to increase reusability, because FilterInputStream changes the
* methods being called, such as read(byte[]) to read(byte[], int, int).
* <p>
* See the protected methods for ways in which a subclass can easily decorate a stream with custom pre-, post- or error
* processing functionality.
*
* @version $Id: ProxyInputStream.java 1603493 2014-06-18 15:46:07Z ggregory $
*/
public abstract class ProxyInputStream extends FilterInputStream {
/**
* Constructs a new ProxyInputStream.
*
* @param proxy the InputStream to delegate to
*/
public ProxyInputStream(final InputStream proxy) {
super(proxy);
// the proxy is stored in a protected superclass variable named 'in'
}
/**
* Invokes the delegate's <code>read()</code> method.
*
* @return the byte read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read() throws IOException {
try {
beforeRead(1);
final int b = in.read();
afterRead(b != EOF ? 1 : EOF);
return b;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>read(byte[])</code> method.
*
* @param bts the buffer to read the bytes into
* @return the number of bytes read or EOF if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] bts) throws IOException {
try {
beforeRead(bts != null ? bts.length : 0);
final int n = in.read(bts);
afterRead(n);
return n;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>read(byte[], int, int)</code> method.
*
* @param bts the buffer to read the bytes into
* @param off The start offset
* @param len The number of bytes to read
* @return the number of bytes read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] bts, final int off, final int len) throws IOException {
try {
beforeRead(len);
final int n = in.read(bts, off, len);
afterRead(n);
return n;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>skip(long)</code> method.
*
* @param ln the number of bytes to skip
* @return the actual number of bytes skipped
* @throws IOException if an I/O error occurs
*/
@Override
public long skip(final long ln) throws IOException {
try {
return in.skip(ln);
} catch (final IOException e) {
handleIOException(e);
return 0;
}
}
/**
* Invokes the delegate's <code>available()</code> method.
*
* @return the number of available bytes
* @throws IOException if an I/O error occurs
*/
@Override
public int available() throws IOException {
try {
return super.available();
} catch (final IOException e) {
handleIOException(e);
return 0;
}
}
/**
* Invokes the delegate's <code>close()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public void close() throws IOException {
try {
in.close();
} catch (final IOException e) {
handleIOException(e);
}
}
/**
* Invokes the delegate's <code>mark(int)</code> method.
*
* @param readlimit read ahead limit
*/
@Override
public synchronized void mark(final int readlimit) {
in.mark(readlimit);
}
/**
* Invokes the delegate's <code>reset()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public synchronized void reset() throws IOException {
try {
in.reset();
} catch (final IOException e) {
handleIOException(e);
}
}
/**
* Invokes the delegate's <code>markSupported()</code> method.
*
* @return true if mark is supported, otherwise false
*/
@Override
public boolean markSupported() {
return in.markSupported();
}
/**
* Invoked by the read methods before the call is proxied. The number of bytes that the caller wanted to read (1 for
* the {@link #read()} method, buffer length for {@link #read(byte[])}, etc.) is given as an argument.
* <p>
* Subclasses can override this method to add common pre-processing functionality without having to override all the
* read methods. The default implementation does nothing.
* <p>
* Note this method is <em>not</em> called from {@link #skip(long)} or {@link #reset()}. You need to explicitly
* override those methods if you want to add pre-processing steps also to them.
*
* @since 2.0
* @param n number of bytes that the caller asked to be read
* @throws IOException if the pre-processing fails
*/
protected void beforeRead(final int n) throws IOException {
// no-op
}
/**
* Invoked by the read methods after the proxied call has returned successfully. The number of bytes returned to the
* caller (or -1 if the end of stream was reached) is given as an argument.
* <p>
* Subclasses can override this method to add common post-processing functionality without having to override all the
* read methods. The default implementation does nothing.
* <p>
* Note this method is <em>not</em> called from {@link #skip(long)} or {@link #reset()}. You need to explicitly
* override those methods if you want to add post-processing steps also to them.
*
* @since 2.0
* @param n number of bytes read, or -1 if the end of stream was reached
* @throws IOException if the post-processing fails
*/
protected void afterRead(final int n) throws IOException {
// no-op
}
/**
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception handling. The default behaviour is to re-throw the
* exception.
*
* @param e The IOException thrown
* @throws IOException if an I/O error occurs
* @since 2.0
*/
protected void handleIOException(final IOException e) throws IOException {
throw e;
}
}
| /*
* 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.
*
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
* file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* to You 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;
import static com.ctrip.framework.foundation.internals.io.IOUtils.EOF;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
/**
* A Proxy stream which acts as expected, that is it passes the method calls on to the proxied stream and doesn't change
* which methods are being called.
* <p>
* It is an alternative base class to FilterInputStream to increase reusability, because FilterInputStream changes the
* methods being called, such as read(byte[]) to read(byte[], int, int).
* <p>
* See the protected methods for ways in which a subclass can easily decorate a stream with custom pre-, post- or error
* processing functionality.
*
* @version $Id: ProxyInputStream.java 1603493 2014-06-18 15:46:07Z ggregory $
*/
public abstract class ProxyInputStream extends FilterInputStream {
/**
* Constructs a new ProxyInputStream.
*
* @param proxy the InputStream to delegate to
*/
public ProxyInputStream(final InputStream proxy) {
super(proxy);
// the proxy is stored in a protected superclass variable named 'in'
}
/**
* Invokes the delegate's <code>read()</code> method.
*
* @return the byte read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read() throws IOException {
try {
beforeRead(1);
final int b = in.read();
afterRead(b != EOF ? 1 : EOF);
return b;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>read(byte[])</code> method.
*
* @param bts the buffer to read the bytes into
* @return the number of bytes read or EOF if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] bts) throws IOException {
try {
beforeRead(bts != null ? bts.length : 0);
final int n = in.read(bts);
afterRead(n);
return n;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>read(byte[], int, int)</code> method.
*
* @param bts the buffer to read the bytes into
* @param off The start offset
* @param len The number of bytes to read
* @return the number of bytes read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] bts, final int off, final int len) throws IOException {
try {
beforeRead(len);
final int n = in.read(bts, off, len);
afterRead(n);
return n;
} catch (final IOException e) {
handleIOException(e);
return EOF;
}
}
/**
* Invokes the delegate's <code>skip(long)</code> method.
*
* @param ln the number of bytes to skip
* @return the actual number of bytes skipped
* @throws IOException if an I/O error occurs
*/
@Override
public long skip(final long ln) throws IOException {
try {
return in.skip(ln);
} catch (final IOException e) {
handleIOException(e);
return 0;
}
}
/**
* Invokes the delegate's <code>available()</code> method.
*
* @return the number of available bytes
* @throws IOException if an I/O error occurs
*/
@Override
public int available() throws IOException {
try {
return super.available();
} catch (final IOException e) {
handleIOException(e);
return 0;
}
}
/**
* Invokes the delegate's <code>close()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public void close() throws IOException {
try {
in.close();
} catch (final IOException e) {
handleIOException(e);
}
}
/**
* Invokes the delegate's <code>mark(int)</code> method.
*
* @param readlimit read ahead limit
*/
@Override
public synchronized void mark(final int readlimit) {
in.mark(readlimit);
}
/**
* Invokes the delegate's <code>reset()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public synchronized void reset() throws IOException {
try {
in.reset();
} catch (final IOException e) {
handleIOException(e);
}
}
/**
* Invokes the delegate's <code>markSupported()</code> method.
*
* @return true if mark is supported, otherwise false
*/
@Override
public boolean markSupported() {
return in.markSupported();
}
/**
* Invoked by the read methods before the call is proxied. The number of bytes that the caller wanted to read (1 for
* the {@link #read()} method, buffer length for {@link #read(byte[])}, etc.) is given as an argument.
* <p>
* Subclasses can override this method to add common pre-processing functionality without having to override all the
* read methods. The default implementation does nothing.
* <p>
* Note this method is <em>not</em> called from {@link #skip(long)} or {@link #reset()}. You need to explicitly
* override those methods if you want to add pre-processing steps also to them.
*
* @since 2.0
* @param n number of bytes that the caller asked to be read
* @throws IOException if the pre-processing fails
*/
protected void beforeRead(final int n) throws IOException {
// no-op
}
/**
* Invoked by the read methods after the proxied call has returned successfully. The number of bytes returned to the
* caller (or -1 if the end of stream was reached) is given as an argument.
* <p>
* Subclasses can override this method to add common post-processing functionality without having to override all the
* read methods. The default implementation does nothing.
* <p>
* Note this method is <em>not</em> called from {@link #skip(long)} or {@link #reset()}. You need to explicitly
* override those methods if you want to add post-processing steps also to them.
*
* @since 2.0
* @param n number of bytes read, or -1 if the end of stream was reached
* @throws IOException if the post-processing fails
*/
protected void afterRead(final int n) throws IOException {
// no-op
}
/**
* Handle any IOExceptions thrown.
* <p>
* This method provides a point to implement custom exception handling. The default behaviour is to re-throw the
* exception.
*
* @param e The IOException thrown
* @throws IOException if an I/O error occurs
* @since 2.0
*/
protected void handleIOException(final IOException e) throws IOException {
throw e;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/BOMInputStream.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.
*
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
* file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* to You 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;
import static com.ctrip.framework.foundation.internals.io.IOUtils.EOF;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
/**
* This class is used to wrap a stream that includes an encoded {@link ByteOrderMark} as its first bytes.
*
* This class detects these bytes and, if required, can automatically skip them and return the subsequent byte as the
* first byte in the stream.
*
* The {@link ByteOrderMark} implementation has the following pre-defined BOMs:
* <ul>
* <li>UTF-8 - {@link ByteOrderMark#UTF_8}</li>
* <li>UTF-16BE - {@link ByteOrderMark#UTF_16LE}</li>
* <li>UTF-16LE - {@link ByteOrderMark#UTF_16BE}</li>
* <li>UTF-32BE - {@link ByteOrderMark#UTF_32LE}</li>
* <li>UTF-32LE - {@link ByteOrderMark#UTF_32BE}</li>
* </ul>
*
*
* <h3>Example 1 - Detect and exclude a UTF-8 BOM</h3>
*
* <pre>
* BOMInputStream bomIn = new BOMInputStream(in);
* if (bomIn.hasBOM()) {
* // has a UTF-8 BOM
* }
* </pre>
*
* <h3>Example 2 - Detect a UTF-8 BOM (but don't exclude it)</h3>
*
* <pre>
* boolean include = true;
* BOMInputStream bomIn = new BOMInputStream(in, include);
* if (bomIn.hasBOM()) {
* // has a UTF-8 BOM
* }
* </pre>
*
* <h3>Example 3 - Detect Multiple BOMs</h3>
*
* <pre>
* BOMInputStream bomIn = new BOMInputStream(in, ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_32LE,
* ByteOrderMark.UTF_32BE);
* if (bomIn.hasBOM() == false) {
* // No BOM found
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_16LE)) {
* // has a UTF-16LE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_16BE)) {
* // has a UTF-16BE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_32LE)) {
* // has a UTF-32LE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_32BE)) {
* // has a UTF-32BE BOM
* }
* </pre>
*
* @see ByteOrderMark
* @see <a href="http://en.wikipedia.org/wiki/Byte_order_mark">Wikipedia - Byte Order Mark</a>
* @version $Id: BOMInputStream.java 1686527 2015-06-20 06:31:39Z krosenvold $
* @since 2.0
*/
public class BOMInputStream extends ProxyInputStream {
private final boolean include;
/**
* BOMs are sorted from longest to shortest.
*/
private final List<ByteOrderMark> boms;
private ByteOrderMark byteOrderMark;
private int[] firstBytes;
private int fbLength;
private int fbIndex;
private int markFbIndex;
private boolean markedAtStart;
/**
* Constructs a new BOM InputStream that excludes a {@link ByteOrderMark#UTF_8} BOM.
*
* @param delegate the InputStream to delegate to
*/
public BOMInputStream(final InputStream delegate) {
this(delegate, false, ByteOrderMark.UTF_8);
}
/**
* Constructs a new BOM InputStream that detects a a {@link ByteOrderMark#UTF_8} and optionally includes it.
*
* @param delegate the InputStream to delegate to
* @param include true to include the UTF-8 BOM or false to exclude it
*/
public BOMInputStream(final InputStream delegate, final boolean include) {
this(delegate, include, ByteOrderMark.UTF_8);
}
/**
* Constructs a new BOM InputStream that excludes the specified BOMs.
*
* @param delegate the InputStream to delegate to
* @param boms The BOMs to detect and exclude
*/
public BOMInputStream(final InputStream delegate, final ByteOrderMark... boms) {
this(delegate, false, boms);
}
/**
* Compares ByteOrderMark objects in descending length order.
*/
private static final Comparator<ByteOrderMark> ByteOrderMarkLengthComparator = new Comparator<ByteOrderMark>() {
public int compare(final ByteOrderMark bom1, final ByteOrderMark bom2) {
final int len1 = bom1.length();
final int len2 = bom2.length();
if (len1 > len2) {
return EOF;
}
if (len2 > len1) {
return 1;
}
return 0;
}
};
/**
* Constructs a new BOM InputStream that detects the specified BOMs and optionally includes them.
*
* @param delegate the InputStream to delegate to
* @param include true to include the specified BOMs or false to exclude them
* @param boms The BOMs to detect and optionally exclude
*/
public BOMInputStream(final InputStream delegate, final boolean include, final ByteOrderMark... boms) {
super(delegate);
if (boms == null || boms.length == 0) {
throw new IllegalArgumentException("No BOMs specified");
}
this.include = include;
// Sort the BOMs to match the longest BOM first because some BOMs have the same starting two bytes.
Arrays.sort(boms, ByteOrderMarkLengthComparator);
this.boms = Arrays.asList(boms);
}
/**
* Indicates whether the stream contains one of the specified BOMs.
*
* @return true if the stream has one of the specified BOMs, otherwise false if it does not
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public boolean hasBOM() throws IOException {
return getBOM() != null;
}
/**
* Indicates whether the stream contains the specified BOM.
*
* @param bom The BOM to check for
* @return true if the stream has the specified BOM, otherwise false if it does not
* @throws IllegalArgumentException if the BOM is not one the stream is configured to detect
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public boolean hasBOM(final ByteOrderMark bom) throws IOException {
if (!boms.contains(bom)) {
throw new IllegalArgumentException("Stream not configure to detect " + bom);
}
getBOM();
return byteOrderMark != null && byteOrderMark.equals(bom);
}
/**
* Return the BOM (Byte Order Mark).
*
* @return The BOM or null if none
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public ByteOrderMark getBOM() throws IOException {
if (firstBytes == null) {
fbLength = 0;
// BOMs are sorted from longest to shortest
final int maxBomSize = boms.get(0).length();
firstBytes = new int[maxBomSize];
// Read first maxBomSize bytes
for (int i = 0; i < firstBytes.length; i++) {
firstBytes[i] = in.read();
fbLength++;
if (firstBytes[i] < 0) {
break;
}
}
// match BOM in firstBytes
byteOrderMark = find();
if (byteOrderMark != null) {
if (!include) {
if (byteOrderMark.length() < firstBytes.length) {
fbIndex = byteOrderMark.length();
} else {
fbLength = 0;
}
}
}
}
return byteOrderMark;
}
/**
* Return the BOM charset Name - {@link ByteOrderMark#getCharsetName()}.
*
* @return The BOM charset Name or null if no BOM found
* @throws IOException if an error reading the first bytes of the stream occurs
*
*/
public String getBOMCharsetName() throws IOException {
getBOM();
return byteOrderMark == null ? null : byteOrderMark.getCharsetName();
}
/**
* This method reads and either preserves or skips the first bytes in the stream. It behaves like the single-byte
* <code>read()</code> method, either returning a valid byte or -1 to indicate that the initial bytes have been
* processed already.
*
* @return the byte read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
private int readFirstBytes() throws IOException {
getBOM();
return fbIndex < fbLength ? firstBytes[fbIndex++] : EOF;
}
/**
* Find a BOM with the specified bytes.
*
* @return The matched BOM or null if none matched
*/
private ByteOrderMark find() {
for (final ByteOrderMark bom : boms) {
if (matches(bom)) {
return bom;
}
}
return null;
}
/**
* Check if the bytes match a BOM.
*
* @param bom The BOM
* @return true if the bytes match the bom, otherwise false
*/
private boolean matches(final ByteOrderMark bom) {
// if (bom.length() != fbLength) {
// return false;
// }
// firstBytes may be bigger than the BOM bytes
for (int i = 0; i < bom.length(); i++) {
if (bom.get(i) != firstBytes[i]) {
return false;
}
}
return true;
}
// ----------------------------------------------------------------------------
// Implementation of InputStream
// ----------------------------------------------------------------------------
/**
* Invokes the delegate's <code>read()</code> method, detecting and optionally skipping BOM.
*
* @return the byte read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read() throws IOException {
final int b = readFirstBytes();
return b >= 0 ? b : in.read();
}
/**
* Invokes the delegate's <code>read(byte[], int, int)</code> method, detecting and optionally skipping BOM.
*
* @param buf the buffer to read the bytes into
* @param off The start offset
* @param len The number of bytes to read (excluding BOM)
* @return the number of bytes read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] buf, int off, int len) throws IOException {
int firstCount = 0;
int b = 0;
while (len > 0 && b >= 0) {
b = readFirstBytes();
if (b >= 0) {
buf[off++] = (byte) (b & 0xFF);
len--;
firstCount++;
}
}
final int secondCount = in.read(buf, off, len);
return secondCount < 0 ? firstCount > 0 ? firstCount : EOF : firstCount + secondCount;
}
/**
* Invokes the delegate's <code>read(byte[])</code> method, detecting and optionally skipping BOM.
*
* @param buf the buffer to read the bytes into
* @return the number of bytes read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] buf) throws IOException {
return read(buf, 0, buf.length);
}
/**
* Invokes the delegate's <code>mark(int)</code> method.
*
* @param readlimit read ahead limit
*/
@Override
public synchronized void mark(final int readlimit) {
markFbIndex = fbIndex;
markedAtStart = firstBytes == null;
in.mark(readlimit);
}
/**
* Invokes the delegate's <code>reset()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public synchronized void reset() throws IOException {
fbIndex = markFbIndex;
if (markedAtStart) {
firstBytes = null;
}
in.reset();
}
/**
* Invokes the delegate's <code>skip(long)</code> method, detecting and optionallyskipping BOM.
*
* @param n the number of bytes to skip
* @return the number of bytes to skipped or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public long skip(long n) throws IOException {
int skipped = 0;
while ((n > skipped) && (readFirstBytes() >= 0)) {
skipped++;
}
return in.skip(n - skipped) + skipped;
}
}
| /*
* 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.
*
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
* file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* to You 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;
import static com.ctrip.framework.foundation.internals.io.IOUtils.EOF;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
/**
* This class is used to wrap a stream that includes an encoded {@link ByteOrderMark} as its first bytes.
*
* This class detects these bytes and, if required, can automatically skip them and return the subsequent byte as the
* first byte in the stream.
*
* The {@link ByteOrderMark} implementation has the following pre-defined BOMs:
* <ul>
* <li>UTF-8 - {@link ByteOrderMark#UTF_8}</li>
* <li>UTF-16BE - {@link ByteOrderMark#UTF_16LE}</li>
* <li>UTF-16LE - {@link ByteOrderMark#UTF_16BE}</li>
* <li>UTF-32BE - {@link ByteOrderMark#UTF_32LE}</li>
* <li>UTF-32LE - {@link ByteOrderMark#UTF_32BE}</li>
* </ul>
*
*
* <h3>Example 1 - Detect and exclude a UTF-8 BOM</h3>
*
* <pre>
* BOMInputStream bomIn = new BOMInputStream(in);
* if (bomIn.hasBOM()) {
* // has a UTF-8 BOM
* }
* </pre>
*
* <h3>Example 2 - Detect a UTF-8 BOM (but don't exclude it)</h3>
*
* <pre>
* boolean include = true;
* BOMInputStream bomIn = new BOMInputStream(in, include);
* if (bomIn.hasBOM()) {
* // has a UTF-8 BOM
* }
* </pre>
*
* <h3>Example 3 - Detect Multiple BOMs</h3>
*
* <pre>
* BOMInputStream bomIn = new BOMInputStream(in, ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_32LE,
* ByteOrderMark.UTF_32BE);
* if (bomIn.hasBOM() == false) {
* // No BOM found
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_16LE)) {
* // has a UTF-16LE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_16BE)) {
* // has a UTF-16BE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_32LE)) {
* // has a UTF-32LE BOM
* } else if (bomIn.hasBOM(ByteOrderMark.UTF_32BE)) {
* // has a UTF-32BE BOM
* }
* </pre>
*
* @see ByteOrderMark
* @see <a href="http://en.wikipedia.org/wiki/Byte_order_mark">Wikipedia - Byte Order Mark</a>
* @version $Id: BOMInputStream.java 1686527 2015-06-20 06:31:39Z krosenvold $
* @since 2.0
*/
public class BOMInputStream extends ProxyInputStream {
private final boolean include;
/**
* BOMs are sorted from longest to shortest.
*/
private final List<ByteOrderMark> boms;
private ByteOrderMark byteOrderMark;
private int[] firstBytes;
private int fbLength;
private int fbIndex;
private int markFbIndex;
private boolean markedAtStart;
/**
* Constructs a new BOM InputStream that excludes a {@link ByteOrderMark#UTF_8} BOM.
*
* @param delegate the InputStream to delegate to
*/
public BOMInputStream(final InputStream delegate) {
this(delegate, false, ByteOrderMark.UTF_8);
}
/**
* Constructs a new BOM InputStream that detects a a {@link ByteOrderMark#UTF_8} and optionally includes it.
*
* @param delegate the InputStream to delegate to
* @param include true to include the UTF-8 BOM or false to exclude it
*/
public BOMInputStream(final InputStream delegate, final boolean include) {
this(delegate, include, ByteOrderMark.UTF_8);
}
/**
* Constructs a new BOM InputStream that excludes the specified BOMs.
*
* @param delegate the InputStream to delegate to
* @param boms The BOMs to detect and exclude
*/
public BOMInputStream(final InputStream delegate, final ByteOrderMark... boms) {
this(delegate, false, boms);
}
/**
* Compares ByteOrderMark objects in descending length order.
*/
private static final Comparator<ByteOrderMark> ByteOrderMarkLengthComparator = new Comparator<ByteOrderMark>() {
public int compare(final ByteOrderMark bom1, final ByteOrderMark bom2) {
final int len1 = bom1.length();
final int len2 = bom2.length();
if (len1 > len2) {
return EOF;
}
if (len2 > len1) {
return 1;
}
return 0;
}
};
/**
* Constructs a new BOM InputStream that detects the specified BOMs and optionally includes them.
*
* @param delegate the InputStream to delegate to
* @param include true to include the specified BOMs or false to exclude them
* @param boms The BOMs to detect and optionally exclude
*/
public BOMInputStream(final InputStream delegate, final boolean include, final ByteOrderMark... boms) {
super(delegate);
if (boms == null || boms.length == 0) {
throw new IllegalArgumentException("No BOMs specified");
}
this.include = include;
// Sort the BOMs to match the longest BOM first because some BOMs have the same starting two bytes.
Arrays.sort(boms, ByteOrderMarkLengthComparator);
this.boms = Arrays.asList(boms);
}
/**
* Indicates whether the stream contains one of the specified BOMs.
*
* @return true if the stream has one of the specified BOMs, otherwise false if it does not
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public boolean hasBOM() throws IOException {
return getBOM() != null;
}
/**
* Indicates whether the stream contains the specified BOM.
*
* @param bom The BOM to check for
* @return true if the stream has the specified BOM, otherwise false if it does not
* @throws IllegalArgumentException if the BOM is not one the stream is configured to detect
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public boolean hasBOM(final ByteOrderMark bom) throws IOException {
if (!boms.contains(bom)) {
throw new IllegalArgumentException("Stream not configure to detect " + bom);
}
getBOM();
return byteOrderMark != null && byteOrderMark.equals(bom);
}
/**
* Return the BOM (Byte Order Mark).
*
* @return The BOM or null if none
* @throws IOException if an error reading the first bytes of the stream occurs
*/
public ByteOrderMark getBOM() throws IOException {
if (firstBytes == null) {
fbLength = 0;
// BOMs are sorted from longest to shortest
final int maxBomSize = boms.get(0).length();
firstBytes = new int[maxBomSize];
// Read first maxBomSize bytes
for (int i = 0; i < firstBytes.length; i++) {
firstBytes[i] = in.read();
fbLength++;
if (firstBytes[i] < 0) {
break;
}
}
// match BOM in firstBytes
byteOrderMark = find();
if (byteOrderMark != null) {
if (!include) {
if (byteOrderMark.length() < firstBytes.length) {
fbIndex = byteOrderMark.length();
} else {
fbLength = 0;
}
}
}
}
return byteOrderMark;
}
/**
* Return the BOM charset Name - {@link ByteOrderMark#getCharsetName()}.
*
* @return The BOM charset Name or null if no BOM found
* @throws IOException if an error reading the first bytes of the stream occurs
*
*/
public String getBOMCharsetName() throws IOException {
getBOM();
return byteOrderMark == null ? null : byteOrderMark.getCharsetName();
}
/**
* This method reads and either preserves or skips the first bytes in the stream. It behaves like the single-byte
* <code>read()</code> method, either returning a valid byte or -1 to indicate that the initial bytes have been
* processed already.
*
* @return the byte read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
private int readFirstBytes() throws IOException {
getBOM();
return fbIndex < fbLength ? firstBytes[fbIndex++] : EOF;
}
/**
* Find a BOM with the specified bytes.
*
* @return The matched BOM or null if none matched
*/
private ByteOrderMark find() {
for (final ByteOrderMark bom : boms) {
if (matches(bom)) {
return bom;
}
}
return null;
}
/**
* Check if the bytes match a BOM.
*
* @param bom The BOM
* @return true if the bytes match the bom, otherwise false
*/
private boolean matches(final ByteOrderMark bom) {
// if (bom.length() != fbLength) {
// return false;
// }
// firstBytes may be bigger than the BOM bytes
for (int i = 0; i < bom.length(); i++) {
if (bom.get(i) != firstBytes[i]) {
return false;
}
}
return true;
}
// ----------------------------------------------------------------------------
// Implementation of InputStream
// ----------------------------------------------------------------------------
/**
* Invokes the delegate's <code>read()</code> method, detecting and optionally skipping BOM.
*
* @return the byte read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read() throws IOException {
final int b = readFirstBytes();
return b >= 0 ? b : in.read();
}
/**
* Invokes the delegate's <code>read(byte[], int, int)</code> method, detecting and optionally skipping BOM.
*
* @param buf the buffer to read the bytes into
* @param off The start offset
* @param len The number of bytes to read (excluding BOM)
* @return the number of bytes read or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] buf, int off, int len) throws IOException {
int firstCount = 0;
int b = 0;
while (len > 0 && b >= 0) {
b = readFirstBytes();
if (b >= 0) {
buf[off++] = (byte) (b & 0xFF);
len--;
firstCount++;
}
}
final int secondCount = in.read(buf, off, len);
return secondCount < 0 ? firstCount > 0 ? firstCount : EOF : firstCount + secondCount;
}
/**
* Invokes the delegate's <code>read(byte[])</code> method, detecting and optionally skipping BOM.
*
* @param buf the buffer to read the bytes into
* @return the number of bytes read (excluding BOM) or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public int read(final byte[] buf) throws IOException {
return read(buf, 0, buf.length);
}
/**
* Invokes the delegate's <code>mark(int)</code> method.
*
* @param readlimit read ahead limit
*/
@Override
public synchronized void mark(final int readlimit) {
markFbIndex = fbIndex;
markedAtStart = firstBytes == null;
in.mark(readlimit);
}
/**
* Invokes the delegate's <code>reset()</code> method.
*
* @throws IOException if an I/O error occurs
*/
@Override
public synchronized void reset() throws IOException {
fbIndex = markFbIndex;
if (markedAtStart) {
firstBytes = null;
}
in.reset();
}
/**
* Invokes the delegate's <code>skip(long)</code> method, detecting and optionallyskipping BOM.
*
* @param n the number of bytes to skip
* @return the number of bytes to skipped or -1 if the end of stream
* @throws IOException if an I/O error occurs
*/
@Override
public long skip(long n) throws IOException {
int skipped = 0;
while ((n > skipped) && (readFirstBytes() >= 0)) {
skipped++;
}
return in.skip(n - skipped) + skipped;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/NamespaceBranchController.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.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.message.MessageSender;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.service.NamespaceBranchService;
import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.framework.apollo.biz.utils.ReleaseMessageKeyGenerator;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class NamespaceBranchController {
private final MessageSender messageSender;
private final NamespaceBranchService namespaceBranchService;
private final NamespaceService namespaceService;
public NamespaceBranchController(
final MessageSender messageSender,
final NamespaceBranchService namespaceBranchService,
final NamespaceService namespaceService) {
this.messageSender = messageSender;
this.namespaceBranchService = namespaceBranchService;
this.namespaceService = namespaceService;
}
@PostMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public NamespaceDTO createBranch(@PathVariable String appId,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam("operator") String operator) {
checkNamespace(appId, clusterName, namespaceName);
Namespace createdBranch = namespaceBranchService.createBranch(appId, clusterName, namespaceName, operator);
return BeanUtils.transform(NamespaceDTO.class, createdBranch);
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public GrayReleaseRuleDTO findBranchGrayRules(@PathVariable String appId,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName) {
checkBranch(appId, clusterName, namespaceName, branchName);
GrayReleaseRule rules = namespaceBranchService.findBranchGrayRules(appId, clusterName, namespaceName, branchName);
if (rules == null) {
return null;
}
GrayReleaseRuleDTO ruleDTO =
new GrayReleaseRuleDTO(rules.getAppId(), rules.getClusterName(), rules.getNamespaceName(),
rules.getBranchName());
ruleDTO.setReleaseId(rules.getReleaseId());
ruleDTO.setRuleItems(GrayReleaseRuleItemTransformer.batchTransformFromJSON(rules.getRules()));
return ruleDTO;
}
@Transactional
@PutMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public void updateBranchGrayRules(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestBody GrayReleaseRuleDTO newRuleDto) {
checkBranch(appId, clusterName, namespaceName, branchName);
GrayReleaseRule newRules = BeanUtils.transform(GrayReleaseRule.class, newRuleDto);
newRules.setRules(GrayReleaseRuleItemTransformer.batchTransformToJSON(newRuleDto.getRuleItems()));
newRules.setBranchStatus(NamespaceBranchStatus.ACTIVE);
namespaceBranchService.updateBranchGrayRules(appId, clusterName, namespaceName, branchName, newRules);
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, clusterName, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
}
@Transactional
@DeleteMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}")
public void deleteBranch(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestParam("operator") String operator) {
checkBranch(appId, clusterName, namespaceName, branchName);
namespaceBranchService
.deleteBranch(appId, clusterName, namespaceName, branchName, NamespaceBranchStatus.DELETED, operator);
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, clusterName, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public NamespaceDTO loadNamespaceBranch(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName) {
checkNamespace(appId, clusterName, namespaceName);
Namespace childNamespace = namespaceBranchService.findBranch(appId, clusterName, namespaceName);
if (childNamespace == null) {
return null;
}
return BeanUtils.transform(NamespaceDTO.class, childNamespace);
}
private void checkBranch(String appId, String clusterName, String namespaceName, String branchName) {
//1. check parent namespace
checkNamespace(appId, clusterName, namespaceName);
//2. check child namespace
Namespace childNamespace = namespaceService.findOne(appId, branchName, namespaceName);
if (childNamespace == null) {
throw new BadRequestException(String.format("Namespace's branch not exist. AppId = %s, ClusterName = %s, "
+ "NamespaceName = %s, BranchName = %s",
appId, clusterName, namespaceName, branchName));
}
}
private void checkNamespace(String appId, String clusterName, String namespaceName) {
Namespace parentNamespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (parentNamespace == null) {
throw new BadRequestException(String.format("Namespace not exist. AppId = %s, ClusterName = %s, NamespaceName = %s", appId,
clusterName, 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.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.message.MessageSender;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.service.NamespaceBranchService;
import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.framework.apollo.biz.utils.ReleaseMessageKeyGenerator;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class NamespaceBranchController {
private final MessageSender messageSender;
private final NamespaceBranchService namespaceBranchService;
private final NamespaceService namespaceService;
public NamespaceBranchController(
final MessageSender messageSender,
final NamespaceBranchService namespaceBranchService,
final NamespaceService namespaceService) {
this.messageSender = messageSender;
this.namespaceBranchService = namespaceBranchService;
this.namespaceService = namespaceService;
}
@PostMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public NamespaceDTO createBranch(@PathVariable String appId,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam("operator") String operator) {
checkNamespace(appId, clusterName, namespaceName);
Namespace createdBranch = namespaceBranchService.createBranch(appId, clusterName, namespaceName, operator);
return BeanUtils.transform(NamespaceDTO.class, createdBranch);
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public GrayReleaseRuleDTO findBranchGrayRules(@PathVariable String appId,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName) {
checkBranch(appId, clusterName, namespaceName, branchName);
GrayReleaseRule rules = namespaceBranchService.findBranchGrayRules(appId, clusterName, namespaceName, branchName);
if (rules == null) {
return null;
}
GrayReleaseRuleDTO ruleDTO =
new GrayReleaseRuleDTO(rules.getAppId(), rules.getClusterName(), rules.getNamespaceName(),
rules.getBranchName());
ruleDTO.setReleaseId(rules.getReleaseId());
ruleDTO.setRuleItems(GrayReleaseRuleItemTransformer.batchTransformFromJSON(rules.getRules()));
return ruleDTO;
}
@Transactional
@PutMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public void updateBranchGrayRules(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestBody GrayReleaseRuleDTO newRuleDto) {
checkBranch(appId, clusterName, namespaceName, branchName);
GrayReleaseRule newRules = BeanUtils.transform(GrayReleaseRule.class, newRuleDto);
newRules.setRules(GrayReleaseRuleItemTransformer.batchTransformToJSON(newRuleDto.getRuleItems()));
newRules.setBranchStatus(NamespaceBranchStatus.ACTIVE);
namespaceBranchService.updateBranchGrayRules(appId, clusterName, namespaceName, branchName, newRules);
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, clusterName, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
}
@Transactional
@DeleteMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}")
public void deleteBranch(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName, @PathVariable String branchName,
@RequestParam("operator") String operator) {
checkBranch(appId, clusterName, namespaceName, branchName);
namespaceBranchService
.deleteBranch(appId, clusterName, namespaceName, branchName, NamespaceBranchStatus.DELETED, operator);
messageSender.sendMessage(ReleaseMessageKeyGenerator.generate(appId, clusterName, namespaceName),
Topics.APOLLO_RELEASE_TOPIC);
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public NamespaceDTO loadNamespaceBranch(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName) {
checkNamespace(appId, clusterName, namespaceName);
Namespace childNamespace = namespaceBranchService.findBranch(appId, clusterName, namespaceName);
if (childNamespace == null) {
return null;
}
return BeanUtils.transform(NamespaceDTO.class, childNamespace);
}
private void checkBranch(String appId, String clusterName, String namespaceName, String branchName) {
//1. check parent namespace
checkNamespace(appId, clusterName, namespaceName);
//2. check child namespace
Namespace childNamespace = namespaceService.findOne(appId, branchName, namespaceName);
if (childNamespace == null) {
throw new BadRequestException(String.format("Namespace's branch not exist. AppId = %s, ClusterName = %s, "
+ "NamespaceName = %s, BranchName = %s",
appId, clusterName, namespaceName, branchName));
}
}
private void checkNamespace(String appId, String clusterName, String namespaceName) {
Namespace parentNamespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (parentNamespace == null) {
throw new BadRequestException(String.format("Namespace not exist. AppId = %s, ClusterName = %s, NamespaceName = %s", appId,
clusterName, namespaceName));
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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-config-data/src/main/java/com/ctrip/framework/apollo/config/data/extension/websocket/ApolloClientWebsocketExtensionInitializer.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.websocket;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializer;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientWebsocketExtensionInitializer implements ApolloClientExtensionInitializer {
private final Log log;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloClientWebsocketExtensionInitializer(Log log,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.bootstrapContext = bootstrapContext;
}
@Override
public void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler) {
throw new UnsupportedOperationException("apollo client websocket support is not complete yet.");
}
}
| /*
* 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.websocket;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializer;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientWebsocketExtensionInitializer implements ApolloClientExtensionInitializer {
private final Log log;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloClientWebsocketExtensionInitializer(Log log,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.bootstrapContext = bootstrapContext;
}
@Override
public void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler) {
throw new UnsupportedOperationException("apollo client websocket support is not complete yet.");
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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.biz;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.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.biz;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public abstract class AbstractUnitTest {
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/angular/angular-resource.min.js | /*
AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT
*/
(function (I, d, B) {
'use strict';
function D(f, q) {
q = q || {};
d.forEach(q, function (d, h) {
delete q[h]
});
for (var h in f)!f.hasOwnProperty(h) || "$" === h.charAt(0) && "$" === h.charAt(1) || (q[h] = f[h]);
return q
}
var x = d.$$minErr("$resource"), C = /^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;
d.module("ngResource", ["ng"]).provider("$resource", function () {
var f = this;
this.defaults = {
stripTrailingSlashes: !0,
actions: {
get: {method: "GET"},
save: {method: "POST"},
query: {method: "GET", isArray: !0},
remove: {method: "DELETE"},
"delete": {method: "DELETE"}
}
};
this.$get = ["$http", "$q", function (q, h) {
function u(d, g) {
this.template = d;
this.defaults = s({}, f.defaults, g);
this.urlParams = {}
}
function w(y, g, l, m) {
function c(b, k) {
var c = {};
k = s({}, g, k);
r(k, function (a, k) {
v(a) && (a = a());
var d;
if (a && a.charAt && "@" == a.charAt(0)) {
d = b;
var e = a.substr(1);
if (null == e || "" === e || "hasOwnProperty" === e || !C.test("." + e))throw x("badmember", e);
for (var e = e.split("."), n = 0, g = e.length; n < g && d !== B; n++) {
var h = e[n];
d = null !== d ? d[h] : B
}
} else d = a;
c[k] = d
});
return c
}
function F(b) {
return b.resource
}
function e(b) {
D(b ||
{}, this)
}
var G = new u(y, m);
l = s({}, f.defaults.actions, l);
e.prototype.toJSON = function () {
var b = s({}, this);
delete b.$promise;
delete b.$resolved;
return b
};
r(l, function (b, k) {
var g = /^(POST|PUT|PATCH)$/i.test(b.method);
e[k] = function (a, z, m, y) {
var n = {}, f, l, A;
switch (arguments.length) {
case 4:
A = y, l = m;
case 3:
case 2:
if (v(z)) {
if (v(a)) {
l = a;
A = z;
break
}
l = z;
A = m
} else {
n = a;
f = z;
l = m;
break
}
case 1:
v(a) ? l = a : g ? f = a : n = a;
break;
case 0:
break;
default:
throw x("badargs", arguments.length);
}
var u = this instanceof e, p = u ? f : b.isArray ? [] : new e(f),
t = {}, w = b.interceptor && b.interceptor.response || F, C = b.interceptor && b.interceptor.responseError || B;
r(b, function (b, a) {
"params" != a && "isArray" != a && "interceptor" != a && (t[a] = H(b))
});
g && (t.data = f);
G.setUrlParams(t, s({}, c(f, b.params || {}), n), b.url);
n = q(t).then(function (a) {
var c = a.data, g = p.$promise;
if (c) {
if (d.isArray(c) !== !!b.isArray)throw x("badcfg", k, b.isArray ? "array" : "object", d.isArray(c) ? "array" : "object", t.method, t.url);
b.isArray ? (p.length = 0, r(c, function (a) {
"object" === typeof a ? p.push(new e(a)) : p.push(a)
})) :
(D(c, p), p.$promise = g)
}
p.$resolved = !0;
a.resource = p;
return a
}, function (a) {
p.$resolved = !0;
(A || E)(a);
return h.reject(a)
});
n = n.then(function (a) {
var b = w(a);
(l || E)(b, a.headers);
return b
}, C);
return u ? n : (p.$promise = n, p.$resolved = !1, p)
};
e.prototype["$" + k] = function (a, b, c) {
v(a) && (c = b, b = a, a = {});
a = e[k].call(this, a, this, b, c);
return a.$promise || a
}
});
e.bind = function (b) {
return w(y, s({}, g, b), l)
};
return e
}
var E = d.noop, r = d.forEach, s = d.extend, H = d.copy, v = d.isFunction;
u.prototype = {
setUrlParams: function (f, g, l) {
var m = this,
c = l || m.template, h, e, q = m.urlParams = {};
r(c.split(/\W/), function (b) {
if ("hasOwnProperty" === b)throw x("badname");
!/^\d+$/.test(b) && b && (new RegExp("(^|[^\\\\]):" + b + "(\\W|$)")).test(c) && (q[b] = !0)
});
c = c.replace(/\\:/g, ":");
g = g || {};
r(m.urlParams, function (b, k) {
h = g.hasOwnProperty(k) ? g[k] : m.defaults[k];
d.isDefined(h) && null !== h ? (e = encodeURIComponent(h).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "%20").replace(/%26/gi, "&").replace(/%3D/gi, "=").replace(/%2B/gi,
"+"), c = c.replace(new RegExp(":" + k + "(\\W|$)", "g"), function (b, a) {
return e + a
})) : c = c.replace(new RegExp("(/?):" + k + "(\\W|$)", "g"), function (b, a, c) {
return "/" == c.charAt(0) ? c : a + c
})
});
m.defaults.stripTrailingSlashes && (c = c.replace(/\/+$/, "") || "/");
c = c.replace(/\/\.(?=\w+($|\?))/, ".");
f.url = c.replace(/\/\\\./, "/.");
r(g, function (b, c) {
m.urlParams[c] || (f.params = f.params || {}, f.params[c] = b)
})
}
};
return w
}]
})
})(window, window.angular);
//# sourceMappingURL=angular-resource.min.js.map
| /*
AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT
*/
(function (I, d, B) {
'use strict';
function D(f, q) {
q = q || {};
d.forEach(q, function (d, h) {
delete q[h]
});
for (var h in f)!f.hasOwnProperty(h) || "$" === h.charAt(0) && "$" === h.charAt(1) || (q[h] = f[h]);
return q
}
var x = d.$$minErr("$resource"), C = /^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;
d.module("ngResource", ["ng"]).provider("$resource", function () {
var f = this;
this.defaults = {
stripTrailingSlashes: !0,
actions: {
get: {method: "GET"},
save: {method: "POST"},
query: {method: "GET", isArray: !0},
remove: {method: "DELETE"},
"delete": {method: "DELETE"}
}
};
this.$get = ["$http", "$q", function (q, h) {
function u(d, g) {
this.template = d;
this.defaults = s({}, f.defaults, g);
this.urlParams = {}
}
function w(y, g, l, m) {
function c(b, k) {
var c = {};
k = s({}, g, k);
r(k, function (a, k) {
v(a) && (a = a());
var d;
if (a && a.charAt && "@" == a.charAt(0)) {
d = b;
var e = a.substr(1);
if (null == e || "" === e || "hasOwnProperty" === e || !C.test("." + e))throw x("badmember", e);
for (var e = e.split("."), n = 0, g = e.length; n < g && d !== B; n++) {
var h = e[n];
d = null !== d ? d[h] : B
}
} else d = a;
c[k] = d
});
return c
}
function F(b) {
return b.resource
}
function e(b) {
D(b ||
{}, this)
}
var G = new u(y, m);
l = s({}, f.defaults.actions, l);
e.prototype.toJSON = function () {
var b = s({}, this);
delete b.$promise;
delete b.$resolved;
return b
};
r(l, function (b, k) {
var g = /^(POST|PUT|PATCH)$/i.test(b.method);
e[k] = function (a, z, m, y) {
var n = {}, f, l, A;
switch (arguments.length) {
case 4:
A = y, l = m;
case 3:
case 2:
if (v(z)) {
if (v(a)) {
l = a;
A = z;
break
}
l = z;
A = m
} else {
n = a;
f = z;
l = m;
break
}
case 1:
v(a) ? l = a : g ? f = a : n = a;
break;
case 0:
break;
default:
throw x("badargs", arguments.length);
}
var u = this instanceof e, p = u ? f : b.isArray ? [] : new e(f),
t = {}, w = b.interceptor && b.interceptor.response || F, C = b.interceptor && b.interceptor.responseError || B;
r(b, function (b, a) {
"params" != a && "isArray" != a && "interceptor" != a && (t[a] = H(b))
});
g && (t.data = f);
G.setUrlParams(t, s({}, c(f, b.params || {}), n), b.url);
n = q(t).then(function (a) {
var c = a.data, g = p.$promise;
if (c) {
if (d.isArray(c) !== !!b.isArray)throw x("badcfg", k, b.isArray ? "array" : "object", d.isArray(c) ? "array" : "object", t.method, t.url);
b.isArray ? (p.length = 0, r(c, function (a) {
"object" === typeof a ? p.push(new e(a)) : p.push(a)
})) :
(D(c, p), p.$promise = g)
}
p.$resolved = !0;
a.resource = p;
return a
}, function (a) {
p.$resolved = !0;
(A || E)(a);
return h.reject(a)
});
n = n.then(function (a) {
var b = w(a);
(l || E)(b, a.headers);
return b
}, C);
return u ? n : (p.$promise = n, p.$resolved = !1, p)
};
e.prototype["$" + k] = function (a, b, c) {
v(a) && (c = b, b = a, a = {});
a = e[k].call(this, a, this, b, c);
return a.$promise || a
}
});
e.bind = function (b) {
return w(y, s({}, g, b), l)
};
return e
}
var E = d.noop, r = d.forEach, s = d.extend, H = d.copy, v = d.isFunction;
u.prototype = {
setUrlParams: function (f, g, l) {
var m = this,
c = l || m.template, h, e, q = m.urlParams = {};
r(c.split(/\W/), function (b) {
if ("hasOwnProperty" === b)throw x("badname");
!/^\d+$/.test(b) && b && (new RegExp("(^|[^\\\\]):" + b + "(\\W|$)")).test(c) && (q[b] = !0)
});
c = c.replace(/\\:/g, ":");
g = g || {};
r(m.urlParams, function (b, k) {
h = g.hasOwnProperty(k) ? g[k] : m.defaults[k];
d.isDefined(h) && null !== h ? (e = encodeURIComponent(h).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "%20").replace(/%26/gi, "&").replace(/%3D/gi, "=").replace(/%2B/gi,
"+"), c = c.replace(new RegExp(":" + k + "(\\W|$)", "g"), function (b, a) {
return e + a
})) : c = c.replace(new RegExp("(/?):" + k + "(\\W|$)", "g"), function (b, a, c) {
return "/" == c.charAt(0) ? c : a + c
})
});
m.defaults.stripTrailingSlashes && (c = c.replace(/\/+$/, "") || "/");
c = c.replace(/\/\.(?=\w+($|\?))/, ".");
f.url = c.replace(/\/\\\./, "/.");
r(g, function (b, c) {
m.urlParams[c] || (f.params = f.params || {}, f.params[c] = b)
})
}
};
return w
}]
})
})(window, window.angular);
//# sourceMappingURL=angular-resource.min.js.map
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/config/AbstractConfigService.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.grayReleaseRule.GrayReleaseRulesHolder;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.google.common.base.Strings;
import java.util.Objects;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class AbstractConfigService implements ConfigService {
@Autowired
private GrayReleaseRulesHolder grayReleaseRulesHolder;
@Override
public Release loadConfig(String clientAppId, String clientIp, String configAppId, String configClusterName,
String configNamespace, String dataCenter, ApolloNotificationMessages clientMessages) {
// load from specified cluster first
if (!Objects.equals(ConfigConsts.CLUSTER_NAME_DEFAULT, configClusterName)) {
Release clusterRelease = findRelease(clientAppId, clientIp, configAppId, configClusterName, configNamespace,
clientMessages);
if (Objects.nonNull(clusterRelease)) {
return clusterRelease;
}
}
// try to load via data center
if (!Strings.isNullOrEmpty(dataCenter) && !Objects.equals(dataCenter, configClusterName)) {
Release dataCenterRelease = findRelease(clientAppId, clientIp, configAppId, dataCenter, configNamespace,
clientMessages);
if (Objects.nonNull(dataCenterRelease)) {
return dataCenterRelease;
}
}
// fallback to default release
return findRelease(clientAppId, clientIp, configAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, configNamespace,
clientMessages);
}
/**
* Find release
*
* @param clientAppId the client's app id
* @param clientIp the client ip
* @param configAppId the requested config's app id
* @param configClusterName the requested config's cluster name
* @param configNamespace the requested config's namespace name
* @param clientMessages the messages received in client side
* @return the release
*/
private Release findRelease(String clientAppId, String clientIp, String configAppId, String configClusterName,
String configNamespace, ApolloNotificationMessages clientMessages) {
Long grayReleaseId = grayReleaseRulesHolder.findReleaseIdFromGrayReleaseRule(clientAppId, clientIp, configAppId,
configClusterName, configNamespace);
Release release = null;
if (grayReleaseId != null) {
release = findActiveOne(grayReleaseId, clientMessages);
}
if (release == null) {
release = findLatestActiveRelease(configAppId, configClusterName, configNamespace, clientMessages);
}
return release;
}
/**
* Find active release by id
*/
protected abstract Release findActiveOne(long id, ApolloNotificationMessages clientMessages);
/**
* Find active release by app id, cluster name and namespace name
*/
protected abstract Release findLatestActiveRelease(String configAppId, String configClusterName,
String configNamespaceName, ApolloNotificationMessages clientMessages);
}
| /*
* 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.grayReleaseRule.GrayReleaseRulesHolder;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.google.common.base.Strings;
import java.util.Objects;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class AbstractConfigService implements ConfigService {
@Autowired
private GrayReleaseRulesHolder grayReleaseRulesHolder;
@Override
public Release loadConfig(String clientAppId, String clientIp, String configAppId, String configClusterName,
String configNamespace, String dataCenter, ApolloNotificationMessages clientMessages) {
// load from specified cluster first
if (!Objects.equals(ConfigConsts.CLUSTER_NAME_DEFAULT, configClusterName)) {
Release clusterRelease = findRelease(clientAppId, clientIp, configAppId, configClusterName, configNamespace,
clientMessages);
if (Objects.nonNull(clusterRelease)) {
return clusterRelease;
}
}
// try to load via data center
if (!Strings.isNullOrEmpty(dataCenter) && !Objects.equals(dataCenter, configClusterName)) {
Release dataCenterRelease = findRelease(clientAppId, clientIp, configAppId, dataCenter, configNamespace,
clientMessages);
if (Objects.nonNull(dataCenterRelease)) {
return dataCenterRelease;
}
}
// fallback to default release
return findRelease(clientAppId, clientIp, configAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, configNamespace,
clientMessages);
}
/**
* Find release
*
* @param clientAppId the client's app id
* @param clientIp the client ip
* @param configAppId the requested config's app id
* @param configClusterName the requested config's cluster name
* @param configNamespace the requested config's namespace name
* @param clientMessages the messages received in client side
* @return the release
*/
private Release findRelease(String clientAppId, String clientIp, String configAppId, String configClusterName,
String configNamespace, ApolloNotificationMessages clientMessages) {
Long grayReleaseId = grayReleaseRulesHolder.findReleaseIdFromGrayReleaseRule(clientAppId, clientIp, configAppId,
configClusterName, configNamespace);
Release release = null;
if (grayReleaseId != null) {
release = findActiveOne(grayReleaseId, clientMessages);
}
if (release == null) {
release = findLatestActiveRelease(configAppId, configClusterName, configNamespace, clientMessages);
}
return release;
}
/**
* Find active release by id
*/
protected abstract Release findActiveOne(long id, ApolloNotificationMessages clientMessages);
/**
* Find active release by app id, cluster name and namespace name
*/
protected abstract Release findLatestActiveRelease(String configAppId, String configClusterName,
String configNamespaceName, ApolloNotificationMessages clientMessages);
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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 || 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);
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/core/enums/ConfigFileFormat.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.ctrip.framework.apollo.core.utils.StringUtils;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public enum ConfigFileFormat {
Properties("properties"), XML("xml"), JSON("json"), YML("yml"), YAML("yaml"), TXT("txt");
private String value;
ConfigFileFormat(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public static ConfigFileFormat fromString(String value) {
if (StringUtils.isEmpty(value)) {
throw new IllegalArgumentException("value can not be empty");
}
switch (value.toLowerCase()) {
case "properties":
return Properties;
case "xml":
return XML;
case "json":
return JSON;
case "yml":
return YML;
case "yaml":
return YAML;
case "txt":
return TXT;
}
throw new IllegalArgumentException(value + " can not map enum");
}
public static boolean isValidFormat(String value) {
try {
fromString(value);
return true;
} catch (IllegalArgumentException e) {
return false;
}
}
public static boolean isPropertiesCompatible(ConfigFileFormat format) {
return format == YAML || format == 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.
*
*/
package com.ctrip.framework.apollo.core.enums;
import com.ctrip.framework.apollo.core.utils.StringUtils;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public enum ConfigFileFormat {
Properties("properties"), XML("xml"), JSON("json"), YML("yml"), YAML("yaml"), TXT("txt");
private String value;
ConfigFileFormat(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public static ConfigFileFormat fromString(String value) {
if (StringUtils.isEmpty(value)) {
throw new IllegalArgumentException("value can not be empty");
}
switch (value.toLowerCase()) {
case "properties":
return Properties;
case "xml":
return XML;
case "json":
return JSON;
case "yml":
return YML;
case "yaml":
return YAML;
case "txt":
return TXT;
}
throw new IllegalArgumentException(value + " can not map enum");
}
public static boolean isValidFormat(String value) {
try {
fromString(value);
return true;
} catch (IllegalArgumentException e) {
return false;
}
}
public static boolean isPropertiesCompatible(ConfigFileFormat format) {
return format == YAML || format == YML;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/spi/ctrip/CtripEmailService.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;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
import com.ctrip.framework.apollo.portal.spi.EmailService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.lang.reflect.Method;
import javax.annotation.PostConstruct;
public class CtripEmailService implements EmailService {
private static final Logger logger = LoggerFactory.getLogger(CtripEmailService.class);
private Object emailServiceClient;
private Method sendEmailAsync;
private Method sendEmail;
@Autowired
private CtripEmailRequestBuilder emailRequestBuilder;
@Autowired
private PortalConfig portalConfig;
@PostConstruct
public void init() {
try {
initServiceClientConfig();
Class emailServiceClientClazz =
Class.forName("com.ctrip.framework.apolloctripservice.emailservice.EmailServiceClient");
Method getInstanceMethod = emailServiceClientClazz.getMethod("getInstance");
emailServiceClient = getInstanceMethod.invoke(null);
Class sendEmailRequestClazz =
Class.forName("com.ctrip.framework.apolloctripservice.emailservice.SendEmailRequest");
sendEmailAsync = emailServiceClientClazz.getMethod("sendEmailAsync", sendEmailRequestClazz);
sendEmail = emailServiceClientClazz.getMethod("sendEmail", sendEmailRequestClazz);
} catch (Throwable e) {
logger.error("init ctrip email service failed", e);
Tracer.logError("init ctrip email service failed", e);
}
}
private void initServiceClientConfig() throws Exception {
Class serviceClientConfigClazz = Class.forName("com.ctriposs.baiji.rpc.client.ServiceClientConfig");
Object serviceClientConfig = serviceClientConfigClazz.newInstance();
Method setFxConfigServiceUrlMethod = serviceClientConfigClazz.getMethod("setFxConfigServiceUrl", String.class);
setFxConfigServiceUrlMethod.invoke(serviceClientConfig, portalConfig.soaServerAddress());
Class serviceClientBaseClazz = Class.forName("com.ctriposs.baiji.rpc.client.ServiceClientBase");
Method initializeMethod = serviceClientBaseClazz.getMethod("initialize", serviceClientConfigClazz);
initializeMethod.invoke(null, serviceClientConfig);
}
@Override
public void send(Email email) {
try {
Object emailRequest = emailRequestBuilder.buildEmailRequest(email);
Object sendResponse = portalConfig.isSendEmailAsync() ?
sendEmailAsync.invoke(emailServiceClient, emailRequest) :
sendEmail.invoke(emailServiceClient, emailRequest);
logger.info("Email server response: " + sendResponse);
} catch (Throwable e) {
logger.error("send email failed", e);
Tracer.logError("send email failed", e);
}
}
}
| /*
* 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;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
import com.ctrip.framework.apollo.portal.spi.EmailService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.lang.reflect.Method;
import javax.annotation.PostConstruct;
public class CtripEmailService implements EmailService {
private static final Logger logger = LoggerFactory.getLogger(CtripEmailService.class);
private Object emailServiceClient;
private Method sendEmailAsync;
private Method sendEmail;
@Autowired
private CtripEmailRequestBuilder emailRequestBuilder;
@Autowired
private PortalConfig portalConfig;
@PostConstruct
public void init() {
try {
initServiceClientConfig();
Class emailServiceClientClazz =
Class.forName("com.ctrip.framework.apolloctripservice.emailservice.EmailServiceClient");
Method getInstanceMethod = emailServiceClientClazz.getMethod("getInstance");
emailServiceClient = getInstanceMethod.invoke(null);
Class sendEmailRequestClazz =
Class.forName("com.ctrip.framework.apolloctripservice.emailservice.SendEmailRequest");
sendEmailAsync = emailServiceClientClazz.getMethod("sendEmailAsync", sendEmailRequestClazz);
sendEmail = emailServiceClientClazz.getMethod("sendEmail", sendEmailRequestClazz);
} catch (Throwable e) {
logger.error("init ctrip email service failed", e);
Tracer.logError("init ctrip email service failed", e);
}
}
private void initServiceClientConfig() throws Exception {
Class serviceClientConfigClazz = Class.forName("com.ctriposs.baiji.rpc.client.ServiceClientConfig");
Object serviceClientConfig = serviceClientConfigClazz.newInstance();
Method setFxConfigServiceUrlMethod = serviceClientConfigClazz.getMethod("setFxConfigServiceUrl", String.class);
setFxConfigServiceUrlMethod.invoke(serviceClientConfig, portalConfig.soaServerAddress());
Class serviceClientBaseClazz = Class.forName("com.ctriposs.baiji.rpc.client.ServiceClientBase");
Method initializeMethod = serviceClientBaseClazz.getMethod("initialize", serviceClientConfigClazz);
initializeMethod.invoke(null, serviceClientConfig);
}
@Override
public void send(Email email) {
try {
Object emailRequest = emailRequestBuilder.buildEmailRequest(email);
Object sendResponse = portalConfig.isSendEmailAsync() ?
sendEmailAsync.invoke(emailServiceClient, emailRequest) :
sendEmail.invoke(emailServiceClient, emailRequest);
logger.info("Email server response: " + sendResponse);
} catch (Throwable e) {
logger.error("send email failed", e);
Tracer.logError("send email failed", e);
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/bo/NamespaceBO.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.bo;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import java.util.List;
public class NamespaceBO {
private NamespaceDTO baseInfo;
private int itemModifiedCnt;
private List<ItemBO> items;
private String format;
private boolean isPublic;
private String parentAppId;
private String comment;
// is the configs hidden to current user?
private boolean isConfigHidden;
public NamespaceDTO getBaseInfo() {
return baseInfo;
}
public void setBaseInfo(NamespaceDTO baseInfo) {
this.baseInfo = baseInfo;
}
public int getItemModifiedCnt() {
return itemModifiedCnt;
}
public void setItemModifiedCnt(int itemModifiedCnt) {
this.itemModifiedCnt = itemModifiedCnt;
}
public List<ItemBO> getItems() {
return items;
}
public void setItems(List<ItemBO> items) {
this.items = items;
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public String getParentAppId() {
return parentAppId;
}
public void setParentAppId(String parentAppId) {
this.parentAppId = parentAppId;
}
public String getComment() {
return comment;
}
public void setComment(String comment) {
this.comment = comment;
}
public boolean isConfigHidden() {
return isConfigHidden;
}
public void setConfigHidden(boolean hidden) {
isConfigHidden = hidden;
}
public void hideItems() {
setConfigHidden(true);
items.clear();
setItemModifiedCnt(0);
}
}
| /*
* 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.bo;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import java.util.List;
public class NamespaceBO {
private NamespaceDTO baseInfo;
private int itemModifiedCnt;
private List<ItemBO> items;
private String format;
private boolean isPublic;
private String parentAppId;
private String comment;
// is the configs hidden to current user?
private boolean isConfigHidden;
public NamespaceDTO getBaseInfo() {
return baseInfo;
}
public void setBaseInfo(NamespaceDTO baseInfo) {
this.baseInfo = baseInfo;
}
public int getItemModifiedCnt() {
return itemModifiedCnt;
}
public void setItemModifiedCnt(int itemModifiedCnt) {
this.itemModifiedCnt = itemModifiedCnt;
}
public List<ItemBO> getItems() {
return items;
}
public void setItems(List<ItemBO> items) {
this.items = items;
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public String getParentAppId() {
return parentAppId;
}
public void setParentAppId(String parentAppId) {
this.parentAppId = parentAppId;
}
public String getComment() {
return comment;
}
public void setComment(String comment) {
this.comment = comment;
}
public boolean isConfigHidden() {
return isConfigHidden;
}
public void setConfigHidden(boolean hidden) {
isConfigHidden = hidden;
}
public void hideItems() {
setConfigHidden(true);
items.clear();
setItemModifiedCnt(0);
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/spi/defaultImpl/RoleInitializationServiceTest.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.defaultImpl;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.collect.Sets;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Mockito.*;
public class RoleInitializationServiceTest extends AbstractUnitTest {
private final String APP_ID = "1000";
private final String APP_NAME = "app-test";
private final String CLUSTER = "cluster-test";
private final String NAMESPACE = "namespace-test";
private final String CURRENT_USER = "user";
@Mock
private RolePermissionService rolePermissionService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PortalConfig portalConfig;
@InjectMocks
private DefaultRoleInitializationService roleInitializationService;
@Test
public void testInitAppRoleHasInitBefore(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(mockRole(RoleUtils.buildAppMasterRoleName(APP_ID)));
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(1)).findRoleByRoleName(RoleUtils.buildAppMasterRoleName(APP_ID));
verify(rolePermissionService, times(0)).assignRoleToUsers(anyString(), anySet(), anyString());
}
@Test
public void testInitAppRole(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
when(portalConfig.portalSupportedEnvs()).thenReturn(mockPortalSupportedEnvs());
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(7)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).assignRoleToUsers(
RoleUtils.buildAppMasterRoleName(APP_ID), Sets.newHashSet(CURRENT_USER), CURRENT_USER);
verify(rolePermissionService, times(7)).createPermission(any());
verify(rolePermissionService, times(8)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleHasExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(mockRole(releaseNamespaceRoleName));
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(0)).createPermission(any());
verify(rolePermissionService, times(0)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleNotExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(null);
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(2)).createPermission(any());
verify(rolePermissionService, times(2)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleModifyNSExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).createPermission(any());
verify(rolePermissionService, times(1)).createRoleWithPermissions(any(), anySet());
}
private App mockApp(){
App app = new App();
app.setAppId(APP_ID);
app.setName(APP_NAME);
app.setOrgName("xx");
app.setOrgId("1");
app.setOwnerName(CURRENT_USER);
app.setDataChangeCreatedBy(CURRENT_USER);
return app;
}
private Role mockRole(String roleName){
Role role = new Role();
role.setRoleName(roleName);
return role;
}
private UserInfo mockUser(){
UserInfo userInfo = new UserInfo();
userInfo.setUserId(CURRENT_USER);
return userInfo;
}
private Permission mockPermission(){
Permission permission = new Permission();
permission.setPermissionType(PermissionType.MODIFY_NAMESPACE);
permission.setTargetId(RoleUtils.buildNamespaceTargetId(APP_ID, NAMESPACE));
return permission;
}
private List<Env> mockPortalSupportedEnvs(){
List<Env> envArray = new ArrayList<>();
envArray.add(Env.DEV);
envArray.add(Env.FAT);
return envArray;
}
}
| /*
* 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.defaultImpl;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.collect.Sets;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Mockito.*;
public class RoleInitializationServiceTest extends AbstractUnitTest {
private final String APP_ID = "1000";
private final String APP_NAME = "app-test";
private final String CLUSTER = "cluster-test";
private final String NAMESPACE = "namespace-test";
private final String CURRENT_USER = "user";
@Mock
private RolePermissionService rolePermissionService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PortalConfig portalConfig;
@InjectMocks
private DefaultRoleInitializationService roleInitializationService;
@Test
public void testInitAppRoleHasInitBefore(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(mockRole(RoleUtils.buildAppMasterRoleName(APP_ID)));
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(1)).findRoleByRoleName(RoleUtils.buildAppMasterRoleName(APP_ID));
verify(rolePermissionService, times(0)).assignRoleToUsers(anyString(), anySet(), anyString());
}
@Test
public void testInitAppRole(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
when(portalConfig.portalSupportedEnvs()).thenReturn(mockPortalSupportedEnvs());
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(7)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).assignRoleToUsers(
RoleUtils.buildAppMasterRoleName(APP_ID), Sets.newHashSet(CURRENT_USER), CURRENT_USER);
verify(rolePermissionService, times(7)).createPermission(any());
verify(rolePermissionService, times(8)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleHasExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(mockRole(releaseNamespaceRoleName));
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(0)).createPermission(any());
verify(rolePermissionService, times(0)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleNotExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(null);
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(2)).createPermission(any());
verify(rolePermissionService, times(2)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleModifyNSExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).createPermission(any());
verify(rolePermissionService, times(1)).createRoleWithPermissions(any(), anySet());
}
private App mockApp(){
App app = new App();
app.setAppId(APP_ID);
app.setName(APP_NAME);
app.setOrgName("xx");
app.setOrgId("1");
app.setOwnerName(CURRENT_USER);
app.setDataChangeCreatedBy(CURRENT_USER);
return app;
}
private Role mockRole(String roleName){
Role role = new Role();
role.setRoleName(roleName);
return role;
}
private UserInfo mockUser(){
UserInfo userInfo = new UserInfo();
userInfo.setUserId(CURRENT_USER);
return userInfo;
}
private Permission mockPermission(){
Permission permission = new Permission();
permission.setPermissionType(PermissionType.MODIFY_NAMESPACE);
permission.setTargetId(RoleUtils.buildNamespaceTargetId(APP_ID, NAMESPACE));
return permission;
}
private List<Env> mockPortalSupportedEnvs(){
List<Env> envArray = new ArrayList<>();
envArray.add(Env.DEV);
envArray.add(Env.FAT);
return envArray;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/api/AdminServiceAPI.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.api;
import com.ctrip.framework.apollo.common.dto.*;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.google.common.base.Joiner;
import org.springframework.boot.actuate.health.Health;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.util.*;
@Service
public class AdminServiceAPI {
@Service
public static class HealthAPI extends API {
public Health health(Env env) {
return restTemplate.get(env, "/health", Health.class);
}
}
@Service
public static class AppAPI extends API {
public AppDTO loadApp(Env env, String appId) {
return restTemplate.get(env, "apps/{appId}", AppDTO.class, appId);
}
public AppDTO createApp(Env env, AppDTO app) {
return restTemplate.post(env, "apps", app, AppDTO.class);
}
public void updateApp(Env env, AppDTO app) {
restTemplate.put(env, "apps/{appId}", app, app.getAppId());
}
public void deleteApp(Env env, String appId, String operator) {
restTemplate.delete(env, "/apps/{appId}?operator={operator}", appId, operator);
}
}
@Service
public static class NamespaceAPI extends API {
private ParameterizedTypeReference<Map<String, Boolean>>
typeReference = new ParameterizedTypeReference<Map<String, Boolean>>() {
};
public List<NamespaceDTO> findNamespaceByCluster(String appId, Env env, String clusterName) {
NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces",
NamespaceDTO[].class, appId,
clusterName);
return Arrays.asList(namespaceDTOs);
}
public NamespaceDTO loadNamespace(String appId, Env env, String clusterName,
String namespaceName) {
return
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public NamespaceDTO findPublicNamespaceForAssociatedNamespace(Env env, String appId, String clusterName,
String namespaceName) {
return
restTemplate
.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/associated-public-namespace",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) {
return restTemplate
.post(env, "apps/{appId}/clusters/{clusterName}/namespaces", namespace, NamespaceDTO.class,
namespace.getAppId(), namespace.getClusterName());
}
public AppNamespaceDTO createAppNamespace(Env env, AppNamespaceDTO appNamespace) {
return restTemplate
.post(env, "apps/{appId}/appnamespaces", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId());
}
public AppNamespaceDTO createMissingAppNamespace(Env env, AppNamespaceDTO appNamespace) {
return restTemplate
.post(env, "apps/{appId}/appnamespaces?silentCreation=true", appNamespace, AppNamespaceDTO.class,
appNamespace.getAppId());
}
public List<AppNamespaceDTO> getAppNamespaces(String appId, Env env) {
AppNamespaceDTO[] appNamespaceDTOs = restTemplate.get(env, "apps/{appId}/appnamespaces", AppNamespaceDTO[].class, appId);
return Arrays.asList(appNamespaceDTOs);
}
public void deleteNamespace(Env env, String appId, String clusterName, String namespaceName, String operator) {
restTemplate
.delete(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}?operator={operator}", appId,
clusterName,
namespaceName, operator);
}
public Map<String, Boolean> getNamespacePublishInfo(Env env, String appId) {
return restTemplate.get(env, "apps/{appId}/namespaces/publish_info", typeReference, appId).getBody();
}
public List<NamespaceDTO> getPublicAppNamespaceAllNamespaces(Env env, String publicNamespaceName,
int page, int size) {
NamespaceDTO[] namespaceDTOs =
restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/namespaces?page={page}&size={size}",
NamespaceDTO[].class, publicNamespaceName, page, size);
return Arrays.asList(namespaceDTOs);
}
public int countPublicAppNamespaceAssociatedNamespaces(Env env, String publicNamesapceName) {
Integer count =
restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/associated-namespaces/count", Integer.class,
publicNamesapceName);
return count == null ? 0 : count;
}
public void deleteAppNamespace(Env env, String appId, String namespaceName, String operator) {
restTemplate.delete(env, "/apps/{appId}/appnamespaces/{namespaceName}?operator={operator}", appId, namespaceName,
operator);
}
}
@Service
public static class ItemAPI extends API {
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
ItemDTO[] itemDTOs =
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
ItemDTO[].class, appId, clusterName, namespaceName);
return Arrays.asList(itemDTOs);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
ItemDTO[] itemDTOs =
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/deleted",
ItemDTO[].class, appId, clusterName, namespaceName);
return Arrays.asList(itemDTOs);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}",
ItemDTO.class, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
return restTemplate.get(env, "items/{itemId}", ItemDTO.class, itemId);
}
public void updateItemsByChangeSet(String appId, Env env, String clusterName, String namespace,
ItemChangeSets changeSets) {
restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset",
changeSets, Void.class, appId, clusterName, namespace);
}
public void updateItem(String appId, Env env, String clusterName, String namespace, long itemId, ItemDTO item) {
restTemplate.put(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}",
item, appId, clusterName, namespace, itemId);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespace, ItemDTO item) {
return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
item, ItemDTO.class, appId, clusterName, namespace);
}
public void deleteItem(Env env, long itemId, String operator) {
restTemplate.delete(env, "items/{itemId}?operator={operator}", itemId, operator);
}
}
@Service
public static class ClusterAPI extends API {
public List<ClusterDTO> findClustersByApp(String appId, Env env) {
ClusterDTO[] clusterDTOs = restTemplate.get(env, "apps/{appId}/clusters", ClusterDTO[].class,
appId);
return Arrays.asList(clusterDTOs);
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}", ClusterDTO.class,
appId, clusterName);
}
public boolean isClusterUnique(String appId, Env env, String clusterName) {
return restTemplate
.get(env, "apps/{appId}/cluster/{clusterName}/unique", Boolean.class,
appId, clusterName);
}
public ClusterDTO create(Env env, ClusterDTO cluster) {
return restTemplate.post(env, "apps/{appId}/clusters", cluster, ClusterDTO.class,
cluster.getAppId());
}
public void delete(Env env, String appId, String clusterName, String operator) {
restTemplate.delete(env, "apps/{appId}/clusters/{clusterName}?operator={operator}", appId, clusterName, operator);
}
}
@Service
public static class AccessKeyAPI extends API {
public AccessKeyDTO create(Env env, AccessKeyDTO accessKey) {
return restTemplate.post(env, "apps/{appId}/accesskeys",
accessKey, AccessKeyDTO.class, accessKey.getAppId());
}
public List<AccessKeyDTO> findByAppId(Env env, String appId) {
AccessKeyDTO[] accessKeys = restTemplate.get(env, "apps/{appId}/accesskeys",
AccessKeyDTO[].class, appId);
return Arrays.asList(accessKeys);
}
public void delete(Env env, String appId, long id, String operator) {
restTemplate.delete(env, "apps/{appId}/accesskeys/{id}?operator={operator}",
appId, id, operator);
}
public void enable(Env env, String appId, long id, String operator) {
restTemplate.put(env, "apps/{appId}/accesskeys/{id}/enable?operator={operator}",
null, appId, id, operator);
}
public void disable(Env env, String appId, long id, String operator) {
restTemplate.put(env, "apps/{appId}/accesskeys/{id}/disable?operator={operator}",
null, appId, id, operator);
}
}
@Service
public static class ReleaseAPI extends API {
private static final Joiner JOINER = Joiner.on(",");
public ReleaseDTO loadRelease(Env env, long releaseId) {
return restTemplate.get(env, "releases/{releaseId}", ReleaseDTO.class, releaseId);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
if (CollectionUtils.isEmpty(releaseIds)) {
return Collections.emptyList();
}
ReleaseDTO[]
releases =
restTemplate.get(env, "/releases?releaseIds={releaseIds}", ReleaseDTO[].class, JOINER.join(releaseIds));
return Arrays.asList(releases);
}
public List<ReleaseDTO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
ReleaseDTO[] releaseDTOs = restTemplate.get(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all?page={page}&size={size}",
ReleaseDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(releaseDTOs);
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName,
int page,
int size) {
ReleaseDTO[] releaseDTOs = restTemplate.get(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active?page={page}&size={size}",
ReleaseDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(releaseDTOs);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName,
String namespace) {
ReleaseDTO releaseDTO = restTemplate
.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest",
ReleaseDTO.class, appId, clusterName, namespace);
return releaseDTO;
}
public ReleaseDTO createRelease(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String operator,
boolean isEmergencyPublish) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.add("name", releaseName);
parameters.add("comment", releaseComment);
parameters.add("operator", operator);
parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
HttpEntity<MultiValueMap<String, String>> entity =
new HttpEntity<>(parameters, headers);
ReleaseDTO response = restTemplate.post(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases", entity,
ReleaseDTO.class, appId, clusterName, namespace);
return response;
}
public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String operator,
boolean isEmergencyPublish, Set<String> grayDelKeys) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.add("releaseName", releaseName);
parameters.add("comment", releaseComment);
parameters.add("operator", operator);
parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
grayDelKeys.forEach(key -> parameters.add("grayDelKeys",key));
HttpEntity<MultiValueMap<String, String>> entity =
new HttpEntity<>(parameters, headers);
ReleaseDTO response = restTemplate.post(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/gray-del-releases", entity,
ReleaseDTO.class, appId, clusterName, namespace);
return response;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return restTemplate.post(env,
"apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/updateAndPublish?"
+ "releaseName={releaseName}&releaseComment={releaseComment}&branchName={branchName}"
+ "&deleteBranch={deleteBranch}&isEmergencyPublish={isEmergencyPublish}",
changeSets, ReleaseDTO.class, appId, clusterName, namespace,
releaseName, releaseComment, branchName, deleteBranch, isEmergencyPublish);
}
public void rollback(Env env, long releaseId, String operator) {
restTemplate.put(env,
"releases/{releaseId}/rollback?operator={operator}",
null, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
restTemplate.put(env,
"releases/{releaseId}/rollback?toReleaseId={toReleaseId}&operator={operator}",
null, releaseId, toReleaseId, operator);
}
}
@Service
public static class CommitAPI extends API {
public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) {
CommitDTO[] commitDTOs = restTemplate.get(env,
"apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit?page={page}&size={size}",
CommitDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(commitDTOs);
}
}
@Service
public static class NamespaceLockAPI extends API {
public NamespaceLockDTO getNamespaceLockOwner(String appId, Env env, String clusterName, String namespaceName) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock",
NamespaceLockDTO.class,
appId, clusterName, namespaceName);
}
}
@Service
public static class InstanceAPI extends API {
private Joiner joiner = Joiner.on(",");
private ParameterizedTypeReference<PageDTO<InstanceDTO>>
pageInstanceDtoType =
new ParameterizedTypeReference<PageDTO<InstanceDTO>>() {
};
public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size) {
ResponseEntity<PageDTO<InstanceDTO>>
entity =
restTemplate
.get(env, "/instances/by-release?releaseId={releaseId}&page={page}&size={size}", pageInstanceDtoType,
releaseId, page, size);
return entity.getBody();
}
public List<InstanceDTO> getByReleasesNotIn(String appId, Env env, String clusterName, String namespaceName,
Set<Long> releaseIds) {
InstanceDTO[]
instanceDTOs =
restTemplate.get(env,
"/instances/by-namespace-and-releases-not-in?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}&releaseIds={releaseIds}",
InstanceDTO[].class, appId, clusterName, namespaceName, joiner.join(releaseIds));
return Arrays.asList(instanceDTOs);
}
public PageDTO<InstanceDTO> getByNamespace(String appId, Env env, String clusterName, String namespaceName,
String instanceAppId,
int page, int size) {
ResponseEntity<PageDTO<InstanceDTO>>
entity =
restTemplate.get(env,
"/instances/by-namespace?appId={appId}"
+ "&clusterName={clusterName}&namespaceName={namespaceName}&instanceAppId={instanceAppId}"
+ "&page={page}&size={size}",
pageInstanceDtoType, appId, clusterName, namespaceName, instanceAppId, page, size);
return entity.getBody();
}
public int getInstanceCountByNamespace(String appId, Env env, String clusterName, String namespaceName) {
Integer
count =
restTemplate.get(env,
"/instances/by-namespace/count?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}",
Integer.class, appId, clusterName, namespaceName);
if (count == null) {
return 0;
}
return count;
}
}
@Service
public static class NamespaceBranchAPI extends API {
public NamespaceDTO createBranch(String appId, Env env, String clusterName,
String namespaceName, String operator) {
return restTemplate
.post(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches?operator={operator}",
null, NamespaceDTO.class, appId, clusterName, namespaceName, operator);
}
public NamespaceDTO findBranch(String appId, Env env, String clusterName,
String namespaceName) {
return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public GrayReleaseRuleDTO findBranchGrayRules(String appId, Env env, String clusterName,
String namespaceName, String branchName) {
return restTemplate
.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules",
GrayReleaseRuleDTO.class, appId, clusterName, namespaceName, branchName);
}
public void updateBranchGrayRules(String appId, Env env, String clusterName,
String namespaceName, String branchName, GrayReleaseRuleDTO rules) {
restTemplate
.put(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules",
rules, appId, clusterName, namespaceName, branchName);
}
public void deleteBranch(String appId, Env env, String clusterName,
String namespaceName, String branchName, String operator) {
restTemplate.delete(env,
"/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}?operator={operator}",
appId, clusterName, namespaceName, branchName, operator);
}
}
@Service
public static class ReleaseHistoryAPI extends API {
private ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>> type =
new ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>>() {
};
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(String appId, Env env, String clusterName,
String namespaceName, int page, int size) {
return restTemplate.get(env,
"/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories?page={page}&size={size}",
type, appId, clusterName, namespaceName, page, size).getBody();
}
public PageDTO<ReleaseHistoryDTO> findByReleaseIdAndOperation(Env env, long releaseId, int operation, int page,
int size) {
return restTemplate.get(env,
"/releases/histories/by_release_id_and_operation?releaseId={releaseId}&operation={operation}&page={page}&size={size}",
type, releaseId, operation, page, size).getBody();
}
public PageDTO<ReleaseHistoryDTO> findByPreviousReleaseIdAndOperation(Env env, long previousReleaseId,
int operation, int page, int size) {
return restTemplate.get(env,
"/releases/histories/by_previous_release_id_and_operation?previousReleaseId={releaseId}&operation={operation}&page={page}&size={size}",
type, previousReleaseId, operation, page, size).getBody();
}
}
}
| /*
* 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.api;
import com.ctrip.framework.apollo.common.dto.*;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.google.common.base.Joiner;
import org.springframework.boot.actuate.health.Health;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.util.*;
@Service
public class AdminServiceAPI {
@Service
public static class HealthAPI extends API {
public Health health(Env env) {
return restTemplate.get(env, "/health", Health.class);
}
}
@Service
public static class AppAPI extends API {
public AppDTO loadApp(Env env, String appId) {
return restTemplate.get(env, "apps/{appId}", AppDTO.class, appId);
}
public AppDTO createApp(Env env, AppDTO app) {
return restTemplate.post(env, "apps", app, AppDTO.class);
}
public void updateApp(Env env, AppDTO app) {
restTemplate.put(env, "apps/{appId}", app, app.getAppId());
}
public void deleteApp(Env env, String appId, String operator) {
restTemplate.delete(env, "/apps/{appId}?operator={operator}", appId, operator);
}
}
@Service
public static class NamespaceAPI extends API {
private ParameterizedTypeReference<Map<String, Boolean>>
typeReference = new ParameterizedTypeReference<Map<String, Boolean>>() {
};
public List<NamespaceDTO> findNamespaceByCluster(String appId, Env env, String clusterName) {
NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces",
NamespaceDTO[].class, appId,
clusterName);
return Arrays.asList(namespaceDTOs);
}
public NamespaceDTO loadNamespace(String appId, Env env, String clusterName,
String namespaceName) {
return
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public NamespaceDTO findPublicNamespaceForAssociatedNamespace(Env env, String appId, String clusterName,
String namespaceName) {
return
restTemplate
.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/associated-public-namespace",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) {
return restTemplate
.post(env, "apps/{appId}/clusters/{clusterName}/namespaces", namespace, NamespaceDTO.class,
namespace.getAppId(), namespace.getClusterName());
}
public AppNamespaceDTO createAppNamespace(Env env, AppNamespaceDTO appNamespace) {
return restTemplate
.post(env, "apps/{appId}/appnamespaces", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId());
}
public AppNamespaceDTO createMissingAppNamespace(Env env, AppNamespaceDTO appNamespace) {
return restTemplate
.post(env, "apps/{appId}/appnamespaces?silentCreation=true", appNamespace, AppNamespaceDTO.class,
appNamespace.getAppId());
}
public List<AppNamespaceDTO> getAppNamespaces(String appId, Env env) {
AppNamespaceDTO[] appNamespaceDTOs = restTemplate.get(env, "apps/{appId}/appnamespaces", AppNamespaceDTO[].class, appId);
return Arrays.asList(appNamespaceDTOs);
}
public void deleteNamespace(Env env, String appId, String clusterName, String namespaceName, String operator) {
restTemplate
.delete(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}?operator={operator}", appId,
clusterName,
namespaceName, operator);
}
public Map<String, Boolean> getNamespacePublishInfo(Env env, String appId) {
return restTemplate.get(env, "apps/{appId}/namespaces/publish_info", typeReference, appId).getBody();
}
public List<NamespaceDTO> getPublicAppNamespaceAllNamespaces(Env env, String publicNamespaceName,
int page, int size) {
NamespaceDTO[] namespaceDTOs =
restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/namespaces?page={page}&size={size}",
NamespaceDTO[].class, publicNamespaceName, page, size);
return Arrays.asList(namespaceDTOs);
}
public int countPublicAppNamespaceAssociatedNamespaces(Env env, String publicNamesapceName) {
Integer count =
restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/associated-namespaces/count", Integer.class,
publicNamesapceName);
return count == null ? 0 : count;
}
public void deleteAppNamespace(Env env, String appId, String namespaceName, String operator) {
restTemplate.delete(env, "/apps/{appId}/appnamespaces/{namespaceName}?operator={operator}", appId, namespaceName,
operator);
}
}
@Service
public static class ItemAPI extends API {
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
ItemDTO[] itemDTOs =
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
ItemDTO[].class, appId, clusterName, namespaceName);
return Arrays.asList(itemDTOs);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
ItemDTO[] itemDTOs =
restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/deleted",
ItemDTO[].class, appId, clusterName, namespaceName);
return Arrays.asList(itemDTOs);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}",
ItemDTO.class, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
return restTemplate.get(env, "items/{itemId}", ItemDTO.class, itemId);
}
public void updateItemsByChangeSet(String appId, Env env, String clusterName, String namespace,
ItemChangeSets changeSets) {
restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset",
changeSets, Void.class, appId, clusterName, namespace);
}
public void updateItem(String appId, Env env, String clusterName, String namespace, long itemId, ItemDTO item) {
restTemplate.put(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}",
item, appId, clusterName, namespace, itemId);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespace, ItemDTO item) {
return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
item, ItemDTO.class, appId, clusterName, namespace);
}
public void deleteItem(Env env, long itemId, String operator) {
restTemplate.delete(env, "items/{itemId}?operator={operator}", itemId, operator);
}
}
@Service
public static class ClusterAPI extends API {
public List<ClusterDTO> findClustersByApp(String appId, Env env) {
ClusterDTO[] clusterDTOs = restTemplate.get(env, "apps/{appId}/clusters", ClusterDTO[].class,
appId);
return Arrays.asList(clusterDTOs);
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}", ClusterDTO.class,
appId, clusterName);
}
public boolean isClusterUnique(String appId, Env env, String clusterName) {
return restTemplate
.get(env, "apps/{appId}/cluster/{clusterName}/unique", Boolean.class,
appId, clusterName);
}
public ClusterDTO create(Env env, ClusterDTO cluster) {
return restTemplate.post(env, "apps/{appId}/clusters", cluster, ClusterDTO.class,
cluster.getAppId());
}
public void delete(Env env, String appId, String clusterName, String operator) {
restTemplate.delete(env, "apps/{appId}/clusters/{clusterName}?operator={operator}", appId, clusterName, operator);
}
}
@Service
public static class AccessKeyAPI extends API {
public AccessKeyDTO create(Env env, AccessKeyDTO accessKey) {
return restTemplate.post(env, "apps/{appId}/accesskeys",
accessKey, AccessKeyDTO.class, accessKey.getAppId());
}
public List<AccessKeyDTO> findByAppId(Env env, String appId) {
AccessKeyDTO[] accessKeys = restTemplate.get(env, "apps/{appId}/accesskeys",
AccessKeyDTO[].class, appId);
return Arrays.asList(accessKeys);
}
public void delete(Env env, String appId, long id, String operator) {
restTemplate.delete(env, "apps/{appId}/accesskeys/{id}?operator={operator}",
appId, id, operator);
}
public void enable(Env env, String appId, long id, String operator) {
restTemplate.put(env, "apps/{appId}/accesskeys/{id}/enable?operator={operator}",
null, appId, id, operator);
}
public void disable(Env env, String appId, long id, String operator) {
restTemplate.put(env, "apps/{appId}/accesskeys/{id}/disable?operator={operator}",
null, appId, id, operator);
}
}
@Service
public static class ReleaseAPI extends API {
private static final Joiner JOINER = Joiner.on(",");
public ReleaseDTO loadRelease(Env env, long releaseId) {
return restTemplate.get(env, "releases/{releaseId}", ReleaseDTO.class, releaseId);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
if (CollectionUtils.isEmpty(releaseIds)) {
return Collections.emptyList();
}
ReleaseDTO[]
releases =
restTemplate.get(env, "/releases?releaseIds={releaseIds}", ReleaseDTO[].class, JOINER.join(releaseIds));
return Arrays.asList(releases);
}
public List<ReleaseDTO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
ReleaseDTO[] releaseDTOs = restTemplate.get(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all?page={page}&size={size}",
ReleaseDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(releaseDTOs);
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName,
int page,
int size) {
ReleaseDTO[] releaseDTOs = restTemplate.get(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active?page={page}&size={size}",
ReleaseDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(releaseDTOs);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName,
String namespace) {
ReleaseDTO releaseDTO = restTemplate
.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest",
ReleaseDTO.class, appId, clusterName, namespace);
return releaseDTO;
}
public ReleaseDTO createRelease(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String operator,
boolean isEmergencyPublish) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.add("name", releaseName);
parameters.add("comment", releaseComment);
parameters.add("operator", operator);
parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
HttpEntity<MultiValueMap<String, String>> entity =
new HttpEntity<>(parameters, headers);
ReleaseDTO response = restTemplate.post(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases", entity,
ReleaseDTO.class, appId, clusterName, namespace);
return response;
}
public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String operator,
boolean isEmergencyPublish, Set<String> grayDelKeys) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.add("releaseName", releaseName);
parameters.add("comment", releaseComment);
parameters.add("operator", operator);
parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish));
grayDelKeys.forEach(key -> parameters.add("grayDelKeys",key));
HttpEntity<MultiValueMap<String, String>> entity =
new HttpEntity<>(parameters, headers);
ReleaseDTO response = restTemplate.post(
env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/gray-del-releases", entity,
ReleaseDTO.class, appId, clusterName, namespace);
return response;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespace,
String releaseName, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return restTemplate.post(env,
"apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/updateAndPublish?"
+ "releaseName={releaseName}&releaseComment={releaseComment}&branchName={branchName}"
+ "&deleteBranch={deleteBranch}&isEmergencyPublish={isEmergencyPublish}",
changeSets, ReleaseDTO.class, appId, clusterName, namespace,
releaseName, releaseComment, branchName, deleteBranch, isEmergencyPublish);
}
public void rollback(Env env, long releaseId, String operator) {
restTemplate.put(env,
"releases/{releaseId}/rollback?operator={operator}",
null, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
restTemplate.put(env,
"releases/{releaseId}/rollback?toReleaseId={toReleaseId}&operator={operator}",
null, releaseId, toReleaseId, operator);
}
}
@Service
public static class CommitAPI extends API {
public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) {
CommitDTO[] commitDTOs = restTemplate.get(env,
"apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit?page={page}&size={size}",
CommitDTO[].class,
appId, clusterName, namespaceName, page, size);
return Arrays.asList(commitDTOs);
}
}
@Service
public static class NamespaceLockAPI extends API {
public NamespaceLockDTO getNamespaceLockOwner(String appId, Env env, String clusterName, String namespaceName) {
return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock",
NamespaceLockDTO.class,
appId, clusterName, namespaceName);
}
}
@Service
public static class InstanceAPI extends API {
private Joiner joiner = Joiner.on(",");
private ParameterizedTypeReference<PageDTO<InstanceDTO>>
pageInstanceDtoType =
new ParameterizedTypeReference<PageDTO<InstanceDTO>>() {
};
public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size) {
ResponseEntity<PageDTO<InstanceDTO>>
entity =
restTemplate
.get(env, "/instances/by-release?releaseId={releaseId}&page={page}&size={size}", pageInstanceDtoType,
releaseId, page, size);
return entity.getBody();
}
public List<InstanceDTO> getByReleasesNotIn(String appId, Env env, String clusterName, String namespaceName,
Set<Long> releaseIds) {
InstanceDTO[]
instanceDTOs =
restTemplate.get(env,
"/instances/by-namespace-and-releases-not-in?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}&releaseIds={releaseIds}",
InstanceDTO[].class, appId, clusterName, namespaceName, joiner.join(releaseIds));
return Arrays.asList(instanceDTOs);
}
public PageDTO<InstanceDTO> getByNamespace(String appId, Env env, String clusterName, String namespaceName,
String instanceAppId,
int page, int size) {
ResponseEntity<PageDTO<InstanceDTO>>
entity =
restTemplate.get(env,
"/instances/by-namespace?appId={appId}"
+ "&clusterName={clusterName}&namespaceName={namespaceName}&instanceAppId={instanceAppId}"
+ "&page={page}&size={size}",
pageInstanceDtoType, appId, clusterName, namespaceName, instanceAppId, page, size);
return entity.getBody();
}
public int getInstanceCountByNamespace(String appId, Env env, String clusterName, String namespaceName) {
Integer
count =
restTemplate.get(env,
"/instances/by-namespace/count?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}",
Integer.class, appId, clusterName, namespaceName);
if (count == null) {
return 0;
}
return count;
}
}
@Service
public static class NamespaceBranchAPI extends API {
public NamespaceDTO createBranch(String appId, Env env, String clusterName,
String namespaceName, String operator) {
return restTemplate
.post(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches?operator={operator}",
null, NamespaceDTO.class, appId, clusterName, namespaceName, operator);
}
public NamespaceDTO findBranch(String appId, Env env, String clusterName,
String namespaceName) {
return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches",
NamespaceDTO.class, appId, clusterName, namespaceName);
}
public GrayReleaseRuleDTO findBranchGrayRules(String appId, Env env, String clusterName,
String namespaceName, String branchName) {
return restTemplate
.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules",
GrayReleaseRuleDTO.class, appId, clusterName, namespaceName, branchName);
}
public void updateBranchGrayRules(String appId, Env env, String clusterName,
String namespaceName, String branchName, GrayReleaseRuleDTO rules) {
restTemplate
.put(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules",
rules, appId, clusterName, namespaceName, branchName);
}
public void deleteBranch(String appId, Env env, String clusterName,
String namespaceName, String branchName, String operator) {
restTemplate.delete(env,
"/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}?operator={operator}",
appId, clusterName, namespaceName, branchName, operator);
}
}
@Service
public static class ReleaseHistoryAPI extends API {
private ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>> type =
new ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>>() {
};
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(String appId, Env env, String clusterName,
String namespaceName, int page, int size) {
return restTemplate.get(env,
"/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories?page={page}&size={size}",
type, appId, clusterName, namespaceName, page, size).getBody();
}
public PageDTO<ReleaseHistoryDTO> findByReleaseIdAndOperation(Env env, long releaseId, int operation, int page,
int size) {
return restTemplate.get(env,
"/releases/histories/by_release_id_and_operation?releaseId={releaseId}&operation={operation}&page={page}&size={size}",
type, releaseId, operation, page, size).getBody();
}
public PageDTO<ReleaseHistoryDTO> findByPreviousReleaseIdAndOperation(Env env, long previousReleaseId,
int operation, int page, int size) {
return restTemplate.get(env,
"/releases/histories/by_previous_release_id_and_operation?previousReleaseId={releaseId}&operation={operation}&page={page}&size={size}",
type, previousReleaseId, operation, page, size).getBody();
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/internals/PropertiesCompatibleFileConfigRepository.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 java.util.Properties;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.google.common.base.Preconditions;
public class PropertiesCompatibleFileConfigRepository extends AbstractConfigRepository implements
ConfigFileChangeListener {
private final PropertiesCompatibleConfigFile configFile;
private volatile Properties cachedProperties;
public PropertiesCompatibleFileConfigRepository(PropertiesCompatibleConfigFile configFile) {
this.configFile = configFile;
this.configFile.addChangeListener(this);
this.trySync();
}
@Override
protected synchronized void sync() {
Properties current = configFile.asProperties();
Preconditions.checkState(current != null, "PropertiesCompatibleConfigFile.asProperties should never return null");
if (cachedProperties != current) {
cachedProperties = current;
this.fireRepositoryChange(configFile.getNamespace(), cachedProperties);
}
}
@Override
public Properties getConfig() {
if (cachedProperties == null) {
sync();
}
return cachedProperties;
}
@Override
public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
//config file is the upstream, so no need to set up extra upstream
}
@Override
public ConfigSourceType getSourceType() {
return configFile.getSourceType();
}
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
this.trySync();
}
}
| /*
* 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 java.util.Properties;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.google.common.base.Preconditions;
public class PropertiesCompatibleFileConfigRepository extends AbstractConfigRepository implements
ConfigFileChangeListener {
private final PropertiesCompatibleConfigFile configFile;
private volatile Properties cachedProperties;
public PropertiesCompatibleFileConfigRepository(PropertiesCompatibleConfigFile configFile) {
this.configFile = configFile;
this.configFile.addChangeListener(this);
this.trySync();
}
@Override
protected synchronized void sync() {
Properties current = configFile.asProperties();
Preconditions.checkState(current != null, "PropertiesCompatibleConfigFile.asProperties should never return null");
if (cachedProperties != current) {
cachedProperties = current;
this.fireRepositoryChange(configFile.getNamespace(), cachedProperties);
}
}
@Override
public Properties getConfig() {
if (cachedProperties == null) {
sync();
}
return cachedProperties;
}
@Override
public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
//config file is the upstream, so no need to set up extra upstream
}
@Override
public ConfigSourceType getSourceType() {
return configFile.getSourceType();
}
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
this.trySync();
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/controller/SystemInfoController.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.Apollo;
import com.ctrip.framework.apollo.portal.environment.PortalMetaDomainService;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PortalSettings;
import com.ctrip.framework.apollo.portal.component.RestTemplateFactory;
import com.ctrip.framework.apollo.portal.entity.vo.EnvironmentInfo;
import com.ctrip.framework.apollo.portal.entity.vo.SystemInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.health.Health;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.util.List;
@RestController
@RequestMapping("/system-info")
public class SystemInfoController {
private static final Logger logger = LoggerFactory.getLogger(SystemInfoController.class);
private static final String CONFIG_SERVICE_URL_PATH = "/services/config";
private static final String ADMIN_SERVICE_URL_PATH = "/services/admin";
private RestTemplate restTemplate;
private final PortalSettings portalSettings;
private final RestTemplateFactory restTemplateFactory;
private final PortalMetaDomainService portalMetaDomainService;
public SystemInfoController(
final PortalSettings portalSettings,
final RestTemplateFactory restTemplateFactory,
final PortalMetaDomainService portalMetaDomainService
) {
this.portalSettings = portalSettings;
this.restTemplateFactory = restTemplateFactory;
this.portalMetaDomainService = portalMetaDomainService;
}
@PostConstruct
private void init() {
restTemplate = restTemplateFactory.getObject();
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@GetMapping
public SystemInfo getSystemInfo() {
SystemInfo systemInfo = new SystemInfo();
String version = Apollo.VERSION;
if (isValidVersion(version)) {
systemInfo.setVersion(version);
}
List<Env> allEnvList = portalSettings.getAllEnvs();
for (Env env : allEnvList) {
EnvironmentInfo environmentInfo = adaptEnv2EnvironmentInfo(env);
systemInfo.addEnvironment(environmentInfo);
}
return systemInfo;
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@GetMapping(value = "/health")
public Health checkHealth(@RequestParam String instanceId) {
List<Env> allEnvs = portalSettings.getAllEnvs();
ServiceDTO service = null;
for (final Env env : allEnvs) {
EnvironmentInfo envInfo = adaptEnv2EnvironmentInfo(env);
if (envInfo.getAdminServices() != null) {
for (final ServiceDTO s : envInfo.getAdminServices()) {
if (instanceId.equals(s.getInstanceId())) {
service = s;
break;
}
}
}
if (envInfo.getConfigServices() != null) {
for (final ServiceDTO s : envInfo.getConfigServices()) {
if (instanceId.equals(s.getInstanceId())) {
service = s;
break;
}
}
}
}
if (service == null) {
throw new IllegalArgumentException("No such instance of instanceId: " + instanceId);
}
return restTemplate.getForObject(service.getHomepageUrl() + "/health", Health.class);
}
private EnvironmentInfo adaptEnv2EnvironmentInfo(final Env env) {
EnvironmentInfo environmentInfo = new EnvironmentInfo();
String metaServerAddresses = portalMetaDomainService.getMetaServerAddress(env);
environmentInfo.setEnv(env);
environmentInfo.setActive(portalSettings.isEnvActive(env));
environmentInfo.setMetaServerAddress(metaServerAddresses);
String selectedMetaServerAddress = portalMetaDomainService.getDomain(env);
try {
environmentInfo.setConfigServices(getServerAddress(selectedMetaServerAddress, CONFIG_SERVICE_URL_PATH));
environmentInfo.setAdminServices(getServerAddress(selectedMetaServerAddress, ADMIN_SERVICE_URL_PATH));
} catch (Throwable ex) {
String errorMessage = "Loading config/admin services from meta server: " + selectedMetaServerAddress + " failed!";
logger.error(errorMessage, ex);
environmentInfo.setErrorMessage(errorMessage + " Exception: " + ex.getMessage());
}
return environmentInfo;
}
private ServiceDTO[] getServerAddress(String metaServerAddress, String path) {
String url = metaServerAddress + path;
return restTemplate.getForObject(url, ServiceDTO[].class);
}
private boolean isValidVersion(String version) {
return !version.equals("java-null");
}
}
| /*
* 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.Apollo;
import com.ctrip.framework.apollo.portal.environment.PortalMetaDomainService;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PortalSettings;
import com.ctrip.framework.apollo.portal.component.RestTemplateFactory;
import com.ctrip.framework.apollo.portal.entity.vo.EnvironmentInfo;
import com.ctrip.framework.apollo.portal.entity.vo.SystemInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.health.Health;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.util.List;
@RestController
@RequestMapping("/system-info")
public class SystemInfoController {
private static final Logger logger = LoggerFactory.getLogger(SystemInfoController.class);
private static final String CONFIG_SERVICE_URL_PATH = "/services/config";
private static final String ADMIN_SERVICE_URL_PATH = "/services/admin";
private RestTemplate restTemplate;
private final PortalSettings portalSettings;
private final RestTemplateFactory restTemplateFactory;
private final PortalMetaDomainService portalMetaDomainService;
public SystemInfoController(
final PortalSettings portalSettings,
final RestTemplateFactory restTemplateFactory,
final PortalMetaDomainService portalMetaDomainService
) {
this.portalSettings = portalSettings;
this.restTemplateFactory = restTemplateFactory;
this.portalMetaDomainService = portalMetaDomainService;
}
@PostConstruct
private void init() {
restTemplate = restTemplateFactory.getObject();
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@GetMapping
public SystemInfo getSystemInfo() {
SystemInfo systemInfo = new SystemInfo();
String version = Apollo.VERSION;
if (isValidVersion(version)) {
systemInfo.setVersion(version);
}
List<Env> allEnvList = portalSettings.getAllEnvs();
for (Env env : allEnvList) {
EnvironmentInfo environmentInfo = adaptEnv2EnvironmentInfo(env);
systemInfo.addEnvironment(environmentInfo);
}
return systemInfo;
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@GetMapping(value = "/health")
public Health checkHealth(@RequestParam String instanceId) {
List<Env> allEnvs = portalSettings.getAllEnvs();
ServiceDTO service = null;
for (final Env env : allEnvs) {
EnvironmentInfo envInfo = adaptEnv2EnvironmentInfo(env);
if (envInfo.getAdminServices() != null) {
for (final ServiceDTO s : envInfo.getAdminServices()) {
if (instanceId.equals(s.getInstanceId())) {
service = s;
break;
}
}
}
if (envInfo.getConfigServices() != null) {
for (final ServiceDTO s : envInfo.getConfigServices()) {
if (instanceId.equals(s.getInstanceId())) {
service = s;
break;
}
}
}
}
if (service == null) {
throw new IllegalArgumentException("No such instance of instanceId: " + instanceId);
}
return restTemplate.getForObject(service.getHomepageUrl() + "/health", Health.class);
}
private EnvironmentInfo adaptEnv2EnvironmentInfo(final Env env) {
EnvironmentInfo environmentInfo = new EnvironmentInfo();
String metaServerAddresses = portalMetaDomainService.getMetaServerAddress(env);
environmentInfo.setEnv(env);
environmentInfo.setActive(portalSettings.isEnvActive(env));
environmentInfo.setMetaServerAddress(metaServerAddresses);
String selectedMetaServerAddress = portalMetaDomainService.getDomain(env);
try {
environmentInfo.setConfigServices(getServerAddress(selectedMetaServerAddress, CONFIG_SERVICE_URL_PATH));
environmentInfo.setAdminServices(getServerAddress(selectedMetaServerAddress, ADMIN_SERVICE_URL_PATH));
} catch (Throwable ex) {
String errorMessage = "Loading config/admin services from meta server: " + selectedMetaServerAddress + " failed!";
logger.error(errorMessage, ex);
environmentInfo.setErrorMessage(errorMessage + " Exception: " + ex.getMessage());
}
return environmentInfo;
}
private ServiceDTO[] getServerAddress(String metaServerAddress, String path) {
String url = metaServerAddress + path;
return restTemplate.getForObject(url, ServiceDTO[].class);
}
private boolean isValidVersion(String version) {
return !version.equals("java-null");
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/faq/common-issues-in-deployment-and-development-phase.md | ### 1. windows怎么执行build.sh?
安装[Git Bash](https://git-for-windows.github.io/)，然后运行 “./build.sh” 注意前面 “./”
### 2. 本地运行时Portal一直报Env is down.
默认config service启动在8080端口，admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。
如果还伴有异常信息：org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed，一般是由于本地启动了`ShadowSocks`，因为`ShadowSocks`默认会占用8090端口。
1.1.0版本增加了**系统信息**页面，可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息，有助于排查问题。
### 3. admin server 或者 config server 注册了内网IP，导致portal或者client访问不了admin server或config server
请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
### 4. Portal如何增加环境？
#### 4.1 1.6.0及以上的版本
1.6.0版本增加了自定义环境的功能，可以在不修改代码的情况增加环境
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
#### 4.2 1.5.1及之前的版本
##### 4.2.1 添加Apollo预先定义好的环境
如果需要添加的环境是Apollo预先定义的环境（DEV, FAT, UAT, PRO），需要两步操作：
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
##### 4.2.2 添加自定义的环境
如果需要添加的环境不是Apollo预先定义的环境，请参照如下步骤操作：
1. 假设需要添加的环境名称叫beta
2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类，在其中加入`BETA`枚举：
```java
public enum Env{
LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
...
}
```
3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类，在其中加入`BETA`枚举的转换逻辑：
```java
public final class EnvUtils {
public static Env transformEnv(String envName) {
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
...
case "BETA":
return Env.BETA;
...
default:
return Env.UNKNOWN;
}
}
}
```
4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties)，增加`beta.meta`占位符：
```properties
local.meta=http://localhost:8080
dev.meta=${dev_meta}
fat.meta=${fat_meta}
beta.meta=${beta_meta}
uat.meta=${uat_meta}
lpt.meta=${lpt_meta}
pro.meta=${pro_meta}
```
5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类，增加读取`BETA`环境的meta server地址逻辑：
```java
public class LegacyMetaServerProvider {
...
domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta"));
...
}
```
6. protaldb增加`BETA`环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
7. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
### 5. 如何删除应用、集群、Namespace？
0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面，建议使用该页面进行删除。
页面入口：
页面详情：
### 6. 客户端多块网卡造成获取IP不准，如何解决？
获取客户端网卡逻辑在1.4.0版本有所调整，所以需要根据客户端版本区分
#### 6.1 apollo-client为1.3.0及之前的版本
如果有多网卡，且都是普通网卡的话，需要在/etc/hosts里面加一条映射关系来提升权重。
格式：`ip ${hostname}`
这里的${hostname}就是你在机器上执行hostname的结果。
比如正确IP为：192.168.1.50，hostname执行结果为：jim-ubuntu-pc
那么最终在hosts文件映射的记录为：
```
192.168.1.50 jim-ubuntu-pc
```
#### 6.2 apollo-client为1.4.0及之后的版本
如果有多网卡，且都是普通网卡的话，可以通过调整它们在系统中的顺序来改变优先级，顺序在前的优先级更高。
### 7. 通过Apollo动态调整Spring Boot的Logging level
可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。
### 8. 将Config Service和Admin Service注册到单独的Eureka Server上
Apollo默认自带了Eureka作为内部的注册中心实现，一般情况下不需要考虑为Apollo单独部署注册中心。
不过有些公司自己已经有了一套Eureka，如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话，可以按照如下步骤操作：
#### 1. 配置Config Service不启动内置Eureka Server
##### 1.1 1.5.0及以上版本
为apollo-configservice配置`apollo.eureka.server.enabled=false`即可，通过bootstrap.yml或-D参数等方式皆可。
##### 1.2 1.5.0之前的版本
修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java)，把`@EnableEurekaServer`改为`@EnableEurekaClient`
```java
@EnableEurekaClient
@EnableAspectJAutoProxy
@EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class)
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
...
}
```
#### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`，指向自己的Eureka地址
比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761，那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为：
```
http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/
```
需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可，不需要修改meta server地址。
> 默认情况下，meta service和config service是部署在同一个JVM进程，所以meta service的地址就是config service的地址，修改Eureka地址时不需要修改meta server地址。
### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置
`@ConditionalOnProperty`功能从0.10.0版本开始支持，具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式（推荐）)
### 10. 多机房如何实现A机房的客户端就近读取A机房的config service，B机房的客户端就近读取B机房的config service？
请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294)，该案例中由于中美机房相距甚远，所以需要config db两地部署，如果是同城多机房的话，两个机房的config service可以连同一个config db。
### 11. apollo是否有支持HEAD请求的页面？阿里云slb配置健康检查只支持HEAD请求
apollo的每个服务都有`/health`页面的，该页面是apollo用来做健康检测的，支持各种请求方法，如GET, POST, HEAD等。
### 12. apollo如何配置查看权限?
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
### 13. apollo如何放在独立的tomcat中跑？
有些公司的运维策略可能会要求必须使用独立的tomcat跑应用，不允许apollo默认的startup.sh方式运行，下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中：
1. 获取apollo代码（生产部署建议用release的版本）
2. 修改apollo-configservice的pom.xml，增加`<packaging>war</packaging>`
3. 按照分布式部署文档配置build.sh，然后打包
4. 把apollo-configservice的war包放到tomcat下
* cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war
运行tomcat的startup.sh
5. 运行tomcat的startup.sh
另外，apollo还有一些调优参数建议在tomcat的server.xml中配置一下，可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12)
### 14. 注册中心Eureka如何替换为zookeeper？
许多公司微服务项目已经在使用zookeeper，如果出于方便服务管理的目的，希望Eureka替换为zookeeper的情况，可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤：[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535)
### 15. 本地多人同时开发，如何实现配置不一样且互不影响？
参考[#1560](https://github.com/ctripcorp/apollo/issues/1560)
### 16. Portal挂载到nginx/slb后如何设置相对路径？
一般情况下建议直接使用根目录来挂载portal，不过如果有些情况希望和其它应用共用nginx/slb，需要加上相对路径（如/apollo），那么可以按照下面的方式配置。
#### 16.1 Portal为1.7.0及以上版本
首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/apollo/;
}
```
#### 16.2 Portal为1.6.0及以上版本
首先为portal加上`prefix.path=/apollo`配置参数，配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/;
}
``` | ### 1. windows怎么执行build.sh?
安装[Git Bash](https://git-for-windows.github.io/)，然后运行 “./build.sh” 注意前面 “./”
### 2. 本地运行时Portal一直报Env is down.
默认config service启动在8080端口，admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。
如果还伴有异常信息：org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed，一般是由于本地启动了`ShadowSocks`，因为`ShadowSocks`默认会占用8090端口。
1.1.0版本增加了**系统信息**页面，可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息，有助于排查问题。
### 3. admin server 或者 config server 注册了内网IP，导致portal或者client访问不了admin server或config server
请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
### 4. Portal如何增加环境？
#### 4.1 1.6.0及以上的版本
1.6.0版本增加了自定义环境的功能，可以在不修改代码的情况增加环境
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
#### 4.2 1.5.1及之前的版本
##### 4.2.1 添加Apollo预先定义好的环境
如果需要添加的环境是Apollo预先定义的环境（DEV, FAT, UAT, PRO），需要两步操作：
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
##### 4.2.2 添加自定义的环境
如果需要添加的环境不是Apollo预先定义的环境，请参照如下步骤操作：
1. 假设需要添加的环境名称叫beta
2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类，在其中加入`BETA`枚举：
```java
public enum Env{
LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
...
}
```
3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类，在其中加入`BETA`枚举的转换逻辑：
```java
public final class EnvUtils {
public static Env transformEnv(String envName) {
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
...
case "BETA":
return Env.BETA;
...
default:
return Env.UNKNOWN;
}
}
}
```
4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties)，增加`beta.meta`占位符：
```properties
local.meta=http://localhost:8080
dev.meta=${dev_meta}
fat.meta=${fat_meta}
beta.meta=${beta_meta}
uat.meta=${uat_meta}
lpt.meta=${lpt_meta}
pro.meta=${pro_meta}
```
5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类，增加读取`BETA`环境的meta server地址逻辑：
```java
public class LegacyMetaServerProvider {
...
domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta"));
...
}
```
6. protaldb增加`BETA`环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
7. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
### 5. 如何删除应用、集群、Namespace？
0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面，建议使用该页面进行删除。
页面入口：
页面详情：
### 6. 客户端多块网卡造成获取IP不准，如何解决？
获取客户端网卡逻辑在1.4.0版本有所调整，所以需要根据客户端版本区分
#### 6.1 apollo-client为1.3.0及之前的版本
如果有多网卡，且都是普通网卡的话，需要在/etc/hosts里面加一条映射关系来提升权重。
格式：`ip ${hostname}`
这里的${hostname}就是你在机器上执行hostname的结果。
比如正确IP为：192.168.1.50，hostname执行结果为：jim-ubuntu-pc
那么最终在hosts文件映射的记录为：
```
192.168.1.50 jim-ubuntu-pc
```
#### 6.2 apollo-client为1.4.0及之后的版本
如果有多网卡，且都是普通网卡的话，可以通过调整它们在系统中的顺序来改变优先级，顺序在前的优先级更高。
### 7. 通过Apollo动态调整Spring Boot的Logging level
可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。
### 8. 将Config Service和Admin Service注册到单独的Eureka Server上
Apollo默认自带了Eureka作为内部的注册中心实现，一般情况下不需要考虑为Apollo单独部署注册中心。
不过有些公司自己已经有了一套Eureka，如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话，可以按照如下步骤操作：
#### 1. 配置Config Service不启动内置Eureka Server
##### 1.1 1.5.0及以上版本
为apollo-configservice配置`apollo.eureka.server.enabled=false`即可，通过bootstrap.yml或-D参数等方式皆可。
##### 1.2 1.5.0之前的版本
修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java)，把`@EnableEurekaServer`改为`@EnableEurekaClient`
```java
@EnableEurekaClient
@EnableAspectJAutoProxy
@EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class)
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
...
}
```
#### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`，指向自己的Eureka地址
比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761，那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为：
```
http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/
```
需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可，不需要修改meta server地址。
> 默认情况下，meta service和config service是部署在同一个JVM进程，所以meta service的地址就是config service的地址，修改Eureka地址时不需要修改meta server地址。
### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置
`@ConditionalOnProperty`功能从0.10.0版本开始支持，具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式（推荐）)
### 10. 多机房如何实现A机房的客户端就近读取A机房的config service，B机房的客户端就近读取B机房的config service？
请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294)，该案例中由于中美机房相距甚远，所以需要config db两地部署，如果是同城多机房的话，两个机房的config service可以连同一个config db。
### 11. apollo是否有支持HEAD请求的页面？阿里云slb配置健康检查只支持HEAD请求
apollo的每个服务都有`/health`页面的，该页面是apollo用来做健康检测的，支持各种请求方法，如GET, POST, HEAD等。
### 12. apollo如何配置查看权限?
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
### 13. apollo如何放在独立的tomcat中跑？
有些公司的运维策略可能会要求必须使用独立的tomcat跑应用，不允许apollo默认的startup.sh方式运行，下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中：
1. 获取apollo代码（生产部署建议用release的版本）
2. 修改apollo-configservice的pom.xml，增加`<packaging>war</packaging>`
3. 按照分布式部署文档配置build.sh，然后打包
4. 把apollo-configservice的war包放到tomcat下
* cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war
运行tomcat的startup.sh
5. 运行tomcat的startup.sh
另外，apollo还有一些调优参数建议在tomcat的server.xml中配置一下，可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12)
### 14. 注册中心Eureka如何替换为zookeeper？
许多公司微服务项目已经在使用zookeeper，如果出于方便服务管理的目的，希望Eureka替换为zookeeper的情况，可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤：[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535)
### 15. 本地多人同时开发，如何实现配置不一样且互不影响？
参考[#1560](https://github.com/ctripcorp/apollo/issues/1560)
### 16. Portal挂载到nginx/slb后如何设置相对路径？
一般情况下建议直接使用根目录来挂载portal，不过如果有些情况希望和其它应用共用nginx/slb，需要加上相对路径（如/apollo），那么可以按照下面的方式配置。
#### 16.1 Portal为1.7.0及以上版本
首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/apollo/;
}
```
#### 16.2 Portal为1.6.0及以上版本
首先为portal加上`prefix.path=/apollo`配置参数，配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/;
}
``` | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/ReleaseService.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.service;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.NamespaceLock;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.lang.reflect.Type;
import java.util.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Service
public class ReleaseService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Gson GSON = new Gson();
private static final Set<Integer> BRANCH_RELEASE_OPERATIONS = Sets
.newHashSet(ReleaseOperation.GRAY_RELEASE, ReleaseOperation.MASTER_NORMAL_RELEASE_MERGE_TO_GRAY,
ReleaseOperation.MATER_ROLLBACK_MERGE_TO_GRAY);
private static final Pageable FIRST_ITEM = PageRequest.of(0, 1);
private static final Type OPERATION_CONTEXT_TYPE_REFERENCE = new TypeToken<Map<String, Object>>() { }.getType();
private final ReleaseRepository releaseRepository;
private final ItemService itemService;
private final AuditService auditService;
private final NamespaceLockService namespaceLockService;
private final NamespaceService namespaceService;
private final NamespaceBranchService namespaceBranchService;
private final ReleaseHistoryService releaseHistoryService;
private final ItemSetService itemSetService;
public ReleaseService(
final ReleaseRepository releaseRepository,
final ItemService itemService,
final AuditService auditService,
final NamespaceLockService namespaceLockService,
final NamespaceService namespaceService,
final NamespaceBranchService namespaceBranchService,
final ReleaseHistoryService releaseHistoryService,
final ItemSetService itemSetService) {
this.releaseRepository = releaseRepository;
this.itemService = itemService;
this.auditService = auditService;
this.namespaceLockService = namespaceLockService;
this.namespaceService = namespaceService;
this.namespaceBranchService = namespaceBranchService;
this.releaseHistoryService = releaseHistoryService;
this.itemSetService = itemSetService;
}
public Release findOne(long releaseId) {
return releaseRepository.findById(releaseId).orElse(null);
}
public Release findActiveOne(long releaseId) {
return releaseRepository.findByIdAndIsAbandonedFalse(releaseId);
}
public List<Release> findByReleaseIds(Set<Long> releaseIds) {
Iterable<Release> releases = releaseRepository.findAllById(releaseIds);
if (releases == null) {
return Collections.emptyList();
}
return Lists.newArrayList(releases);
}
public List<Release> findByReleaseKeys(Set<String> releaseKeys) {
return releaseRepository.findByReleaseKeyIn(releaseKeys);
}
public Release findLatestActiveRelease(Namespace namespace) {
return findLatestActiveRelease(namespace.getAppId(),
namespace.getClusterName(), namespace.getNamespaceName());
}
public Release findLatestActiveRelease(String appId, String clusterName, String namespaceName) {
return releaseRepository.findFirstByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(appId,
clusterName,
namespaceName);
}
public List<Release> findAllReleases(String appId, String clusterName, String namespaceName, Pageable page) {
List<Release> releases = releaseRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId,
clusterName,
namespaceName,
page);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
public List<Release> findActiveReleases(String appId, String clusterName, String namespaceName, Pageable page) {
List<Release>
releases =
releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(appId, clusterName,
namespaceName,
page);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
private List<Release> findActiveReleasesBetween(String appId, String clusterName, String namespaceName,
long fromReleaseId, long toReleaseId) {
List<Release>
releases =
releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseAndIdBetweenOrderByIdDesc(appId,
clusterName,
namespaceName,
fromReleaseId,
toReleaseId);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
@Transactional
public Release mergeBranchChangeSetsAndRelease(Namespace namespace, String branchName, String releaseName,
String releaseComment, boolean isEmergencyPublish,
ItemChangeSets changeSets) {
checkLock(namespace, isEmergencyPublish, changeSets.getDataChangeLastModifiedBy());
itemSetService.updateSet(namespace, changeSets);
Release branchRelease = findLatestActiveRelease(namespace.getAppId(), branchName, namespace
.getNamespaceName());
long branchReleaseId = branchRelease == null ? 0 : branchRelease.getId();
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Map<String, Object> operationContext = Maps.newLinkedHashMap();
operationContext.put(ReleaseOperationContext.SOURCE_BRANCH, branchName);
operationContext.put(ReleaseOperationContext.BASE_RELEASE_ID, branchReleaseId);
operationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
return masterRelease(namespace, releaseName, releaseComment, operateNamespaceItems,
changeSets.getDataChangeLastModifiedBy(),
ReleaseOperation.GRAY_RELEASE_MERGE_TO_MASTER, operationContext);
}
@Transactional
public Release publish(Namespace namespace, String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish) {
checkLock(namespace, isEmergencyPublish, operator);
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Namespace parentNamespace = namespaceService.findParentNamespace(namespace);
//branch release
if (parentNamespace != null) {
return publishBranchNamespace(parentNamespace, namespace, operateNamespaceItems,
releaseName, releaseComment, operator, isEmergencyPublish);
}
Namespace childNamespace = namespaceService.findChildNamespace(namespace);
Release previousRelease = null;
if (childNamespace != null) {
previousRelease = findLatestActiveRelease(namespace);
}
//master release
Map<String, Object> operationContext = Maps.newLinkedHashMap();
operationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
Release release = masterRelease(namespace, releaseName, releaseComment, operateNamespaceItems,
operator, ReleaseOperation.NORMAL_RELEASE, operationContext);
//merge to branch and auto release
if (childNamespace != null) {
mergeFromMasterAndPublishBranch(namespace, childNamespace, operateNamespaceItems,
releaseName, releaseComment, operator, previousRelease,
release, isEmergencyPublish);
}
return release;
}
private Release publishBranchNamespace(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> childNamespaceItems,
String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) {
Release parentLatestRelease = findLatestActiveRelease(parentNamespace);
Map<String, String> parentConfigurations = parentLatestRelease != null ?
GSON.fromJson(parentLatestRelease.getConfigurations(),
GsonType.CONFIG) : new LinkedHashMap<>();
long baseReleaseId = parentLatestRelease == null ? 0 : parentLatestRelease.getId();
Map<String, String> configsToPublish = mergeConfiguration(parentConfigurations, childNamespaceItems);
if(!(grayDelKeys == null || grayDelKeys.size()==0)){
for (String key : grayDelKeys){
configsToPublish.remove(key);
}
}
return branchRelease(parentNamespace, childNamespace, releaseName, releaseComment,
configsToPublish, baseReleaseId, operator, ReleaseOperation.GRAY_RELEASE, isEmergencyPublish,
childNamespaceItems.keySet());
}
@Transactional
public Release grayDeletionPublish(Namespace namespace, String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) {
checkLock(namespace, isEmergencyPublish, operator);
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Namespace parentNamespace = namespaceService.findParentNamespace(namespace);
//branch release
if (parentNamespace != null) {
return publishBranchNamespace(parentNamespace, namespace, operateNamespaceItems,
releaseName, releaseComment, operator, isEmergencyPublish, grayDelKeys);
}
throw new NotFoundException("Parent namespace not found");
}
private void checkLock(Namespace namespace, boolean isEmergencyPublish, String operator) {
if (!isEmergencyPublish) {
NamespaceLock lock = namespaceLockService.findLock(namespace.getId());
if (lock != null && lock.getDataChangeCreatedBy().equals(operator)) {
throw new BadRequestException("Config can not be published by yourself.");
}
}
}
private void mergeFromMasterAndPublishBranch(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> parentNamespaceItems,
String releaseName, String releaseComment,
String operator, Release masterPreviousRelease,
Release parentRelease, boolean isEmergencyPublish) {
//create release for child namespace
Release childNamespaceLatestActiveRelease = findLatestActiveRelease(childNamespace);
Map<String, String> childReleaseConfiguration;
Collection<String> branchReleaseKeys;
if (childNamespaceLatestActiveRelease != null) {
childReleaseConfiguration = GSON.fromJson(childNamespaceLatestActiveRelease.getConfigurations(), GsonType.CONFIG);
branchReleaseKeys = getBranchReleaseKeys(childNamespaceLatestActiveRelease.getId());
} else {
childReleaseConfiguration = Collections.emptyMap();
branchReleaseKeys = null;
}
Map<String, String> parentNamespaceOldConfiguration = masterPreviousRelease == null ?
null : GSON.fromJson(masterPreviousRelease.getConfigurations(),
GsonType.CONFIG);
Map<String, String> childNamespaceToPublishConfigs =
calculateChildNamespaceToPublishConfiguration(parentNamespaceOldConfiguration, parentNamespaceItems,
childReleaseConfiguration, branchReleaseKeys);
//compare
if (!childNamespaceToPublishConfigs.equals(childReleaseConfiguration)) {
branchRelease(parentNamespace, childNamespace, releaseName, releaseComment,
childNamespaceToPublishConfigs, parentRelease.getId(), operator,
ReleaseOperation.MASTER_NORMAL_RELEASE_MERGE_TO_GRAY, isEmergencyPublish, branchReleaseKeys);
}
}
private Collection<String> getBranchReleaseKeys(long releaseId) {
Page<ReleaseHistory> releaseHistories = releaseHistoryService
.findByReleaseIdAndOperationInOrderByIdDesc(releaseId, BRANCH_RELEASE_OPERATIONS, FIRST_ITEM);
if (!releaseHistories.hasContent()) {
return null;
}
Map<String, Object> operationContext = GSON
.fromJson(releaseHistories.getContent().get(0).getOperationContext(), OPERATION_CONTEXT_TYPE_REFERENCE);
if (operationContext == null || !operationContext.containsKey(ReleaseOperationContext.BRANCH_RELEASE_KEYS)) {
return null;
}
return (Collection<String>) operationContext.get(ReleaseOperationContext.BRANCH_RELEASE_KEYS);
}
private Release publishBranchNamespace(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> childNamespaceItems,
String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish) {
return publishBranchNamespace(parentNamespace, childNamespace, childNamespaceItems, releaseName, releaseComment,
operator, isEmergencyPublish, null);
}
private Release masterRelease(Namespace namespace, String releaseName, String releaseComment,
Map<String, String> configurations, String operator,
int releaseOperation, Map<String, Object> operationContext) {
Release lastActiveRelease = findLatestActiveRelease(namespace);
long previousReleaseId = lastActiveRelease == null ? 0 : lastActiveRelease.getId();
Release release = createRelease(namespace, releaseName, releaseComment,
configurations, operator);
releaseHistoryService.createReleaseHistory(namespace.getAppId(), namespace.getClusterName(),
namespace.getNamespaceName(), namespace.getClusterName(),
release.getId(), previousReleaseId, releaseOperation,
operationContext, operator);
return release;
}
private Release branchRelease(Namespace parentNamespace, Namespace childNamespace,
String releaseName, String releaseComment,
Map<String, String> configurations, long baseReleaseId,
String operator, int releaseOperation, boolean isEmergencyPublish, Collection<String> branchReleaseKeys) {
Release previousRelease = findLatestActiveRelease(childNamespace.getAppId(),
childNamespace.getClusterName(),
childNamespace.getNamespaceName());
long previousReleaseId = previousRelease == null ? 0 : previousRelease.getId();
Map<String, Object> releaseOperationContext = Maps.newLinkedHashMap();
releaseOperationContext.put(ReleaseOperationContext.BASE_RELEASE_ID, baseReleaseId);
releaseOperationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
releaseOperationContext.put(ReleaseOperationContext.BRANCH_RELEASE_KEYS, branchReleaseKeys);
Release release =
createRelease(childNamespace, releaseName, releaseComment, configurations, operator);
//update gray release rules
GrayReleaseRule grayReleaseRule = namespaceBranchService.updateRulesReleaseId(childNamespace.getAppId(),
parentNamespace.getClusterName(),
childNamespace.getNamespaceName(),
childNamespace.getClusterName(),
release.getId(), operator);
if (grayReleaseRule != null) {
releaseOperationContext.put(ReleaseOperationContext.RULES, GrayReleaseRuleItemTransformer
.batchTransformFromJSON(grayReleaseRule.getRules()));
}
releaseHistoryService.createReleaseHistory(parentNamespace.getAppId(), parentNamespace.getClusterName(),
parentNamespace.getNamespaceName(), childNamespace.getClusterName(),
release.getId(),
previousReleaseId, releaseOperation, releaseOperationContext, operator);
return release;
}
private Map<String, String> mergeConfiguration(Map<String, String> baseConfigurations,
Map<String, String> coverConfigurations) {
Map<String, String> result = new LinkedHashMap<>();
//copy base configuration
for (Map.Entry<String, String> entry : baseConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
//update and publish
for (Map.Entry<String, String> entry : coverConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
return result;
}
private Map<String, String> getNamespaceItems(Namespace namespace) {
List<Item> items = itemService.findItemsWithOrdered(namespace.getId());
Map<String, String> configurations = new LinkedHashMap<>();
for (Item item : items) {
if (StringUtils.isEmpty(item.getKey())) {
continue;
}
configurations.put(item.getKey(), item.getValue());
}
return configurations;
}
private Release createRelease(Namespace namespace, String name, String comment,
Map<String, String> configurations, String operator) {
Release release = new Release();
release.setReleaseKey(ReleaseKeyGenerator.generateReleaseKey(namespace));
release.setDataChangeCreatedTime(new Date());
release.setDataChangeCreatedBy(operator);
release.setDataChangeLastModifiedBy(operator);
release.setName(name);
release.setComment(comment);
release.setAppId(namespace.getAppId());
release.setClusterName(namespace.getClusterName());
release.setNamespaceName(namespace.getNamespaceName());
release.setConfigurations(GSON.toJson(configurations));
release = releaseRepository.save(release);
namespaceLockService.unlock(namespace.getId());
auditService.audit(Release.class.getSimpleName(), release.getId(), Audit.OP.INSERT,
release.getDataChangeCreatedBy());
return release;
}
@Transactional
public Release rollback(long releaseId, String operator) {
Release release = findOne(releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
if (release.isAbandoned()) {
throw new BadRequestException("release is not active");
}
String appId = release.getAppId();
String clusterName = release.getClusterName();
String namespaceName = release.getNamespaceName();
PageRequest page = PageRequest.of(0, 2);
List<Release> twoLatestActiveReleases = findActiveReleases(appId, clusterName, namespaceName, page);
if (twoLatestActiveReleases == null || twoLatestActiveReleases.size() < 2) {
throw new BadRequestException(String.format(
"Can't rollback namespace(appId=%s, clusterName=%s, namespaceName=%s) because there is only one active release",
appId,
clusterName,
namespaceName));
}
release.setAbandoned(true);
release.setDataChangeLastModifiedBy(operator);
releaseRepository.save(release);
releaseHistoryService.createReleaseHistory(appId, clusterName,
namespaceName, clusterName, twoLatestActiveReleases.get(1).getId(),
release.getId(), ReleaseOperation.ROLLBACK, null, operator);
//publish child namespace if namespace has child
rollbackChildNamespace(appId, clusterName, namespaceName, twoLatestActiveReleases, operator);
return release;
}
@Transactional
public Release rollbackTo(long releaseId, long toReleaseId, String operator) {
if (releaseId == toReleaseId) {
throw new BadRequestException("current release equal to target release");
}
Release release = findOne(releaseId);
Release toRelease = findOne(toReleaseId);
if (release == null || toRelease == null) {
throw new NotFoundException("release not found");
}
if (release.isAbandoned() || toRelease.isAbandoned()) {
throw new BadRequestException("release is not active");
}
String appId = release.getAppId();
String clusterName = release.getClusterName();
String namespaceName = release.getNamespaceName();
List<Release> releases = findActiveReleasesBetween(appId, clusterName, namespaceName,
toReleaseId, releaseId);
for (int i = 0; i < releases.size() - 1; i++) {
releases.get(i).setAbandoned(true);
releases.get(i).setDataChangeLastModifiedBy(operator);
}
releaseRepository.saveAll(releases);
releaseHistoryService.createReleaseHistory(appId, clusterName,
namespaceName, clusterName, toReleaseId,
release.getId(), ReleaseOperation.ROLLBACK, null, operator);
//publish child namespace if namespace has child
rollbackChildNamespace(appId, clusterName, namespaceName, Lists.newArrayList(release, toRelease), operator);
return release;
}
private void rollbackChildNamespace(String appId, String clusterName, String namespaceName,
List<Release> parentNamespaceTwoLatestActiveRelease, String operator) {
Namespace parentNamespace = namespaceService.findOne(appId, clusterName, namespaceName);
Namespace childNamespace = namespaceService.findChildNamespace(appId, clusterName, namespaceName);
if (parentNamespace == null || childNamespace == null) {
return;
}
Release childNamespaceLatestActiveRelease = findLatestActiveRelease(childNamespace);
Map<String, String> childReleaseConfiguration;
Collection<String> branchReleaseKeys;
if (childNamespaceLatestActiveRelease != null) {
childReleaseConfiguration = GSON.fromJson(childNamespaceLatestActiveRelease.getConfigurations(), GsonType.CONFIG);
branchReleaseKeys = getBranchReleaseKeys(childNamespaceLatestActiveRelease.getId());
} else {
childReleaseConfiguration = Collections.emptyMap();
branchReleaseKeys = null;
}
Release abandonedRelease = parentNamespaceTwoLatestActiveRelease.get(0);
Release parentNamespaceNewLatestRelease = parentNamespaceTwoLatestActiveRelease.get(1);
Map<String, String> parentNamespaceAbandonedConfiguration = GSON.fromJson(abandonedRelease.getConfigurations(),
GsonType.CONFIG);
Map<String, String>
parentNamespaceNewLatestConfiguration =
GSON.fromJson(parentNamespaceNewLatestRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String>
childNamespaceNewConfiguration =
calculateChildNamespaceToPublishConfiguration(parentNamespaceAbandonedConfiguration,
parentNamespaceNewLatestConfiguration, childReleaseConfiguration, branchReleaseKeys);
//compare
if (!childNamespaceNewConfiguration.equals(childReleaseConfiguration)) {
branchRelease(parentNamespace, childNamespace,
TIMESTAMP_FORMAT.format(new Date()) + "-master-rollback-merge-to-gray", "",
childNamespaceNewConfiguration, parentNamespaceNewLatestRelease.getId(), operator,
ReleaseOperation.MATER_ROLLBACK_MERGE_TO_GRAY, false, branchReleaseKeys);
}
}
private Map<String, String> calculateChildNamespaceToPublishConfiguration(
Map<String, String> parentNamespaceOldConfiguration, Map<String, String> parentNamespaceNewConfiguration,
Map<String, String> childNamespaceLatestActiveConfiguration, Collection<String> branchReleaseKeys) {
//first. calculate child namespace modified configs
Map<String, String> childNamespaceModifiedConfiguration = calculateBranchModifiedItemsAccordingToRelease(
parentNamespaceOldConfiguration, childNamespaceLatestActiveConfiguration, branchReleaseKeys);
//second. append child namespace modified configs to parent namespace new latest configuration
return mergeConfiguration(parentNamespaceNewConfiguration, childNamespaceModifiedConfiguration);
}
private Map<String, String> calculateBranchModifiedItemsAccordingToRelease(
Map<String, String> masterReleaseConfigs, Map<String, String> branchReleaseConfigs,
Collection<String> branchReleaseKeys) {
Map<String, String> modifiedConfigs = new LinkedHashMap<>();
if (CollectionUtils.isEmpty(branchReleaseConfigs)) {
return modifiedConfigs;
}
// new logic, retrieve modified configurations based on branch release keys
if (branchReleaseKeys != null) {
for (String branchReleaseKey : branchReleaseKeys) {
if (branchReleaseConfigs.containsKey(branchReleaseKey)) {
modifiedConfigs.put(branchReleaseKey, branchReleaseConfigs.get(branchReleaseKey));
}
}
return modifiedConfigs;
}
// old logic, retrieve modified configurations by comparing branchReleaseConfigs with masterReleaseConfigs
if (CollectionUtils.isEmpty(masterReleaseConfigs)) {
return branchReleaseConfigs;
}
for (Map.Entry<String, String> entry : branchReleaseConfigs.entrySet()) {
if (!Objects.equals(entry.getValue(), masterReleaseConfigs.get(entry.getKey()))) {
modifiedConfigs.put(entry.getKey(), entry.getValue());
}
}
return modifiedConfigs;
}
@Transactional
public int batchDelete(String appId, String clusterName, String namespaceName, String operator) {
return releaseRepository.batchDelete(appId, clusterName, namespaceName, 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.biz.service;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.NamespaceLock;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.lang.reflect.Type;
import java.util.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Service
public class ReleaseService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Gson GSON = new Gson();
private static final Set<Integer> BRANCH_RELEASE_OPERATIONS = Sets
.newHashSet(ReleaseOperation.GRAY_RELEASE, ReleaseOperation.MASTER_NORMAL_RELEASE_MERGE_TO_GRAY,
ReleaseOperation.MATER_ROLLBACK_MERGE_TO_GRAY);
private static final Pageable FIRST_ITEM = PageRequest.of(0, 1);
private static final Type OPERATION_CONTEXT_TYPE_REFERENCE = new TypeToken<Map<String, Object>>() { }.getType();
private final ReleaseRepository releaseRepository;
private final ItemService itemService;
private final AuditService auditService;
private final NamespaceLockService namespaceLockService;
private final NamespaceService namespaceService;
private final NamespaceBranchService namespaceBranchService;
private final ReleaseHistoryService releaseHistoryService;
private final ItemSetService itemSetService;
public ReleaseService(
final ReleaseRepository releaseRepository,
final ItemService itemService,
final AuditService auditService,
final NamespaceLockService namespaceLockService,
final NamespaceService namespaceService,
final NamespaceBranchService namespaceBranchService,
final ReleaseHistoryService releaseHistoryService,
final ItemSetService itemSetService) {
this.releaseRepository = releaseRepository;
this.itemService = itemService;
this.auditService = auditService;
this.namespaceLockService = namespaceLockService;
this.namespaceService = namespaceService;
this.namespaceBranchService = namespaceBranchService;
this.releaseHistoryService = releaseHistoryService;
this.itemSetService = itemSetService;
}
public Release findOne(long releaseId) {
return releaseRepository.findById(releaseId).orElse(null);
}
public Release findActiveOne(long releaseId) {
return releaseRepository.findByIdAndIsAbandonedFalse(releaseId);
}
public List<Release> findByReleaseIds(Set<Long> releaseIds) {
Iterable<Release> releases = releaseRepository.findAllById(releaseIds);
if (releases == null) {
return Collections.emptyList();
}
return Lists.newArrayList(releases);
}
public List<Release> findByReleaseKeys(Set<String> releaseKeys) {
return releaseRepository.findByReleaseKeyIn(releaseKeys);
}
public Release findLatestActiveRelease(Namespace namespace) {
return findLatestActiveRelease(namespace.getAppId(),
namespace.getClusterName(), namespace.getNamespaceName());
}
public Release findLatestActiveRelease(String appId, String clusterName, String namespaceName) {
return releaseRepository.findFirstByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(appId,
clusterName,
namespaceName);
}
public List<Release> findAllReleases(String appId, String clusterName, String namespaceName, Pageable page) {
List<Release> releases = releaseRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId,
clusterName,
namespaceName,
page);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
public List<Release> findActiveReleases(String appId, String clusterName, String namespaceName, Pageable page) {
List<Release>
releases =
releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(appId, clusterName,
namespaceName,
page);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
private List<Release> findActiveReleasesBetween(String appId, String clusterName, String namespaceName,
long fromReleaseId, long toReleaseId) {
List<Release>
releases =
releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseAndIdBetweenOrderByIdDesc(appId,
clusterName,
namespaceName,
fromReleaseId,
toReleaseId);
if (releases == null) {
return Collections.emptyList();
}
return releases;
}
@Transactional
public Release mergeBranchChangeSetsAndRelease(Namespace namespace, String branchName, String releaseName,
String releaseComment, boolean isEmergencyPublish,
ItemChangeSets changeSets) {
checkLock(namespace, isEmergencyPublish, changeSets.getDataChangeLastModifiedBy());
itemSetService.updateSet(namespace, changeSets);
Release branchRelease = findLatestActiveRelease(namespace.getAppId(), branchName, namespace
.getNamespaceName());
long branchReleaseId = branchRelease == null ? 0 : branchRelease.getId();
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Map<String, Object> operationContext = Maps.newLinkedHashMap();
operationContext.put(ReleaseOperationContext.SOURCE_BRANCH, branchName);
operationContext.put(ReleaseOperationContext.BASE_RELEASE_ID, branchReleaseId);
operationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
return masterRelease(namespace, releaseName, releaseComment, operateNamespaceItems,
changeSets.getDataChangeLastModifiedBy(),
ReleaseOperation.GRAY_RELEASE_MERGE_TO_MASTER, operationContext);
}
@Transactional
public Release publish(Namespace namespace, String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish) {
checkLock(namespace, isEmergencyPublish, operator);
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Namespace parentNamespace = namespaceService.findParentNamespace(namespace);
//branch release
if (parentNamespace != null) {
return publishBranchNamespace(parentNamespace, namespace, operateNamespaceItems,
releaseName, releaseComment, operator, isEmergencyPublish);
}
Namespace childNamespace = namespaceService.findChildNamespace(namespace);
Release previousRelease = null;
if (childNamespace != null) {
previousRelease = findLatestActiveRelease(namespace);
}
//master release
Map<String, Object> operationContext = Maps.newLinkedHashMap();
operationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
Release release = masterRelease(namespace, releaseName, releaseComment, operateNamespaceItems,
operator, ReleaseOperation.NORMAL_RELEASE, operationContext);
//merge to branch and auto release
if (childNamespace != null) {
mergeFromMasterAndPublishBranch(namespace, childNamespace, operateNamespaceItems,
releaseName, releaseComment, operator, previousRelease,
release, isEmergencyPublish);
}
return release;
}
private Release publishBranchNamespace(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> childNamespaceItems,
String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) {
Release parentLatestRelease = findLatestActiveRelease(parentNamespace);
Map<String, String> parentConfigurations = parentLatestRelease != null ?
GSON.fromJson(parentLatestRelease.getConfigurations(),
GsonType.CONFIG) : new LinkedHashMap<>();
long baseReleaseId = parentLatestRelease == null ? 0 : parentLatestRelease.getId();
Map<String, String> configsToPublish = mergeConfiguration(parentConfigurations, childNamespaceItems);
if(!(grayDelKeys == null || grayDelKeys.size()==0)){
for (String key : grayDelKeys){
configsToPublish.remove(key);
}
}
return branchRelease(parentNamespace, childNamespace, releaseName, releaseComment,
configsToPublish, baseReleaseId, operator, ReleaseOperation.GRAY_RELEASE, isEmergencyPublish,
childNamespaceItems.keySet());
}
@Transactional
public Release grayDeletionPublish(Namespace namespace, String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) {
checkLock(namespace, isEmergencyPublish, operator);
Map<String, String> operateNamespaceItems = getNamespaceItems(namespace);
Namespace parentNamespace = namespaceService.findParentNamespace(namespace);
//branch release
if (parentNamespace != null) {
return publishBranchNamespace(parentNamespace, namespace, operateNamespaceItems,
releaseName, releaseComment, operator, isEmergencyPublish, grayDelKeys);
}
throw new NotFoundException("Parent namespace not found");
}
private void checkLock(Namespace namespace, boolean isEmergencyPublish, String operator) {
if (!isEmergencyPublish) {
NamespaceLock lock = namespaceLockService.findLock(namespace.getId());
if (lock != null && lock.getDataChangeCreatedBy().equals(operator)) {
throw new BadRequestException("Config can not be published by yourself.");
}
}
}
private void mergeFromMasterAndPublishBranch(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> parentNamespaceItems,
String releaseName, String releaseComment,
String operator, Release masterPreviousRelease,
Release parentRelease, boolean isEmergencyPublish) {
//create release for child namespace
Release childNamespaceLatestActiveRelease = findLatestActiveRelease(childNamespace);
Map<String, String> childReleaseConfiguration;
Collection<String> branchReleaseKeys;
if (childNamespaceLatestActiveRelease != null) {
childReleaseConfiguration = GSON.fromJson(childNamespaceLatestActiveRelease.getConfigurations(), GsonType.CONFIG);
branchReleaseKeys = getBranchReleaseKeys(childNamespaceLatestActiveRelease.getId());
} else {
childReleaseConfiguration = Collections.emptyMap();
branchReleaseKeys = null;
}
Map<String, String> parentNamespaceOldConfiguration = masterPreviousRelease == null ?
null : GSON.fromJson(masterPreviousRelease.getConfigurations(),
GsonType.CONFIG);
Map<String, String> childNamespaceToPublishConfigs =
calculateChildNamespaceToPublishConfiguration(parentNamespaceOldConfiguration, parentNamespaceItems,
childReleaseConfiguration, branchReleaseKeys);
//compare
if (!childNamespaceToPublishConfigs.equals(childReleaseConfiguration)) {
branchRelease(parentNamespace, childNamespace, releaseName, releaseComment,
childNamespaceToPublishConfigs, parentRelease.getId(), operator,
ReleaseOperation.MASTER_NORMAL_RELEASE_MERGE_TO_GRAY, isEmergencyPublish, branchReleaseKeys);
}
}
private Collection<String> getBranchReleaseKeys(long releaseId) {
Page<ReleaseHistory> releaseHistories = releaseHistoryService
.findByReleaseIdAndOperationInOrderByIdDesc(releaseId, BRANCH_RELEASE_OPERATIONS, FIRST_ITEM);
if (!releaseHistories.hasContent()) {
return null;
}
Map<String, Object> operationContext = GSON
.fromJson(releaseHistories.getContent().get(0).getOperationContext(), OPERATION_CONTEXT_TYPE_REFERENCE);
if (operationContext == null || !operationContext.containsKey(ReleaseOperationContext.BRANCH_RELEASE_KEYS)) {
return null;
}
return (Collection<String>) operationContext.get(ReleaseOperationContext.BRANCH_RELEASE_KEYS);
}
private Release publishBranchNamespace(Namespace parentNamespace, Namespace childNamespace,
Map<String, String> childNamespaceItems,
String releaseName, String releaseComment,
String operator, boolean isEmergencyPublish) {
return publishBranchNamespace(parentNamespace, childNamespace, childNamespaceItems, releaseName, releaseComment,
operator, isEmergencyPublish, null);
}
private Release masterRelease(Namespace namespace, String releaseName, String releaseComment,
Map<String, String> configurations, String operator,
int releaseOperation, Map<String, Object> operationContext) {
Release lastActiveRelease = findLatestActiveRelease(namespace);
long previousReleaseId = lastActiveRelease == null ? 0 : lastActiveRelease.getId();
Release release = createRelease(namespace, releaseName, releaseComment,
configurations, operator);
releaseHistoryService.createReleaseHistory(namespace.getAppId(), namespace.getClusterName(),
namespace.getNamespaceName(), namespace.getClusterName(),
release.getId(), previousReleaseId, releaseOperation,
operationContext, operator);
return release;
}
private Release branchRelease(Namespace parentNamespace, Namespace childNamespace,
String releaseName, String releaseComment,
Map<String, String> configurations, long baseReleaseId,
String operator, int releaseOperation, boolean isEmergencyPublish, Collection<String> branchReleaseKeys) {
Release previousRelease = findLatestActiveRelease(childNamespace.getAppId(),
childNamespace.getClusterName(),
childNamespace.getNamespaceName());
long previousReleaseId = previousRelease == null ? 0 : previousRelease.getId();
Map<String, Object> releaseOperationContext = Maps.newLinkedHashMap();
releaseOperationContext.put(ReleaseOperationContext.BASE_RELEASE_ID, baseReleaseId);
releaseOperationContext.put(ReleaseOperationContext.IS_EMERGENCY_PUBLISH, isEmergencyPublish);
releaseOperationContext.put(ReleaseOperationContext.BRANCH_RELEASE_KEYS, branchReleaseKeys);
Release release =
createRelease(childNamespace, releaseName, releaseComment, configurations, operator);
//update gray release rules
GrayReleaseRule grayReleaseRule = namespaceBranchService.updateRulesReleaseId(childNamespace.getAppId(),
parentNamespace.getClusterName(),
childNamespace.getNamespaceName(),
childNamespace.getClusterName(),
release.getId(), operator);
if (grayReleaseRule != null) {
releaseOperationContext.put(ReleaseOperationContext.RULES, GrayReleaseRuleItemTransformer
.batchTransformFromJSON(grayReleaseRule.getRules()));
}
releaseHistoryService.createReleaseHistory(parentNamespace.getAppId(), parentNamespace.getClusterName(),
parentNamespace.getNamespaceName(), childNamespace.getClusterName(),
release.getId(),
previousReleaseId, releaseOperation, releaseOperationContext, operator);
return release;
}
private Map<String, String> mergeConfiguration(Map<String, String> baseConfigurations,
Map<String, String> coverConfigurations) {
Map<String, String> result = new LinkedHashMap<>();
//copy base configuration
for (Map.Entry<String, String> entry : baseConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
//update and publish
for (Map.Entry<String, String> entry : coverConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
return result;
}
private Map<String, String> getNamespaceItems(Namespace namespace) {
List<Item> items = itemService.findItemsWithOrdered(namespace.getId());
Map<String, String> configurations = new LinkedHashMap<>();
for (Item item : items) {
if (StringUtils.isEmpty(item.getKey())) {
continue;
}
configurations.put(item.getKey(), item.getValue());
}
return configurations;
}
private Release createRelease(Namespace namespace, String name, String comment,
Map<String, String> configurations, String operator) {
Release release = new Release();
release.setReleaseKey(ReleaseKeyGenerator.generateReleaseKey(namespace));
release.setDataChangeCreatedTime(new Date());
release.setDataChangeCreatedBy(operator);
release.setDataChangeLastModifiedBy(operator);
release.setName(name);
release.setComment(comment);
release.setAppId(namespace.getAppId());
release.setClusterName(namespace.getClusterName());
release.setNamespaceName(namespace.getNamespaceName());
release.setConfigurations(GSON.toJson(configurations));
release = releaseRepository.save(release);
namespaceLockService.unlock(namespace.getId());
auditService.audit(Release.class.getSimpleName(), release.getId(), Audit.OP.INSERT,
release.getDataChangeCreatedBy());
return release;
}
@Transactional
public Release rollback(long releaseId, String operator) {
Release release = findOne(releaseId);
if (release == null) {
throw new NotFoundException("release not found");
}
if (release.isAbandoned()) {
throw new BadRequestException("release is not active");
}
String appId = release.getAppId();
String clusterName = release.getClusterName();
String namespaceName = release.getNamespaceName();
PageRequest page = PageRequest.of(0, 2);
List<Release> twoLatestActiveReleases = findActiveReleases(appId, clusterName, namespaceName, page);
if (twoLatestActiveReleases == null || twoLatestActiveReleases.size() < 2) {
throw new BadRequestException(String.format(
"Can't rollback namespace(appId=%s, clusterName=%s, namespaceName=%s) because there is only one active release",
appId,
clusterName,
namespaceName));
}
release.setAbandoned(true);
release.setDataChangeLastModifiedBy(operator);
releaseRepository.save(release);
releaseHistoryService.createReleaseHistory(appId, clusterName,
namespaceName, clusterName, twoLatestActiveReleases.get(1).getId(),
release.getId(), ReleaseOperation.ROLLBACK, null, operator);
//publish child namespace if namespace has child
rollbackChildNamespace(appId, clusterName, namespaceName, twoLatestActiveReleases, operator);
return release;
}
@Transactional
public Release rollbackTo(long releaseId, long toReleaseId, String operator) {
if (releaseId == toReleaseId) {
throw new BadRequestException("current release equal to target release");
}
Release release = findOne(releaseId);
Release toRelease = findOne(toReleaseId);
if (release == null || toRelease == null) {
throw new NotFoundException("release not found");
}
if (release.isAbandoned() || toRelease.isAbandoned()) {
throw new BadRequestException("release is not active");
}
String appId = release.getAppId();
String clusterName = release.getClusterName();
String namespaceName = release.getNamespaceName();
List<Release> releases = findActiveReleasesBetween(appId, clusterName, namespaceName,
toReleaseId, releaseId);
for (int i = 0; i < releases.size() - 1; i++) {
releases.get(i).setAbandoned(true);
releases.get(i).setDataChangeLastModifiedBy(operator);
}
releaseRepository.saveAll(releases);
releaseHistoryService.createReleaseHistory(appId, clusterName,
namespaceName, clusterName, toReleaseId,
release.getId(), ReleaseOperation.ROLLBACK, null, operator);
//publish child namespace if namespace has child
rollbackChildNamespace(appId, clusterName, namespaceName, Lists.newArrayList(release, toRelease), operator);
return release;
}
private void rollbackChildNamespace(String appId, String clusterName, String namespaceName,
List<Release> parentNamespaceTwoLatestActiveRelease, String operator) {
Namespace parentNamespace = namespaceService.findOne(appId, clusterName, namespaceName);
Namespace childNamespace = namespaceService.findChildNamespace(appId, clusterName, namespaceName);
if (parentNamespace == null || childNamespace == null) {
return;
}
Release childNamespaceLatestActiveRelease = findLatestActiveRelease(childNamespace);
Map<String, String> childReleaseConfiguration;
Collection<String> branchReleaseKeys;
if (childNamespaceLatestActiveRelease != null) {
childReleaseConfiguration = GSON.fromJson(childNamespaceLatestActiveRelease.getConfigurations(), GsonType.CONFIG);
branchReleaseKeys = getBranchReleaseKeys(childNamespaceLatestActiveRelease.getId());
} else {
childReleaseConfiguration = Collections.emptyMap();
branchReleaseKeys = null;
}
Release abandonedRelease = parentNamespaceTwoLatestActiveRelease.get(0);
Release parentNamespaceNewLatestRelease = parentNamespaceTwoLatestActiveRelease.get(1);
Map<String, String> parentNamespaceAbandonedConfiguration = GSON.fromJson(abandonedRelease.getConfigurations(),
GsonType.CONFIG);
Map<String, String>
parentNamespaceNewLatestConfiguration =
GSON.fromJson(parentNamespaceNewLatestRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String>
childNamespaceNewConfiguration =
calculateChildNamespaceToPublishConfiguration(parentNamespaceAbandonedConfiguration,
parentNamespaceNewLatestConfiguration, childReleaseConfiguration, branchReleaseKeys);
//compare
if (!childNamespaceNewConfiguration.equals(childReleaseConfiguration)) {
branchRelease(parentNamespace, childNamespace,
TIMESTAMP_FORMAT.format(new Date()) + "-master-rollback-merge-to-gray", "",
childNamespaceNewConfiguration, parentNamespaceNewLatestRelease.getId(), operator,
ReleaseOperation.MATER_ROLLBACK_MERGE_TO_GRAY, false, branchReleaseKeys);
}
}
private Map<String, String> calculateChildNamespaceToPublishConfiguration(
Map<String, String> parentNamespaceOldConfiguration, Map<String, String> parentNamespaceNewConfiguration,
Map<String, String> childNamespaceLatestActiveConfiguration, Collection<String> branchReleaseKeys) {
//first. calculate child namespace modified configs
Map<String, String> childNamespaceModifiedConfiguration = calculateBranchModifiedItemsAccordingToRelease(
parentNamespaceOldConfiguration, childNamespaceLatestActiveConfiguration, branchReleaseKeys);
//second. append child namespace modified configs to parent namespace new latest configuration
return mergeConfiguration(parentNamespaceNewConfiguration, childNamespaceModifiedConfiguration);
}
private Map<String, String> calculateBranchModifiedItemsAccordingToRelease(
Map<String, String> masterReleaseConfigs, Map<String, String> branchReleaseConfigs,
Collection<String> branchReleaseKeys) {
Map<String, String> modifiedConfigs = new LinkedHashMap<>();
if (CollectionUtils.isEmpty(branchReleaseConfigs)) {
return modifiedConfigs;
}
// new logic, retrieve modified configurations based on branch release keys
if (branchReleaseKeys != null) {
for (String branchReleaseKey : branchReleaseKeys) {
if (branchReleaseConfigs.containsKey(branchReleaseKey)) {
modifiedConfigs.put(branchReleaseKey, branchReleaseConfigs.get(branchReleaseKey));
}
}
return modifiedConfigs;
}
// old logic, retrieve modified configurations by comparing branchReleaseConfigs with masterReleaseConfigs
if (CollectionUtils.isEmpty(masterReleaseConfigs)) {
return branchReleaseConfigs;
}
for (Map.Entry<String, String> entry : branchReleaseConfigs.entrySet()) {
if (!Objects.equals(entry.getValue(), masterReleaseConfigs.get(entry.getKey()))) {
modifiedConfigs.put(entry.getKey(), entry.getValue());
}
}
return modifiedConfigs;
}
@Transactional
public int batchDelete(String appId, String clusterName, String namespaceName, String operator) {
return releaseRepository.batchDelete(appId, clusterName, namespaceName, operator);
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/config/ConfigService.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.message.ReleaseMessageListener;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigService extends ReleaseMessageListener {
/**
* Load config
*
* @param clientAppId the client's app id
* @param clientIp the client ip
* @param configAppId the requested config's app id
* @param configClusterName the requested config's cluster name
* @param configNamespace the requested config's namespace name
* @param dataCenter the client data center
* @param clientMessages the messages received in client side
* @return the Release
*/
Release loadConfig(String clientAppId, String clientIp, String configAppId, String
configClusterName, String configNamespace, String dataCenter, ApolloNotificationMessages clientMessages);
}
| /*
* 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.message.ReleaseMessageListener;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigService extends ReleaseMessageListener {
/**
* Load config
*
* @param clientAppId the client's app id
* @param clientIp the client ip
* @param configAppId the requested config's app id
* @param configClusterName the requested config's cluster name
* @param configNamespace the requested config's namespace name
* @param dataCenter the client data center
* @param clientMessages the messages received in client side
* @return the Release
*/
Release loadConfig(String clientAppId, String clientIp, String configAppId, String
configClusterName, String configNamespace, String dataCenter, ApolloNotificationMessages clientMessages);
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/core/utils/MachineUtil.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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.NetworkInterface;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.security.SecureRandom;
import java.util.Enumeration;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class MachineUtil {
private static final Logger logger = LoggerFactory.getLogger(MachineUtil.class);
private static final int MACHINE_IDENTIFIER = createMachineIdentifier();
public static int getMachineIdentifier() {
return MACHINE_IDENTIFIER;
}
/**
* Get the machine identifier from mac address
*
* @see <a href=https://github.com/mongodb/mongo-java-driver/blob/master/bson/src/main/org/bson/types/ObjectId.java>ObjectId.java</a>
*/
private static int createMachineIdentifier() {
// build a 2-byte machine piece based on NICs info
int machinePiece;
try {
StringBuilder sb = new StringBuilder();
Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
if (e != null){
while (e.hasMoreElements()) {
NetworkInterface ni = e.nextElement();
sb.append(ni.toString());
byte[] mac = ni.getHardwareAddress();
if (mac != null) {
ByteBuffer bb = ByteBuffer.wrap(mac);
try {
sb.append(bb.getChar());
sb.append(bb.getChar());
sb.append(bb.getChar());
} catch (BufferUnderflowException shortHardwareAddressException) { //NOPMD
// mac with less than 6 bytes. continue
}
}
}
}
machinePiece = sb.toString().hashCode();
} catch (Throwable ex) {
// exception sometimes happens with IBM JVM, use random
machinePiece = (new SecureRandom().nextInt());
logger.warn(
"Failed to get machine identifier from network interface, using random number instead",
ex);
}
return machinePiece;
}
}
| /*
* 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.NetworkInterface;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.security.SecureRandom;
import java.util.Enumeration;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class MachineUtil {
private static final Logger logger = LoggerFactory.getLogger(MachineUtil.class);
private static final int MACHINE_IDENTIFIER = createMachineIdentifier();
public static int getMachineIdentifier() {
return MACHINE_IDENTIFIER;
}
/**
* Get the machine identifier from mac address
*
* @see <a href=https://github.com/mongodb/mongo-java-driver/blob/master/bson/src/main/org/bson/types/ObjectId.java>ObjectId.java</a>
*/
private static int createMachineIdentifier() {
// build a 2-byte machine piece based on NICs info
int machinePiece;
try {
StringBuilder sb = new StringBuilder();
Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
if (e != null){
while (e.hasMoreElements()) {
NetworkInterface ni = e.nextElement();
sb.append(ni.toString());
byte[] mac = ni.getHardwareAddress();
if (mac != null) {
ByteBuffer bb = ByteBuffer.wrap(mac);
try {
sb.append(bb.getChar());
sb.append(bb.getChar());
sb.append(bb.getChar());
} catch (BufferUnderflowException shortHardwareAddressException) { //NOPMD
// mac with less than 6 bytes. continue
}
}
}
}
machinePiece = sb.toString().hashCode();
} catch (Throwable ex) {
// exception sometimes happens with IBM JVM, use random
machinePiece = (new SecureRandom().nextInt());
logger.warn(
"Failed to get machine identifier from network interface, using random number instead",
ex);
}
return machinePiece;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/RemoteConfigRepositoryTest.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.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import com.google.common.net.UrlEscapers;
import com.google.common.util.concurrent.SettableFuture;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
@RunWith(MockitoJUnitRunner.class)
public class RemoteConfigRepositoryTest {
@Mock
private ConfigServiceLocator configServiceLocator;
private String someNamespace;
private String someServerUrl;
private ConfigUtil configUtil;
private HttpClient httpClient;
@Mock
private static HttpResponse<ApolloConfig> someResponse;
@Mock
private static HttpResponse<List<ApolloConfigNotification>> pollResponse;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Mock
private PropertiesFactory propertiesFactory;
private static String someAppId;
private static String someCluster;
private static String someSecret;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_MODIFIED);
configUtil = new MockConfigUtil();
MockInjector.setInstance(ConfigUtil.class, configUtil);
someServerUrl = "http://someServer";
ServiceDTO serviceDTO = mock(ServiceDTO.class);
when(serviceDTO.getHomepageUrl()).thenReturn(someServerUrl);
when(configServiceLocator.getConfigServices()).thenReturn(Lists.newArrayList(serviceDTO));
MockInjector.setInstance(ConfigServiceLocator.class, configServiceLocator);
httpClient = spy(new MockHttpClient());
MockInjector.setInstance(HttpClient.class, httpClient);
remoteConfigLongPollService = new RemoteConfigLongPollService();
MockInjector.setInstance(RemoteConfigLongPollService.class, remoteConfigLongPollService);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someAppId = "someAppId";
someCluster = "someCluster";
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testLoadConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLoadConfigWithOrderedProperties() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newLinkedHashMap();
configurations.put(someKey, someValue);
configurations.put("someKey2", "someValue2");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertTrue(config instanceof OrderedProperties);
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
String[] actualArrays = config.keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testLoadConfigWithAccessKeySecret() throws Exception {
someSecret = "someSecret";
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
doAnswer(new Answer<HttpResponse<ApolloConfig>>() {
@Override
public HttpResponse<ApolloConfig> answer(InvocationOnMock invocation) throws Throwable {
HttpRequest request = invocation.getArgumentAt(0, HttpRequest.class);
Map<String, String> headers = request.getHeaders();
assertNotNull(headers);
assertTrue(headers.containsKey(Signature.HTTP_HEADER_TIMESTAMP));
assertTrue(headers.containsKey(HttpHeaders.AUTHORIZATION));
return someResponse;
}
}).when(httpClient).doGet(any(HttpRequest.class), any(Class.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithServerError() throws Exception {
when(someResponse.getStatusCode()).thenReturn(500);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithNotFount() throws Exception {
when(someResponse.getStatusCode()).thenReturn(404);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test
public void testRepositoryChangeListener() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
when(someResponse.getBody()).thenReturn(newApolloConfig);
remoteConfigRepository.sync();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLongPollingRefresh() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
longPollFinished.set(true);
return null;
}
}).when(someListener).onRepositoryChange(any(String.class), any(Properties.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
notificationMessages.put(someKey, someNotificationId);
ApolloConfigNotification someNotification = mock(ApolloConfigNotification.class);
when(someNotification.getNamespaceName()).thenReturn(someNamespace);
when(someNotification.getMessages()).thenReturn(notificationMessages);
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_OK);
when(pollResponse.getBody()).thenReturn(Lists.newArrayList(someNotification));
when(someResponse.getBody()).thenReturn(newApolloConfig);
longPollFinished.get(30_000, TimeUnit.MILLISECONDS);
remoteConfigLongPollService.stopLongPollingRefresh();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
final ArgumentCaptor<HttpRequest> httpRequestArgumentCaptor = ArgumentCaptor
.forClass(HttpRequest.class);
verify(httpClient, atLeast(2)).doGet(httpRequestArgumentCaptor.capture(), eq(ApolloConfig.class));
HttpRequest request = httpRequestArgumentCaptor.getValue();
assertTrue(request.getUrl().contains("messages=%7B%22details%22%3A%7B%22someKey%22%3A1%7D%7D"));
}
@Test
public void testAssembleQueryConfigUrl() throws Exception {
Gson gson = new Gson();
String someUri = "http://someServer";
String someAppId = "someAppId";
String someCluster = "someCluster+ &.-_someSign";
String someReleaseKey = "20160705193346-583078ef5716c055+20160705193308-31c471ddf9087c3f";
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
String anotherKey = "anotherKey";
long anotherNotificationId = 2;
notificationMessages.put(someKey, someNotificationId);
notificationMessages.put(anotherKey, anotherNotificationId);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
ApolloConfig someApolloConfig = mock(ApolloConfig.class);
when(someApolloConfig.getReleaseKey()).thenReturn(someReleaseKey);
String queryConfigUrl = remoteConfigRepository
.assembleQueryConfigUrl(someUri, someAppId, someCluster, someNamespace, null,
notificationMessages,
someApolloConfig);
remoteConfigLongPollService.stopLongPollingRefresh();
assertTrue(queryConfigUrl
.contains(
"http://someServer/configs/someAppId/someCluster+%20&.-_someSign/" + someNamespace));
assertTrue(queryConfigUrl
.contains("releaseKey=20160705193346-583078ef5716c055%2B20160705193308-31c471ddf9087c3f"));
assertTrue(queryConfigUrl
.contains("messages=" + UrlEscapers.urlFormParameterEscaper()
.escape(gson.toJson(notificationMessages))));
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
String someAppId = "appId";
String someClusterName = "cluster";
String someReleaseKey = "1";
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, someNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
@Override
public String getAccessKeySecret() {
return someSecret;
}
@Override
public String getDataCenter() {
return null;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
}
public static class MockHttpClient implements HttpClient {
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Class<T> responseType) {
if (someResponse.getStatusCode() == 200 || someResponse.getStatusCode() == 304) {
return (HttpResponse<T>) someResponse;
}
throw new ApolloConfigStatusCodeException(someResponse.getStatusCode(),
String.format("Http request failed due to status code: %d",
someResponse.getStatusCode()));
}
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Type responseType) {
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
}
return (HttpResponse<T>) pollResponse;
}
}
}
| /*
* 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.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import com.google.common.net.UrlEscapers;
import com.google.common.util.concurrent.SettableFuture;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
@RunWith(MockitoJUnitRunner.class)
public class RemoteConfigRepositoryTest {
@Mock
private ConfigServiceLocator configServiceLocator;
private String someNamespace;
private String someServerUrl;
private ConfigUtil configUtil;
private HttpClient httpClient;
@Mock
private static HttpResponse<ApolloConfig> someResponse;
@Mock
private static HttpResponse<List<ApolloConfigNotification>> pollResponse;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Mock
private PropertiesFactory propertiesFactory;
private static String someAppId;
private static String someCluster;
private static String someSecret;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_MODIFIED);
configUtil = new MockConfigUtil();
MockInjector.setInstance(ConfigUtil.class, configUtil);
someServerUrl = "http://someServer";
ServiceDTO serviceDTO = mock(ServiceDTO.class);
when(serviceDTO.getHomepageUrl()).thenReturn(someServerUrl);
when(configServiceLocator.getConfigServices()).thenReturn(Lists.newArrayList(serviceDTO));
MockInjector.setInstance(ConfigServiceLocator.class, configServiceLocator);
httpClient = spy(new MockHttpClient());
MockInjector.setInstance(HttpClient.class, httpClient);
remoteConfigLongPollService = new RemoteConfigLongPollService();
MockInjector.setInstance(RemoteConfigLongPollService.class, remoteConfigLongPollService);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someAppId = "someAppId";
someCluster = "someCluster";
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testLoadConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLoadConfigWithOrderedProperties() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newLinkedHashMap();
configurations.put(someKey, someValue);
configurations.put("someKey2", "someValue2");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertTrue(config instanceof OrderedProperties);
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
String[] actualArrays = config.keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testLoadConfigWithAccessKeySecret() throws Exception {
someSecret = "someSecret";
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
doAnswer(new Answer<HttpResponse<ApolloConfig>>() {
@Override
public HttpResponse<ApolloConfig> answer(InvocationOnMock invocation) throws Throwable {
HttpRequest request = invocation.getArgumentAt(0, HttpRequest.class);
Map<String, String> headers = request.getHeaders();
assertNotNull(headers);
assertTrue(headers.containsKey(Signature.HTTP_HEADER_TIMESTAMP));
assertTrue(headers.containsKey(HttpHeaders.AUTHORIZATION));
return someResponse;
}
}).when(httpClient).doGet(any(HttpRequest.class), any(Class.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithServerError() throws Exception {
when(someResponse.getStatusCode()).thenReturn(500);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithNotFount() throws Exception {
when(someResponse.getStatusCode()).thenReturn(404);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test
public void testRepositoryChangeListener() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
when(someResponse.getBody()).thenReturn(newApolloConfig);
remoteConfigRepository.sync();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLongPollingRefresh() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
longPollFinished.set(true);
return null;
}
}).when(someListener).onRepositoryChange(any(String.class), any(Properties.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
notificationMessages.put(someKey, someNotificationId);
ApolloConfigNotification someNotification = mock(ApolloConfigNotification.class);
when(someNotification.getNamespaceName()).thenReturn(someNamespace);
when(someNotification.getMessages()).thenReturn(notificationMessages);
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_OK);
when(pollResponse.getBody()).thenReturn(Lists.newArrayList(someNotification));
when(someResponse.getBody()).thenReturn(newApolloConfig);
longPollFinished.get(30_000, TimeUnit.MILLISECONDS);
remoteConfigLongPollService.stopLongPollingRefresh();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
final ArgumentCaptor<HttpRequest> httpRequestArgumentCaptor = ArgumentCaptor
.forClass(HttpRequest.class);
verify(httpClient, atLeast(2)).doGet(httpRequestArgumentCaptor.capture(), eq(ApolloConfig.class));
HttpRequest request = httpRequestArgumentCaptor.getValue();
assertTrue(request.getUrl().contains("messages=%7B%22details%22%3A%7B%22someKey%22%3A1%7D%7D"));
}
@Test
public void testAssembleQueryConfigUrl() throws Exception {
Gson gson = new Gson();
String someUri = "http://someServer";
String someAppId = "someAppId";
String someCluster = "someCluster+ &.-_someSign";
String someReleaseKey = "20160705193346-583078ef5716c055+20160705193308-31c471ddf9087c3f";
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
String anotherKey = "anotherKey";
long anotherNotificationId = 2;
notificationMessages.put(someKey, someNotificationId);
notificationMessages.put(anotherKey, anotherNotificationId);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
ApolloConfig someApolloConfig = mock(ApolloConfig.class);
when(someApolloConfig.getReleaseKey()).thenReturn(someReleaseKey);
String queryConfigUrl = remoteConfigRepository
.assembleQueryConfigUrl(someUri, someAppId, someCluster, someNamespace, null,
notificationMessages,
someApolloConfig);
remoteConfigLongPollService.stopLongPollingRefresh();
assertTrue(queryConfigUrl
.contains(
"http://someServer/configs/someAppId/someCluster+%20&.-_someSign/" + someNamespace));
assertTrue(queryConfigUrl
.contains("releaseKey=20160705193346-583078ef5716c055%2B20160705193308-31c471ddf9087c3f"));
assertTrue(queryConfigUrl
.contains("messages=" + UrlEscapers.urlFormParameterEscaper()
.escape(gson.toJson(notificationMessages))));
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
String someAppId = "appId";
String someClusterName = "cluster";
String someReleaseKey = "1";
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, someNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
@Override
public String getAccessKeySecret() {
return someSecret;
}
@Override
public String getDataCenter() {
return null;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
}
public static class MockHttpClient implements HttpClient {
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Class<T> responseType) {
if (someResponse.getStatusCode() == 200 || someResponse.getStatusCode() == 304) {
return (HttpResponse<T>) someResponse;
}
throw new ApolloConfigStatusCodeException(someResponse.getStatusCode(),
String.format("Http request failed due to status code: %d",
someResponse.getStatusCode()));
}
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Type responseType) {
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
}
return (HttpResponse<T>) pollResponse;
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/ConfigReleaseWebhookNotifier.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;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.environment.Env;
/**
* publish webHook
*
* @author HuangSheng
*/
@Component
public class ConfigReleaseWebhookNotifier {
private static final Logger logger = LoggerFactory.getLogger(ConfigReleaseWebhookNotifier.class);
private final RestTemplateFactory restTemplateFactory;
private RestTemplate restTemplate;
public ConfigReleaseWebhookNotifier(RestTemplateFactory restTemplateFactory) {
this.restTemplateFactory = restTemplateFactory;
}
@PostConstruct
public void init() {
// init restTemplate
restTemplate = restTemplateFactory.getObject();
}
public void notify(String[] webHookUrls, Env env, ReleaseHistoryBO releaseHistory) {
if (webHookUrls == null) {
return;
}
for (String webHookUrl : webHookUrls) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
HttpEntity entity = new HttpEntity(releaseHistory, headers);
String url = webHookUrl + "?env={env}";
try {
restTemplate.postForObject(url, entity, String.class, env);
} catch (Exception e) {
logger.error("Notify webHook server failed, env: {}, webHook server url:{}", env, url, e);
}
}
}
}
| /*
* 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;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.environment.Env;
/**
* publish webHook
*
* @author HuangSheng
*/
@Component
public class ConfigReleaseWebhookNotifier {
private static final Logger logger = LoggerFactory.getLogger(ConfigReleaseWebhookNotifier.class);
private final RestTemplateFactory restTemplateFactory;
private RestTemplate restTemplate;
public ConfigReleaseWebhookNotifier(RestTemplateFactory restTemplateFactory) {
this.restTemplateFactory = restTemplateFactory;
}
@PostConstruct
public void init() {
// init restTemplate
restTemplate = restTemplateFactory.getObject();
}
public void notify(String[] webHookUrls, Env env, ReleaseHistoryBO releaseHistory) {
if (webHookUrls == null) {
return;
}
for (String webHookUrl : webHookUrls) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
HttpEntity entity = new HttpEntity(releaseHistory, headers);
String url = webHookUrl + "?env={env}";
try {
restTemplate.postForObject(url, entity, String.class, env);
} catch (Exception e) {
logger.error("Notify webHook server failed, env: {}, webHook server url:{}", env, url, e);
}
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/SystemInfoService.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('SystemInfoService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var system_info_resource = $resource('', {}, {
load_system_info: {
method: 'GET',
url: AppUtil.prefixPath() + '/system-info'
},
check_health: {
method: 'GET',
url: AppUtil.prefixPath() + '/system-info/health'
}
});
return {
load_system_info: function () {
var d = $q.defer();
system_info_resource.load_system_info({},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
check_health: function (instanceId, host) {
var d = $q.defer();
system_info_resource.check_health({
instanceId: instanceId
},
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('SystemInfoService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var system_info_resource = $resource('', {}, {
load_system_info: {
method: 'GET',
url: AppUtil.prefixPath() + '/system-info'
},
check_health: {
method: 'GET',
url: AppUtil.prefixPath() + '/system-info/health'
}
});
return {
load_system_info: function () {
var d = $q.defer();
system_info_resource.load_system_info({},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
check_health: function (instanceId, host) {
var d = $q.defer();
system_info_resource.check_health({
instanceId: instanceId
},
function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/openapi/entity/ConsumerAudit.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.entity;
import com.google.common.base.MoreObjects;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrePersist;
import javax.persistence.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "ConsumerAudit")
public class ConsumerAudit {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "Id")
private long id;
@Column(name = "ConsumerId", nullable = false)
private long consumerId;
@Column(name = "Uri", nullable = false)
private String uri;
@Column(name = "Method", nullable = false)
private String method;
@Column(name = "DataChange_CreatedTime")
private Date dataChangeCreatedTime;
@Column(name = "DataChange_LastTime")
private Date dataChangeLastModifiedTime;
@PrePersist
protected void prePersist() {
if (this.dataChangeCreatedTime == null) {
this.dataChangeCreatedTime = new Date();
}
if (this.dataChangeLastModifiedTime == null) {
dataChangeLastModifiedTime = this.dataChangeCreatedTime;
}
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public long getConsumerId() {
return consumerId;
}
public void setConsumerId(long consumerId) {
this.consumerId = consumerId;
}
public String getUri() {
return uri;
}
public void setUri(String uri) {
this.uri = uri;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.omitNullValues()
.add("id", id)
.add("consumerId", consumerId)
.add("uri", uri)
.add("method", method)
.add("dataChangeCreatedTime", dataChangeCreatedTime)
.add("dataChangeLastModifiedTime", dataChangeLastModifiedTime)
.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.openapi.entity;
import com.google.common.base.MoreObjects;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrePersist;
import javax.persistence.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "ConsumerAudit")
public class ConsumerAudit {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "Id")
private long id;
@Column(name = "ConsumerId", nullable = false)
private long consumerId;
@Column(name = "Uri", nullable = false)
private String uri;
@Column(name = "Method", nullable = false)
private String method;
@Column(name = "DataChange_CreatedTime")
private Date dataChangeCreatedTime;
@Column(name = "DataChange_LastTime")
private Date dataChangeLastModifiedTime;
@PrePersist
protected void prePersist() {
if (this.dataChangeCreatedTime == null) {
this.dataChangeCreatedTime = new Date();
}
if (this.dataChangeLastModifiedTime == null) {
dataChangeLastModifiedTime = this.dataChangeCreatedTime;
}
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public long getConsumerId() {
return consumerId;
}
public void setConsumerId(long consumerId) {
this.consumerId = consumerId;
}
public String getUri() {
return uri;
}
public void setUri(String uri) {
this.uri = uri;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.omitNullValues()
.add("id", id)
.add("consumerId", consumerId)
.add("uri", uri)
.add("method", method)
.add("dataChangeCreatedTime", dataChangeCreatedTime)
.add("dataChangeLastModifiedTime", dataChangeLastModifiedTime)
.toString();
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/AppNamespaceRepository.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.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long> {
AppNamespace findByAppIdAndName(String appId, String namespaceName);
AppNamespace findByName(String namespaceName);
List<AppNamespace> findByNameAndIsPublic(String namespaceName, boolean isPublic);
List<AppNamespace> findByIsPublicTrue();
List<AppNamespace> findByAppId(String appId);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy=?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| /*
* 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.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long> {
AppNamespace findByAppIdAndName(String appId, String namespaceName);
AppNamespace findByName(String namespaceName);
List<AppNamespace> findByNameAndIsPublic(String namespaceName, boolean isPublic);
List<AppNamespace> findByIsPublicTrue();
List<AppNamespace> findByAppId(String appId);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy=?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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;
}
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,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/AbstractSpringIntegrationTest.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 static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultInjector;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.io.CharStreams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.springframework.util.ReflectionUtils;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigManager;
import com.google.common.collect.Maps;
import org.springframework.util.ReflectionUtils.FieldCallback;
import org.springframework.util.ReflectionUtils.FieldFilter;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class AbstractSpringIntegrationTest {
private static final Map<String, Config> CONFIG_REGISTRY = Maps.newHashMap();
private static final Map<String, ConfigFile> CONFIG_FILE_REGISTRY = Maps.newHashMap();
private static Method CONFIG_SERVICE_RESET;
private static Method PROPERTY_SOURCES_PROCESSOR_RESET;
static {
try {
CONFIG_SERVICE_RESET = ConfigService.class.getDeclaredMethod("reset");
ReflectionUtils.makeAccessible(CONFIG_SERVICE_RESET);
PROPERTY_SOURCES_PROCESSOR_RESET = PropertySourcesProcessor.class.getDeclaredMethod("reset");
ReflectionUtils.makeAccessible(PROPERTY_SOURCES_PROCESSOR_RESET);
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
}
@Before
public void setUp() throws Exception {
doSetUp();
}
@After
public void tearDown() throws Exception {
doTearDown();
}
protected SimpleConfig prepareConfig(String namespaceName, Properties properties) {
ConfigRepository configRepository = mock(ConfigRepository.class);
when(configRepository.getConfig()).thenReturn(properties);
SimpleConfig config = new SimpleConfig(ConfigConsts.NAMESPACE_APPLICATION, configRepository);
mockConfig(namespaceName, config);
return config;
}
protected static Properties readYamlContentAsConfigFileProperties(String caseName)
throws IOException {
final String filePath = "spring/yaml/" + caseName;
ClassLoader classLoader = AbstractSpringIntegrationTest.class.getClassLoader();
InputStream inputStream = classLoader.getResourceAsStream(filePath);
Objects.requireNonNull(inputStream, filePath + " may be not exist under src/test/resources/");
String yamlContent = CharStreams
.toString(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
Properties properties = new Properties();
properties.setProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY, yamlContent);
return properties;
}
protected static YamlConfigFile prepareYamlConfigFile(String namespaceNameWithFormat, Properties properties) {
ConfigRepository configRepository = mock(ConfigRepository.class);
when(configRepository.getConfig()).thenReturn(properties);
// spy it for testing after
YamlConfigFile configFile = spy(new YamlConfigFile(namespaceNameWithFormat, configRepository));
mockConfigFile(namespaceNameWithFormat, configFile);
return configFile;
}
protected Properties assembleProperties(String key, String value) {
Properties properties = new Properties();
properties.setProperty(key, value);
return properties;
}
protected Properties assembleProperties(String key, String value, String key2, String value2) {
Properties properties = new Properties();
properties.setProperty(key, value);
properties.setProperty(key2, value2);
return properties;
}
protected Properties assembleProperties(String key, String value, String key2, String value2,
String key3, String value3) {
Properties properties = new Properties();
properties.setProperty(key, value);
properties.setProperty(key2, value2);
properties.setProperty(key3, value3);
return properties;
}
protected Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
protected static void mockConfig(String namespace, Config config) {
CONFIG_REGISTRY.put(namespace, config);
}
protected static void mockConfigFile(String namespaceNameWithFormat, ConfigFile configFile) {
CONFIG_FILE_REGISTRY.put(namespaceNameWithFormat, configFile);
}
protected static void doSetUp() {
//as ConfigService is singleton, so we must manually clear its container
ReflectionUtils.invokeMethod(CONFIG_SERVICE_RESET, null);
//as PropertySourcesProcessor has some static variables, so we must manually clear them
ReflectionUtils.invokeMethod(PROPERTY_SOURCES_PROCESSOR_RESET, null);
DefaultInjector defaultInjector = new DefaultInjector();
ConfigManager defaultConfigManager = defaultInjector.getInstance(ConfigManager.class);
MockInjector.setInstance(ConfigManager.class, new MockConfigManager(defaultConfigManager));
MockInjector.setDelegate(defaultInjector);
}
protected static void doTearDown() {
MockInjector.reset();
CONFIG_REGISTRY.clear();
}
private static class MockConfigManager implements ConfigManager {
private final ConfigManager delegate;
public MockConfigManager(ConfigManager delegate) {
this.delegate = delegate;
}
@Override
public Config getConfig(String namespace) {
Config config = CONFIG_REGISTRY.get(namespace);
if (config != null) {
return config;
}
return delegate.getConfig(namespace);
}
@Override
public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigFile configFile = CONFIG_FILE_REGISTRY.get(String.format("%s.%s", namespace, configFileFormat.getValue()));
if (configFile != null) {
return configFile;
}
return delegate.getConfigFile(namespace, configFileFormat);
}
}
protected static class MockConfigUtil extends ConfigUtil {
private boolean isAutoUpdateInjectedSpringProperties;
public void setAutoUpdateInjectedSpringProperties(boolean autoUpdateInjectedSpringProperties) {
isAutoUpdateInjectedSpringProperties = autoUpdateInjectedSpringProperties;
}
@Override
public boolean isAutoUpdateInjectedSpringPropertiesEnabled() {
return isAutoUpdateInjectedSpringProperties;
}
}
}
| /*
* 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 static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultInjector;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.io.CharStreams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.springframework.util.ReflectionUtils;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigManager;
import com.google.common.collect.Maps;
import org.springframework.util.ReflectionUtils.FieldCallback;
import org.springframework.util.ReflectionUtils.FieldFilter;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public abstract class AbstractSpringIntegrationTest {
private static final Map<String, Config> CONFIG_REGISTRY = Maps.newHashMap();
private static final Map<String, ConfigFile> CONFIG_FILE_REGISTRY = Maps.newHashMap();
private static Method CONFIG_SERVICE_RESET;
private static Method PROPERTY_SOURCES_PROCESSOR_RESET;
static {
try {
CONFIG_SERVICE_RESET = ConfigService.class.getDeclaredMethod("reset");
ReflectionUtils.makeAccessible(CONFIG_SERVICE_RESET);
PROPERTY_SOURCES_PROCESSOR_RESET = PropertySourcesProcessor.class.getDeclaredMethod("reset");
ReflectionUtils.makeAccessible(PROPERTY_SOURCES_PROCESSOR_RESET);
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
}
@Before
public void setUp() throws Exception {
doSetUp();
}
@After
public void tearDown() throws Exception {
doTearDown();
}
protected SimpleConfig prepareConfig(String namespaceName, Properties properties) {
ConfigRepository configRepository = mock(ConfigRepository.class);
when(configRepository.getConfig()).thenReturn(properties);
SimpleConfig config = new SimpleConfig(ConfigConsts.NAMESPACE_APPLICATION, configRepository);
mockConfig(namespaceName, config);
return config;
}
protected static Properties readYamlContentAsConfigFileProperties(String caseName)
throws IOException {
final String filePath = "spring/yaml/" + caseName;
ClassLoader classLoader = AbstractSpringIntegrationTest.class.getClassLoader();
InputStream inputStream = classLoader.getResourceAsStream(filePath);
Objects.requireNonNull(inputStream, filePath + " may be not exist under src/test/resources/");
String yamlContent = CharStreams
.toString(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
Properties properties = new Properties();
properties.setProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY, yamlContent);
return properties;
}
protected static YamlConfigFile prepareYamlConfigFile(String namespaceNameWithFormat, Properties properties) {
ConfigRepository configRepository = mock(ConfigRepository.class);
when(configRepository.getConfig()).thenReturn(properties);
// spy it for testing after
YamlConfigFile configFile = spy(new YamlConfigFile(namespaceNameWithFormat, configRepository));
mockConfigFile(namespaceNameWithFormat, configFile);
return configFile;
}
protected Properties assembleProperties(String key, String value) {
Properties properties = new Properties();
properties.setProperty(key, value);
return properties;
}
protected Properties assembleProperties(String key, String value, String key2, String value2) {
Properties properties = new Properties();
properties.setProperty(key, value);
properties.setProperty(key2, value2);
return properties;
}
protected Properties assembleProperties(String key, String value, String key2, String value2,
String key3, String value3) {
Properties properties = new Properties();
properties.setProperty(key, value);
properties.setProperty(key2, value2);
properties.setProperty(key3, value3);
return properties;
}
protected Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
protected static void mockConfig(String namespace, Config config) {
CONFIG_REGISTRY.put(namespace, config);
}
protected static void mockConfigFile(String namespaceNameWithFormat, ConfigFile configFile) {
CONFIG_FILE_REGISTRY.put(namespaceNameWithFormat, configFile);
}
protected static void doSetUp() {
//as ConfigService is singleton, so we must manually clear its container
ReflectionUtils.invokeMethod(CONFIG_SERVICE_RESET, null);
//as PropertySourcesProcessor has some static variables, so we must manually clear them
ReflectionUtils.invokeMethod(PROPERTY_SOURCES_PROCESSOR_RESET, null);
DefaultInjector defaultInjector = new DefaultInjector();
ConfigManager defaultConfigManager = defaultInjector.getInstance(ConfigManager.class);
MockInjector.setInstance(ConfigManager.class, new MockConfigManager(defaultConfigManager));
MockInjector.setDelegate(defaultInjector);
}
protected static void doTearDown() {
MockInjector.reset();
CONFIG_REGISTRY.clear();
}
private static class MockConfigManager implements ConfigManager {
private final ConfigManager delegate;
public MockConfigManager(ConfigManager delegate) {
this.delegate = delegate;
}
@Override
public Config getConfig(String namespace) {
Config config = CONFIG_REGISTRY.get(namespace);
if (config != null) {
return config;
}
return delegate.getConfig(namespace);
}
@Override
public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigFile configFile = CONFIG_FILE_REGISTRY.get(String.format("%s.%s", namespace, configFileFormat.getValue()));
if (configFile != null) {
return configFile;
}
return delegate.getConfigFile(namespace, configFileFormat);
}
}
protected static class MockConfigUtil extends ConfigUtil {
private boolean isAutoUpdateInjectedSpringProperties;
public void setAutoUpdateInjectedSpringProperties(boolean autoUpdateInjectedSpringProperties) {
isAutoUpdateInjectedSpringProperties = autoUpdateInjectedSpringProperties;
}
@Override
public boolean isAutoUpdateInjectedSpringPropertiesEnabled() {
return isAutoUpdateInjectedSpringProperties;
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/api/ApolloConfigDemo.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.api;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.google.common.base.Charsets;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.ctrip.framework.foundation.Foundation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloConfigDemo {
private static final Logger logger = LoggerFactory.getLogger(ApolloConfigDemo.class);
private String DEFAULT_VALUE = "undefined";
private Config config;
private Config yamlConfig;
private Config publicConfig;
private ConfigFile applicationConfigFile;
private ConfigFile xmlConfigFile;
private YamlConfigFile yamlConfigFile;
public ApolloConfigDemo() {
ConfigChangeListener changeListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
logger.info("Changes for namespace {}", changeEvent.getNamespace());
for (String key : changeEvent.changedKeys()) {
ConfigChange change = changeEvent.getChange(key);
logger.info("Change - key: {}, oldValue: {}, newValue: {}, changeType: {}",
change.getPropertyName(), change.getOldValue(), change.getNewValue(),
change.getChangeType());
}
}
};
config = ConfigService.getAppConfig();
config.addChangeListener(changeListener);
yamlConfig = ConfigService.getConfig("application.yaml");
yamlConfig.addChangeListener(changeListener);
publicConfig = ConfigService.getConfig("TEST1.apollo");
publicConfig.addChangeListener(changeListener);
applicationConfigFile = ConfigService.getConfigFile("application", ConfigFileFormat.Properties);
// datasources.xml
xmlConfigFile = ConfigService.getConfigFile("datasources", ConfigFileFormat.XML);
xmlConfigFile.addChangeListener(new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
logger.info(changeEvent.toString());
}
});
// application.yaml
yamlConfigFile = (YamlConfigFile) ConfigService.getConfigFile("application", ConfigFileFormat.YAML);
}
private String getConfig(String key) {
String result = config.getProperty(key, DEFAULT_VALUE);
if (DEFAULT_VALUE.equals(result)) {
result = publicConfig.getProperty(key, DEFAULT_VALUE);
}
if (DEFAULT_VALUE.equals(result)) {
result = yamlConfig.getProperty(key, DEFAULT_VALUE);
}
logger.info(String.format("Loading key : %s with value: %s", key, result));
return result;
}
private void print(String namespace) {
switch (namespace) {
case "application":
print(applicationConfigFile);
return;
case "xml":
print(xmlConfigFile);
return;
case "yaml":
printYaml(yamlConfigFile);
return;
}
}
private void print(ConfigFile configFile) {
if (!configFile.hasContent()) {
System.out.println("No config file content found for " + configFile.getNamespace());
return;
}
System.out.println("=== Config File Content for " + configFile.getNamespace() + " is as follows: ");
System.out.println(configFile.getContent());
}
private void printYaml(YamlConfigFile configFile) {
System.out.println("=== Properties for " + configFile.getNamespace() + " is as follows: ");
System.out.println(configFile.asProperties());
}
private void printEnvInfo() {
String message = String.format("AppId: %s, Env: %s, DC: %s, IP: %s", Foundation.app()
.getAppId(), Foundation.server().getEnvType(), Foundation.server().getDataCenter(),
Foundation.net().getHostAddress());
System.out.println(message);
}
public static void main(String[] args) throws IOException {
ApolloConfigDemo apolloConfigDemo = new ApolloConfigDemo();
apolloConfigDemo.printEnvInfo();
System.out.println(
"Apollo Config Demo. Please input key to get the value.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (input == null || input.length() == 0) {
continue;
}
input = input.trim();
try {
if (input.equalsIgnoreCase("application")) {
apolloConfigDemo.print("application");
continue;
}
if (input.equalsIgnoreCase("xml")) {
apolloConfigDemo.print("xml");
continue;
}
if (input.equalsIgnoreCase("yaml") || input.equalsIgnoreCase("yml")) {
apolloConfigDemo.print("yaml");
continue;
}
if (input.equalsIgnoreCase("quit")) {
System.exit(0);
}
apolloConfigDemo.getConfig(input);
} catch (Throwable ex) {
logger.error("some error occurred", 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.demo.api;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.google.common.base.Charsets;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
import com.ctrip.framework.foundation.Foundation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloConfigDemo {
private static final Logger logger = LoggerFactory.getLogger(ApolloConfigDemo.class);
private String DEFAULT_VALUE = "undefined";
private Config config;
private Config yamlConfig;
private Config publicConfig;
private ConfigFile applicationConfigFile;
private ConfigFile xmlConfigFile;
private YamlConfigFile yamlConfigFile;
public ApolloConfigDemo() {
ConfigChangeListener changeListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
logger.info("Changes for namespace {}", changeEvent.getNamespace());
for (String key : changeEvent.changedKeys()) {
ConfigChange change = changeEvent.getChange(key);
logger.info("Change - key: {}, oldValue: {}, newValue: {}, changeType: {}",
change.getPropertyName(), change.getOldValue(), change.getNewValue(),
change.getChangeType());
}
}
};
config = ConfigService.getAppConfig();
config.addChangeListener(changeListener);
yamlConfig = ConfigService.getConfig("application.yaml");
yamlConfig.addChangeListener(changeListener);
publicConfig = ConfigService.getConfig("TEST1.apollo");
publicConfig.addChangeListener(changeListener);
applicationConfigFile = ConfigService.getConfigFile("application", ConfigFileFormat.Properties);
// datasources.xml
xmlConfigFile = ConfigService.getConfigFile("datasources", ConfigFileFormat.XML);
xmlConfigFile.addChangeListener(new ConfigFileChangeListener() {
@Override
public void onChange(ConfigFileChangeEvent changeEvent) {
logger.info(changeEvent.toString());
}
});
// application.yaml
yamlConfigFile = (YamlConfigFile) ConfigService.getConfigFile("application", ConfigFileFormat.YAML);
}
private String getConfig(String key) {
String result = config.getProperty(key, DEFAULT_VALUE);
if (DEFAULT_VALUE.equals(result)) {
result = publicConfig.getProperty(key, DEFAULT_VALUE);
}
if (DEFAULT_VALUE.equals(result)) {
result = yamlConfig.getProperty(key, DEFAULT_VALUE);
}
logger.info(String.format("Loading key : %s with value: %s", key, result));
return result;
}
private void print(String namespace) {
switch (namespace) {
case "application":
print(applicationConfigFile);
return;
case "xml":
print(xmlConfigFile);
return;
case "yaml":
printYaml(yamlConfigFile);
return;
}
}
private void print(ConfigFile configFile) {
if (!configFile.hasContent()) {
System.out.println("No config file content found for " + configFile.getNamespace());
return;
}
System.out.println("=== Config File Content for " + configFile.getNamespace() + " is as follows: ");
System.out.println(configFile.getContent());
}
private void printYaml(YamlConfigFile configFile) {
System.out.println("=== Properties for " + configFile.getNamespace() + " is as follows: ");
System.out.println(configFile.asProperties());
}
private void printEnvInfo() {
String message = String.format("AppId: %s, Env: %s, DC: %s, IP: %s", Foundation.app()
.getAppId(), Foundation.server().getEnvType(), Foundation.server().getDataCenter(),
Foundation.net().getHostAddress());
System.out.println(message);
}
public static void main(String[] args) throws IOException {
ApolloConfigDemo apolloConfigDemo = new ApolloConfigDemo();
apolloConfigDemo.printEnvInfo();
System.out.println(
"Apollo Config Demo. Please input key to get the value.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (input == null || input.length() == 0) {
continue;
}
input = input.trim();
try {
if (input.equalsIgnoreCase("application")) {
apolloConfigDemo.print("application");
continue;
}
if (input.equalsIgnoreCase("xml")) {
apolloConfigDemo.print("xml");
continue;
}
if (input.equalsIgnoreCase("yaml") || input.equalsIgnoreCase("yml")) {
apolloConfigDemo.print("yaml");
continue;
}
if (input.equalsIgnoreCase("quit")) {
System.exit(0);
}
apolloConfigDemo.getConfig(input);
} catch (Throwable ex) {
logger.error("some error occurred", ex);
}
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/entity/Item.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.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@Table(name = "Item")
@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Item extends BaseEntity {
@Column(name = "NamespaceId", nullable = false)
private long namespaceId;
@Column(name = "key", nullable = false)
private String key;
@Column(name = "value")
@Lob
private String value;
@Column(name = "comment")
private String comment;
@Column(name = "LineNum")
private Integer lineNum;
public String getComment() {
return comment;
}
public String getKey() {
return key;
}
public long getNamespaceId() {
return namespaceId;
}
public String getValue() {
return value;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setKey(String key) {
this.key = key;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
public void setValue(String value) {
this.value = value;
}
public Integer getLineNum() {
return lineNum;
}
public void setLineNum(Integer lineNum) {
this.lineNum = lineNum;
}
public String toString() {
return toStringHelper().add("namespaceId", namespaceId).add("key", key).add("value", value)
.add("lineNum", lineNum).add("comment", comment).toString();
}
}
| /*
* 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.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@Table(name = "Item")
@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Item extends BaseEntity {
@Column(name = "NamespaceId", nullable = false)
private long namespaceId;
@Column(name = "key", nullable = false)
private String key;
@Column(name = "value")
@Lob
private String value;
@Column(name = "comment")
private String comment;
@Column(name = "LineNum")
private Integer lineNum;
public String getComment() {
return comment;
}
public String getKey() {
return key;
}
public long getNamespaceId() {
return namespaceId;
}
public String getValue() {
return value;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setKey(String key) {
this.key = key;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
public void setValue(String value) {
this.value = value;
}
public Integer getLineNum() {
return lineNum;
}
public void setLineNum(Integer lineNum) {
this.lineNum = lineNum;
}
public String toString() {
return toStringHelper().add("namespaceId", namespaceId).add("key", key).add("value", value)
.add("lineNum", lineNum).add("comment", comment).toString();
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/condition/ConditionalOnProfile.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.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are active.
*
* @author Jason Song(song_s@ctrip.com)
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnProfile {
/**
* The profiles that should be active
* @return
*/
String[] value() 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.
*
*/
package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are active.
*
* @author Jason Song(song_s@ctrip.com)
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnProfile {
/**
* The profiles that should be active
* @return
*/
String[] value() default {};
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/openapi/util/OpenApiBeanUtils.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.util;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.ctrip.framework.apollo.portal.entity.bo.ItemBO;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.google.common.base.Preconditions;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
public class OpenApiBeanUtils {
private static final Gson GSON = new Gson();
private static Type type = new TypeToken<Map<String, String>>() {}.getType();
public static OpenItemDTO transformFromItemDTO(ItemDTO item) {
Preconditions.checkArgument(item != null);
return BeanUtils.transform(OpenItemDTO.class, item);
}
public static ItemDTO transformToItemDTO(OpenItemDTO openItemDTO) {
Preconditions.checkArgument(openItemDTO != null);
return BeanUtils.transform(ItemDTO.class, openItemDTO);
}
public static OpenAppNamespaceDTO transformToOpenAppNamespaceDTO(AppNamespace appNamespace) {
Preconditions.checkArgument(appNamespace != null);
return BeanUtils.transform(OpenAppNamespaceDTO.class, appNamespace);
}
public static AppNamespace transformToAppNamespace(OpenAppNamespaceDTO openAppNamespaceDTO) {
Preconditions.checkArgument(openAppNamespaceDTO != null);
return BeanUtils.transform(AppNamespace.class, openAppNamespaceDTO);
}
public static OpenReleaseDTO transformFromReleaseDTO(ReleaseDTO release) {
Preconditions.checkArgument(release != null);
OpenReleaseDTO openReleaseDTO = BeanUtils.transform(OpenReleaseDTO.class, release);
Map<String, String> configs = GSON.fromJson(release.getConfigurations(), type);
openReleaseDTO.setConfigurations(configs);
return openReleaseDTO;
}
public static OpenNamespaceDTO transformFromNamespaceBO(NamespaceBO namespaceBO) {
Preconditions.checkArgument(namespaceBO != null);
OpenNamespaceDTO openNamespaceDTO =
BeanUtils.transform(OpenNamespaceDTO.class, namespaceBO.getBaseInfo());
// app namespace info
openNamespaceDTO.setFormat(namespaceBO.getFormat());
openNamespaceDTO.setComment(namespaceBO.getComment());
openNamespaceDTO.setPublic(namespaceBO.isPublic());
// items
List<OpenItemDTO> items = new LinkedList<>();
List<ItemBO> itemBOs = namespaceBO.getItems();
if (!CollectionUtils.isEmpty(itemBOs)) {
items.addAll(itemBOs.stream().map(itemBO -> transformFromItemDTO(itemBO.getItem()))
.collect(Collectors.toList()));
}
openNamespaceDTO.setItems(items);
return openNamespaceDTO;
}
public static List<OpenNamespaceDTO> batchTransformFromNamespaceBOs(
List<NamespaceBO> namespaceBOs) {
if (CollectionUtils.isEmpty(namespaceBOs)) {
return Collections.emptyList();
}
List<OpenNamespaceDTO> openNamespaceDTOs =
namespaceBOs.stream().map(OpenApiBeanUtils::transformFromNamespaceBO)
.collect(Collectors.toCollection(LinkedList::new));
return openNamespaceDTOs;
}
public static OpenNamespaceLockDTO transformFromNamespaceLockDTO(String namespaceName,
NamespaceLockDTO namespaceLock) {
OpenNamespaceLockDTO lock = new OpenNamespaceLockDTO();
lock.setNamespaceName(namespaceName);
if (namespaceLock == null) {
lock.setLocked(false);
} else {
lock.setLocked(true);
lock.setLockedBy(namespaceLock.getDataChangeCreatedBy());
}
return lock;
}
public static OpenGrayReleaseRuleDTO transformFromGrayReleaseRuleDTO(
GrayReleaseRuleDTO grayReleaseRuleDTO) {
Preconditions.checkArgument(grayReleaseRuleDTO != null);
return BeanUtils.transform(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
}
public static GrayReleaseRuleDTO transformToGrayReleaseRuleDTO(
OpenGrayReleaseRuleDTO openGrayReleaseRuleDTO) {
Preconditions.checkArgument(openGrayReleaseRuleDTO != null);
String appId = openGrayReleaseRuleDTO.getAppId();
String branchName = openGrayReleaseRuleDTO.getBranchName();
String clusterName = openGrayReleaseRuleDTO.getClusterName();
String namespaceName = openGrayReleaseRuleDTO.getNamespaceName();
GrayReleaseRuleDTO grayReleaseRuleDTO =
new GrayReleaseRuleDTO(appId, clusterName, namespaceName, branchName);
Set<OpenGrayReleaseRuleItemDTO> openGrayReleaseRuleItemDTOSet =
openGrayReleaseRuleDTO.getRuleItems();
openGrayReleaseRuleItemDTOSet.forEach(openGrayReleaseRuleItemDTO -> {
String clientAppId = openGrayReleaseRuleItemDTO.getClientAppId();
Set<String> clientIpList = openGrayReleaseRuleItemDTO.getClientIpList();
GrayReleaseRuleItemDTO ruleItem = new GrayReleaseRuleItemDTO(clientAppId, clientIpList);
grayReleaseRuleDTO.addRuleItem(ruleItem);
});
return grayReleaseRuleDTO;
}
public static List<OpenAppDTO> transformFromApps(final List<App> apps) {
if (CollectionUtils.isEmpty(apps)) {
return Collections.emptyList();
}
return apps.stream().map(OpenApiBeanUtils::transformFromApp).collect(Collectors.toList());
}
public static OpenAppDTO transformFromApp(final App app) {
Preconditions.checkArgument(app != null);
return BeanUtils.transform(OpenAppDTO.class, app);
}
public static OpenClusterDTO transformFromClusterDTO(ClusterDTO Cluster) {
Preconditions.checkArgument(Cluster != null);
return BeanUtils.transform(OpenClusterDTO.class, Cluster);
}
public static ClusterDTO transformToClusterDTO(OpenClusterDTO openClusterDTO) {
Preconditions.checkArgument(openClusterDTO != null);
return BeanUtils.transform(ClusterDTO.class, openClusterDTO);
}
}
| /*
* 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.util;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.util.CollectionUtils;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO;
import com.ctrip.framework.apollo.portal.entity.bo.ItemBO;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.google.common.base.Preconditions;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
public class OpenApiBeanUtils {
private static final Gson GSON = new Gson();
private static Type type = new TypeToken<Map<String, String>>() {}.getType();
public static OpenItemDTO transformFromItemDTO(ItemDTO item) {
Preconditions.checkArgument(item != null);
return BeanUtils.transform(OpenItemDTO.class, item);
}
public static ItemDTO transformToItemDTO(OpenItemDTO openItemDTO) {
Preconditions.checkArgument(openItemDTO != null);
return BeanUtils.transform(ItemDTO.class, openItemDTO);
}
public static OpenAppNamespaceDTO transformToOpenAppNamespaceDTO(AppNamespace appNamespace) {
Preconditions.checkArgument(appNamespace != null);
return BeanUtils.transform(OpenAppNamespaceDTO.class, appNamespace);
}
public static AppNamespace transformToAppNamespace(OpenAppNamespaceDTO openAppNamespaceDTO) {
Preconditions.checkArgument(openAppNamespaceDTO != null);
return BeanUtils.transform(AppNamespace.class, openAppNamespaceDTO);
}
public static OpenReleaseDTO transformFromReleaseDTO(ReleaseDTO release) {
Preconditions.checkArgument(release != null);
OpenReleaseDTO openReleaseDTO = BeanUtils.transform(OpenReleaseDTO.class, release);
Map<String, String> configs = GSON.fromJson(release.getConfigurations(), type);
openReleaseDTO.setConfigurations(configs);
return openReleaseDTO;
}
public static OpenNamespaceDTO transformFromNamespaceBO(NamespaceBO namespaceBO) {
Preconditions.checkArgument(namespaceBO != null);
OpenNamespaceDTO openNamespaceDTO =
BeanUtils.transform(OpenNamespaceDTO.class, namespaceBO.getBaseInfo());
// app namespace info
openNamespaceDTO.setFormat(namespaceBO.getFormat());
openNamespaceDTO.setComment(namespaceBO.getComment());
openNamespaceDTO.setPublic(namespaceBO.isPublic());
// items
List<OpenItemDTO> items = new LinkedList<>();
List<ItemBO> itemBOs = namespaceBO.getItems();
if (!CollectionUtils.isEmpty(itemBOs)) {
items.addAll(itemBOs.stream().map(itemBO -> transformFromItemDTO(itemBO.getItem()))
.collect(Collectors.toList()));
}
openNamespaceDTO.setItems(items);
return openNamespaceDTO;
}
public static List<OpenNamespaceDTO> batchTransformFromNamespaceBOs(
List<NamespaceBO> namespaceBOs) {
if (CollectionUtils.isEmpty(namespaceBOs)) {
return Collections.emptyList();
}
List<OpenNamespaceDTO> openNamespaceDTOs =
namespaceBOs.stream().map(OpenApiBeanUtils::transformFromNamespaceBO)
.collect(Collectors.toCollection(LinkedList::new));
return openNamespaceDTOs;
}
public static OpenNamespaceLockDTO transformFromNamespaceLockDTO(String namespaceName,
NamespaceLockDTO namespaceLock) {
OpenNamespaceLockDTO lock = new OpenNamespaceLockDTO();
lock.setNamespaceName(namespaceName);
if (namespaceLock == null) {
lock.setLocked(false);
} else {
lock.setLocked(true);
lock.setLockedBy(namespaceLock.getDataChangeCreatedBy());
}
return lock;
}
public static OpenGrayReleaseRuleDTO transformFromGrayReleaseRuleDTO(
GrayReleaseRuleDTO grayReleaseRuleDTO) {
Preconditions.checkArgument(grayReleaseRuleDTO != null);
return BeanUtils.transform(OpenGrayReleaseRuleDTO.class, grayReleaseRuleDTO);
}
public static GrayReleaseRuleDTO transformToGrayReleaseRuleDTO(
OpenGrayReleaseRuleDTO openGrayReleaseRuleDTO) {
Preconditions.checkArgument(openGrayReleaseRuleDTO != null);
String appId = openGrayReleaseRuleDTO.getAppId();
String branchName = openGrayReleaseRuleDTO.getBranchName();
String clusterName = openGrayReleaseRuleDTO.getClusterName();
String namespaceName = openGrayReleaseRuleDTO.getNamespaceName();
GrayReleaseRuleDTO grayReleaseRuleDTO =
new GrayReleaseRuleDTO(appId, clusterName, namespaceName, branchName);
Set<OpenGrayReleaseRuleItemDTO> openGrayReleaseRuleItemDTOSet =
openGrayReleaseRuleDTO.getRuleItems();
openGrayReleaseRuleItemDTOSet.forEach(openGrayReleaseRuleItemDTO -> {
String clientAppId = openGrayReleaseRuleItemDTO.getClientAppId();
Set<String> clientIpList = openGrayReleaseRuleItemDTO.getClientIpList();
GrayReleaseRuleItemDTO ruleItem = new GrayReleaseRuleItemDTO(clientAppId, clientIpList);
grayReleaseRuleDTO.addRuleItem(ruleItem);
});
return grayReleaseRuleDTO;
}
public static List<OpenAppDTO> transformFromApps(final List<App> apps) {
if (CollectionUtils.isEmpty(apps)) {
return Collections.emptyList();
}
return apps.stream().map(OpenApiBeanUtils::transformFromApp).collect(Collectors.toList());
}
public static OpenAppDTO transformFromApp(final App app) {
Preconditions.checkArgument(app != null);
return BeanUtils.transform(OpenAppDTO.class, app);
}
public static OpenClusterDTO transformFromClusterDTO(ClusterDTO Cluster) {
Preconditions.checkArgument(Cluster != null);
return BeanUtils.transform(OpenClusterDTO.class, Cluster);
}
public static ClusterDTO transformToClusterDTO(OpenClusterDTO openClusterDTO) {
Preconditions.checkArgument(openClusterDTO != null);
return BeanUtils.transform(ClusterDTO.class, openClusterDTO);
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/tech-support-qq-3.png | PNG
IHDR . . "h 'IDATx puq -eu%Խ(DKEPv}"߈% Ed+Y" g <"&,D wP3<g;IOOO?sο3'5)I(P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
Q<ޕǶ='Q~7b[Wg>&((((((((72l;ab\~R}LEQEQEQEQEQEQEQEQEľR}LEQEQEQ(((1QEQp|b7 F C((((((((( -s0gcHEQEQEQEQEQEQEQEQE1(} 1tc(((((((((aiEe¼L(EQ2(eDQ((jQL?D퓢((((((((؊)&ޡxAc70=eQEQEQEQEQEQEQEQEQlݱAö
$((((((((( !l??Pqw!}̧$((((((((öaC' ?EQEQEQEQEQEQEQEQC1vdp7b7=SEQEQEQEQEQEQEQEQE1 q>l~'RQEQEQEQń#؊(ko ;veDQEo۷ 1bDaaa QlE msNKKA Ov'vL("6JKK| xA(
;u$(I&(b(bʕ]tEQP#<"C1voodv9s4n0# D1.)&F(((JqWeW~Z5yr7 (Evڽvf-X^YUn߁M EQE
$7XŎ سۣj<IV
ES Cح97l]wlUBV'v wYCM˝5oY[ZVS VEs(bPXGWo9<U
;vEQL|u{OX{o~SD< O剢(&8E*DCKU 2XVQQIߏe0y< y:^xAE1a)!w
ԡ ,N Sx^ nѩ),M?!{xؾ}{Qa;">]IM@ `/N;:y뿝ɴdzv}.lS+& CpH#pЙ]w3e{l@cg`?E1)wFPeNK'
"
r"8_>Bs'e?+WXdY큢 ebKCܖ3yd^l Ɯ(Dxk9?trf`$3w.a:sN>#3q״;S˄ ztx?,Q=. w% gAo%#lL]XX(87o^Pٲْ<2!"4+VM NW-=>qk-[ "t9]5rLaΝ;(&Ef -_m)]/g0iEȔCw~(4CzeC{Lt& 蚑֓ fH$aRny6)N)SDQ
!qO?jCo63njo(e!7Y 1Cp]@nȊDKv?{pMbâQp:m9^pe<C 2pM%3,?~ G H42EXWkJU06/W1`0) |;{SSgfWyVr] xۅ4YL2 7_en@6#U[:̐Dw.Zb"N gysEQc;ܣ5LA-;H@19w @O3/ލeKm1XM5I1Ud
*٫c#[|!vEQcWaдn}aJ˩*rC!>(Z-jOY vX7ZJb@E4 -
"vnG!]J,9-Kc#y-e,7/tTL4}ERWmyr MzՆeHA:f<SdɄ-
5*f EQKmX^RHujh$:0 PTI貼]HE C(hpGGrleYld4c'b Pݡg!~>+ Z^qO? ;%zw9t$-7':cva]<036nf#6z"3P,X;OʦrxyOc7`Wf$?Ņ GWQQ
,7bi$sH!JN5c4tjҬ"! A
sOa6kqx(!_c^v̆jQ!4P S_Kch,3je3e@W' 6'O[ Y
H;
,y,k- )(#gSx."&Lhqe EU6ZEȉw]op÷=hg5d[#ou7䁬0c샅07
М1. ;VE1D?hW".MFʲ$6+?1b3x
imϢ5 [4f0Xsc` ˇvܰ xHKC^ݰOC%F;5̏x#Xi7Q)"EEEGu) fqhԟ$CA#s&eI*Us@㦙ϐ ;+g8d`<ۖ_[(\~ tƊJ/(E5f;,q)Bq1vD2~fݴ'm;3Cc9̷y4V͛{Y.ndzMFztN Yq5K_iMיm~fry~וn+RdS`?'ܰ(bv^3i࡙~6oxu3I\J j9YȒ
˧@ѮZ$+RbukXOcft(u E<)(nٲKѹfJEPxTh!87,>J%$SY c!fd
[S[bmP$+/ET>HpQ~87"ق`崃"Y< Y;wc7ɊIze$kId"D̴57Qń+zꚢ#ۥvjѴ!.E'%R,оm%5hA3dY$EEӟqO MNz+**#X(&&O
xsӹpbe8n0dVqù7ŜC) <[{1O
ncFqcy%qϢɷ]qw(Pc6-dTS< ZtS"F{.
;oM~?*8Q'%muByKf對 i>=lÒչqc3z#A8 Қsp._5ny&79cCdňodS'nDQbeFǪj}c{Yzt #ѹ!
7%Λlڶ;Cns 3&=ڷȍ{Qmlj4( ň+3W\N?m'F]03i<luh#,1bŧ]E2+ٚW/I9CHw'G:gnƖ-[gDye(bQ<ȍ[R
N?T$Ns5zQMs$\yMn'1N Fjws>@8|isRR@")".c;f#7.ZbD#\FA+3nby+yCz
oU&8oCSj?}¤}~4}3P̜^QQiH6U[)E?߀X< kUھHk$qm`'169Ri9SR ɍBY~\|%w=tD)Jka)n!+n*)6l$%! ?E10;wG\8k|АfWB۸fLԠ;^@bmw;2ۻN#=CkN2w2YةN/9KBŧFN&'"5M(1Hڵ:8Kq ڦ Fמ*2~P={qp^M:
iw`ivy)7 `@s v}*goAT6 ( ohl]{TFQAsnbR[:g
oL
UѴ!4fp(|;یSQc{8ECwS[maTã,%v8 |/oa)P68)c#[|!XQŐRyeWz#5!]5i[D#$ג58arѰ>uܺ6iԖImE˟f>6%,S;4]L2Eq6͋UbEQCJOg[5 _ZTIRr~44ȄnVJS$[e{c#)>S=HgV͛`Gn67HcԨL3g&E5/VEя\L7*w,t=aљĈ(0+^KC
<C 7_E1i ik</唠Tv C rOь}hz\H"]^6s?e mE+Ҧ.<}Kb,㲣21#'q痡Ud-,Oj/f@sI"N>lc;.g
~ Ğ={(&ņFAR"oh;qYEEeNI}ħ'i 2zR3JiM
3(#"2bf__ec9ZC狢(ݹkw'ˀDy%:8/E) )ZW{x o3c*H+Vp: d! 3&dߤyAwQ7&PQ0@.ܦb2s֛KLY*[ NHؔ lXw
cT xu k/4"o("Q^YEHԨd9ˊsNݲe J3E# U<
~^8%-}ִiAL04 q̀~DJx 9jTWא`87u D EH_cd1jZԁКKU֨r>:s8o2ttj
y+nKn0#(
M?nC Syygt!7=^FVl.FsASy6TA Z wzi[<]4?PFYYY۶mEQ -ZsQM?m]N/{nz6O:Rs><Yc6쯯y2-MEQs5_O)c|'4`~tSb[ƏDi0S~4EQl-=n,GZmxыԛ|hɰhᑥ(bkhQ2?dHaCk?ݬH>t+RVx Q__wﰡ m='eW>]CccyeUH笴ZDHOrtE QFaۚE1^);O
34fX6[Q<ǯћ*6wΚU4fY[x9EQL(Y CQńhˡ(bR$ڶm;{0S \_QK~Fvq\3EQEQţyT4_*(~) (Sx衇JKKEQE1`={3gNȫVQa;;F`|@ܹ#rrrx g%?S3x
}EQ ؚ(( >}< pSEQlJEQEQEQER !
9Ha EQEQEQEQEQEQEQEQL1v ۣ} ^(((((((((' W?.܍b=5mJEQEQEQEQEQEQEQEQEc/lC aЅkEQEQEQEQEQEQEQEQEQ Áf?3AD=;yQEQEQEQEQEQEQEQEQl=a;E;A`{]Ol(((((((((> `_;q p5P!((((((((Կ voö}kN QEQEQEQEQEQEQEQEQbF5 ߯`W|0CEQEQEQEQEQEQEQEQE1H
6(((((((((bw`!`?EQEQEQEQEQEQEQEQEQ
v(%ksI((((((((` Pvٰ
mEQEQEQEQEQEQEQEQEQT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB!
(*
QT(DQPB!
B
QT(-vǨ IENDB` | PNG
IHDR . . "h 'IDATx puq -eu%Խ(DKEPv}"߈% Ed+Y" g <"&,D wP3<g;IOOO?sο3'5)I(P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
Q<ޕǶ='Q~7b[Wg>&((((((((72l;ab\~R}LEQEQEQEQEQEQEQEQEľR}LEQEQEQ(((1QEQp|b7 F C((((((((( -s0gcHEQEQEQEQEQEQEQEQE1(} 1tc(((((((((aiEe¼L(EQ2(eDQ((jQL?D퓢((((((((؊)&ޡxAc70=eQEQEQEQEQEQEQEQEQlݱAö
$((((((((( !l??Pqw!}̧$((((((((öaC' ?EQEQEQEQEQEQEQEQC1vdp7b7=SEQEQEQEQEQEQEQEQE1 q>l~'RQEQEQEQń#؊(ko ;veDQEo۷ 1bDaaa QlE msNKKA Ov'vL("6JKK| xA(
;u$(I&(b(bʕ]tEQP#<"C1voodv9s4n0# D1.)&F(((JqWeW~Z5yr7 (Evڽvf-X^YUn߁M EQE
$7XŎ سۣj<IV
ES Cح97l]wlUBV'v wYCM˝5oY[ZVS VEs(bPXGWo9<U
;vEQL|u{OX{o~SD< O剢(&8E*DCKU 2XVQQIߏe0y< y:^xAE1a)!w
ԡ ,N Sx^ nѩ),M?!{xؾ}{Qa;">]IM@ `/N;:y뿝ɴdzv}.lS+& CpH#pЙ]w3e{l@cg`?E1)wFPeNK'
"
r"8_>Bs'e?+WXdY큢 ebKCܖ3yd^l Ɯ(Dxk9?trf`$3w.a:sN>#3q״;S˄ ztx?,Q=. w% gAo%#lL]XX(87o^Pٲْ<2!"4+VM NW-=>qk-[ "t9]5rLaΝ;(&Ef -_m)]/g0iEȔCw~(4CzeC{Lt& 蚑֓ fH$aRny6)N)SDQ
!qO?jCo63njo(e!7Y 1Cp]@nȊDKv?{pMbâQp:m9^pe<C 2pM%3,?~ G H42EXWkJU06/W1`0) |;{SSgfWyVr] xۅ4YL2 7_en@6#U[:̐Dw.Zb"N gysEQc;ܣ5LA-;H@19w @O3/ލeKm1XM5I1Ud
*٫c#[|!vEQcWaдn}aJ˩*rC!>(Z-jOY vX7ZJb@E4 -
"vnG!]J,9-Kc#y-e,7/tTL4}ERWmyr MzՆeHA:f<SdɄ-
5*f EQKmX^RHujh$:0 PTI貼]HE C(hpGGrleYld4c'b Pݡg!~>+ Z^qO? ;%zw9t$-7':cva]<036nf#6z"3P,X;OʦrxyOc7`Wf$?Ņ GWQQ
,7bi$sH!JN5c4tjҬ"! A
sOa6kqx(!_c^v̆jQ!4P S_Kch,3je3e@W' 6'O[ Y
H;
,y,k- )(#gSx."&Lhqe EU6ZEȉw]op÷=hg5d[#ou7䁬0c샅07
М1. ;VE1D?hW".MFʲ$6+?1b3x
imϢ5 [4f0Xsc` ˇvܰ xHKC^ݰOC%F;5̏x#Xi7Q)"EEEGu) fqhԟ$CA#s&eI*Us@㦙ϐ ;+g8d`<ۖ_[(\~ tƊJ/(E5f;,q)Bq1vD2~fݴ'm;3Cc9̷y4V͛{Y.ndzMFztN Yq5K_iMיm~fry~וn+RdS`?'ܰ(bv^3i࡙~6oxu3I\J j9YȒ
˧@ѮZ$+RbukXOcft(u E<)(nٲKѹfJEPxTh!87,>J%$SY c!fd
[S[bmP$+/ET>HpQ~87"ق`崃"Y< Y;wc7ɊIze$kId"D̴57Qń+zꚢ#ۥvjѴ!.E'%R,оm%5hA3dY$EEӟqO MNz+**#X(&&O
xsӹpbe8n0dVqù7ŜC) <[{1O
ncFqcy%qϢɷ]qw(Pc6-dTS< ZtS"F{.
;oM~?*8Q'%muByKf對 i>=lÒչqc3z#A8 Қsp._5ny&79cCdňodS'nDQbeFǪj}c{Yzt #ѹ!
7%Λlڶ;Cns 3&=ڷȍ{Qmlj4( ň+3W\N?m'F]03i<luh#,1bŧ]E2+ٚW/I9CHw'G:gnƖ-[gDye(bQ<ȍ[R
N?T$Ns5zQMs$\yMn'1N Fjws>@8|isRR@")".c;f#7.ZbD#\FA+3nby+yCz
oU&8oCSj?}¤}~4}3P̜^QQiH6U[)E?߀X< kUھHk$qm`'169Ri9SR ɍBY~\|%w=tD)Jka)n!+n*)6l$%! ?E10;wG\8k|АfWB۸fLԠ;^@bmw;2ۻN#=CkN2w2YةN/9KBŧFN&'"5M(1Hڵ:8Kq ڦ Fמ*2~P={qp^M:
iw`ivy)7 `@s v}*goAT6 ( ohl]{TFQAsnbR[:g
oL
UѴ!4fp(|;یSQc{8ECwS[maTã,%v8 |/oa)P68)c#[|!XQŐRyeWz#5!]5i[D#$ג58arѰ>uܺ6iԖImE˟f>6%,S;4]L2Eq6͋UbEQCJOg[5 _ZTIRr~44ȄnVJS$[e{c#)>S=HgV͛`Gn67HcԨL3g&E5/VEя\L7*w,t=aљĈ(0+^KC
<C 7_E1i ik</唠Tv C rOь}hz\H"]^6s?e mE+Ҧ.<}Kb,㲣21#'q痡Ud-,Oj/f@sI"N>lc;.g
~ Ğ={(&ņFAR"oh;qYEEeNI}ħ'i 2zR3JiM
3(#"2bf__ec9ZC狢(ݹkw'ˀDy%:8/E) )ZW{x o3c*H+Vp: d! 3&dߤyAwQ7&PQ0@.ܦb2s֛KLY*[ NHؔ lXw
cT xu k/4"o("Q^YEHԨd9ˊsNݲe J3E# U<
~^8%-}ִiAL04 q̀~DJx 9jTWא`87u D EH_cd1jZԁКKU֨r>:s8o2ttj
y+nKn0#(
M?nC Syygt!7=^FVl.FsASy6TA Z wzi[<]4?PFYYY۶mEQ -ZsQM?m]N/{nz6O:Rs><Yc6쯯y2-MEQs5_O)c|'4`~tSb[ƏDi0S~4EQl-=n,GZmxыԛ|hɰhᑥ(bkhQ2?dHaCk?ݬH>t+RVx Q__wﰡ m='eW>]CccyeUH笴ZDHOrtE QFaۚE1^);O
34fX6[Q<ǯћ*6wΚU4fY[x9EQL(Y CQńhˡ(bR$ڶm;{0S \_QK~Fvq\3EQEQţyT4_*(~) (Sx衇JKKEQE1`={3gNȫVQa;;F`|@ܹ#rrrx g%?S3x
}EQ ؚ(( >}< pSEQlJEQEQEQER !
9Ha EQEQEQEQEQEQEQEQL1v ۣ} ^(((((((((' W?.܍b=5mJEQEQEQEQEQEQEQEQEc/lC aЅkEQEQEQEQEQEQEQEQEQ Áf?3AD=;yQEQEQEQEQEQEQEQEQl=a;E;A`{]Ol(((((((((> `_;q p5P!((((((((Կ voö}kN QEQEQEQEQEQEQEQEQbF5 ߯`W|0CEQEQEQEQEQEQEQEQE1H
6(((((((((bw`!`?EQEQEQEQEQEQEQEQEQ
v(%ksI((((((((` Pvٰ
mEQEQEQEQEQEQEQEQEQT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB!
(*
QT(DQPB!
B
QT(-vǨ IENDB` | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/DefaultConfigTest.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.awaitility.Awaitility.await;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import org.awaitility.core.ThrowingRunnable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigTest {
private File someResourceDir;
private String someNamespace;
private ConfigRepository configRepository;
private Properties someProperties;
private ConfigSourceType someSourceType;
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someResourceDir = new File(ClassLoaderUtil.getClassPath() + "/META-INF/config");
someResourceDir.mkdirs();
someNamespace = "someName";
configRepository = mock(ConfigRepository.class);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someResourceDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
@Test
public void testGetPropertyWithAllPropertyHierarchy() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String lastKey = "lastKey";
String someResourceValue = "resource-value";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someLocalFileValue);
someProperties.setProperty(anotherKey, someLocalFileValue);
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.write(someKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(anotherKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(lastKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
String someKeyValue = defaultConfig.getProperty(someKey, null);
String anotherKeyValue = defaultConfig.getProperty(anotherKey, null);
String lastKeyValue = defaultConfig.getProperty(lastKey, null);
//clean up
System.clearProperty(someKey);
assertEquals(someSystemPropertyValue, someKeyValue);
assertEquals(someLocalFileValue, anotherKeyValue);
assertEquals(someResourceValue, lastKeyValue);
assertEquals(someSourceType, defaultConfig.getSourceType());
}
@Test
public void testGetIntProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getIntProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithPropertyChanges() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer anotherValue = 3;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, String.valueOf(anotherValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithSmallCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
String anotherKey = "anotherKey";
Integer anotherValue = 3;
Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithSmallCache());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(someProperties.getProperty(anotherKey)).thenReturn(String.valueOf(anotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(anotherKey);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithShortExpireTime() throws Exception {
final String someKey = "someKey";
final Integer someValue = 2;
final Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithShortExpireTime());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
final DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
await().atMost(500, TimeUnit.MILLISECONDS).untilAsserted(new ThrowingRunnable() {
@Override
public void run() throws Throwable {
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
});
}
@Test
public void testGetLongProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Long someValue = 2L;
Long someDefaultValue = -1L;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getLongProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getLongProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetShortProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Short someValue = 2;
Short someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getShortProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getShortProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetFloatProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Float someValue = 2.20f;
Float someDefaultValue = -1f;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getFloatProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getFloatProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetDoubleProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Double someValue = 2.20d;
Double someDefaultValue = -1d;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getDoubleProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getDoubleProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetByteProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Byte someValue = 10;
Byte someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getByteProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getByteProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetBooleanProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Boolean someValue = true;
Boolean someDefaultValue = false;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getBooleanProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getBooleanProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetArrayProperty() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
}
@Test
public void testGetArrayPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
verify(someProperties, times(3)).getProperty(someKey);
}
@Test
public void testGetArrayPropertyMultipleTimesWithCacheAndValueChanges() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String[] values = new String[]{"a", "b", "c"};
String[] anotherValues = new String[]{"b", "c", "d"};
String someValue = Joiner.on(someDelimiter).join(values);
String anotherValue = Joiner.on(someDelimiter).join(anotherValues);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, anotherValue);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertArrayEquals(anotherValues, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
}
@Test
public void testGetDatePropertyWithFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithFormat(defaultConfig, shortDate, "shortDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "mediumDateProperty", "yyyy-MM-dd HH:mm:ss",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "mediumDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, longDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss.SSS",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "longDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, someDefaultValue, "stringProperty", "yyyy-MM-dd", someDefaultValue);
}
@Test
public void testGetDatePropertyWithNoFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithoutFormat(defaultConfig, shortDate, "shortDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, mediumDate, "mediumDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, longDate, "longDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, someDefaultValue, "stringProperty", someDefaultValue);
}
@Test
public void testGetEnumProperty() throws Exception {
SomeEnum someDefaultValue = SomeEnum.defaultValue;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("enumProperty", "someValue");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(SomeEnum.someValue, defaultConfig.getEnumProperty("enumProperty", SomeEnum.class, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getEnumProperty("stringProperty", SomeEnum.class, someDefaultValue));
}
@Test
public void testGetDurationProperty() throws Exception {
long someDefaultValue = 1000;
long result = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("durationProperty", "2D3H4m5S123ms");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(result, defaultConfig.getDurationProperty("durationProperty", someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getDurationProperty("stringProperty", someDefaultValue));
}
@Test
public void testOnRepositoryChange() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String keyToBeDeleted = "keyToBeDeleted";
String keyToBeDeletedValue = "keyToBeDeletedValue";
String yetAnotherKey = "yetAnotherKey";
String yetAnotherValue = "yetAnotherValue";
String yetAnotherResourceValue = "yetAnotherResourceValue";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.putAll(ImmutableMap
.of(someKey, someLocalFileValue, anotherKey, someLocalFileValue, keyToBeDeleted,
keyToBeDeletedValue, yetAnotherKey, yetAnotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.append(yetAnotherKey + "=" + yetAnotherResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someSourceType, defaultConfig.getSourceType());
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
defaultConfig.addChangeListener(someListener);
Properties newProperties = new Properties();
String someKeyNewValue = "new-some-value";
String anotherKeyNewValue = "another-new-value";
String newKey = "newKey";
String newValue = "newValue";
newProperties.putAll(ImmutableMap
.of(someKey, someKeyNewValue, anotherKey, anotherKeyNewValue, newKey, newValue));
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
defaultConfig.onRepositoryChange(someNamespace, newProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
//clean up
System.clearProperty(someKey);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(4, changeEvent.changedKeys().size());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(someLocalFileValue, anotherKeyChange.getOldValue());
assertEquals(anotherKeyNewValue, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, anotherKeyChange.getChangeType());
ConfigChange yetAnotherKeyChange = changeEvent.getChange(yetAnotherKey);
assertEquals(yetAnotherValue, yetAnotherKeyChange.getOldValue());
assertEquals(yetAnotherResourceValue, yetAnotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, yetAnotherKeyChange.getChangeType());
ConfigChange keyToBeDeletedChange = changeEvent.getChange(keyToBeDeleted);
assertEquals(keyToBeDeletedValue, keyToBeDeletedChange.getOldValue());
assertEquals(null, keyToBeDeletedChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, keyToBeDeletedChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, defaultConfig.getSourceType());
}
@Test
public void testFireConfigChangeWithInterestedKeys() throws Exception {
String someKeyChanged = "someKeyChanged";
String anotherKeyChanged = "anotherKeyChanged";
String someKeyNotChanged = "someKeyNotChanged";
String someNamespace = "someNamespace";
Map<String, ConfigChange> changes = Maps.newHashMap();
changes.put(someKeyChanged, mock(ConfigChange.class));
changes.put(anotherKeyChanged, mock(ConfigChange.class));
ConfigChangeEvent someChangeEvent = new ConfigChangeEvent(someNamespace, changes);
final SettableFuture<ConfigChangeEvent> interestedInAllKeysFuture = SettableFuture.create();
ConfigChangeListener interestedInAllKeys = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInAllKeysFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKey = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyNotChangedFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKeyNotChanged = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyNotChangedFuture.set(changeEvent);
}
};
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(interestedInAllKeys);
config.addChangeListener(interestedInSomeKey, Sets.newHashSet(someKeyChanged));
config.addChangeListener(interestedInSomeKeyNotChanged, Sets.newHashSet(someKeyNotChanged));
config.fireConfigChange(someChangeEvent);
ConfigChangeEvent changeEvent = interestedInAllKeysFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent, changeEvent);
{
// hidden variables in scope
ConfigChangeEvent actualConfigChangeEvent = interestedInSomeKeyFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent.changedKeys(), actualConfigChangeEvent.changedKeys());
for (String changedKey : someChangeEvent.changedKeys()) {
ConfigChange expectConfigChange = someChangeEvent.getChange(changedKey);
ConfigChange actualConfigChange = actualConfigChangeEvent.getChange(changedKey);
assertEquals(expectConfigChange, actualConfigChange);
}
}
assertFalse(interestedInSomeKeyNotChangedFuture.isDone());
}
@Test
public void testRemoveChangeListener() throws Exception {
String someNamespace = "someNamespace";
final ConfigChangeEvent someConfigChangeEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherConfigChangeEvent = mock(ConfigChangeEvent.class);
final SettableFuture<ConfigChangeEvent> someListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> someListenerFuture2 = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
someListenerFuture1.set(changeEvent);
} else {
someListenerFuture2.set(changeEvent);
}
}
};
final SettableFuture<ConfigChangeEvent> anotherListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> anotherListenerFuture2 = SettableFuture.create();
ConfigChangeListener anotherListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
anotherListenerFuture1.set(changeEvent);
} else {
anotherListenerFuture2.set(changeEvent);
}
}
};
ConfigChangeListener yetAnotherListener = mock(ConfigChangeListener.class);
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(someListener);
config.addChangeListener(anotherListener);
config.fireConfigChange(someConfigChangeEvent);
assertEquals(someConfigChangeEvent, someListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertEquals(someConfigChangeEvent, anotherListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertFalse(config.removeChangeListener(yetAnotherListener));
assertTrue(config.removeChangeListener(someListener));
config.fireConfigChange(anotherConfigChangeEvent);
assertEquals(anotherConfigChangeEvent, anotherListenerFuture2.get(500, TimeUnit.MILLISECONDS));
TimeUnit.MILLISECONDS.sleep(100);
assertFalse(someListenerFuture2.isDone());
}
@Test
public void testGetPropertyNames() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
//set up config repo
someProperties = new Properties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithOrderedProperties() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
//set up config repo
someProperties = new OrderedProperties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithNullProp() {
when(configRepository.getConfig()).thenReturn(null);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(Collections.emptySet(), propertyNames);
}
@Test
public void testGetPropertyWithFunction() throws Exception {
String someKey = "someKey";
String someValue = "a,b,c";
String someNullKey = "someNullKey";
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(defaultConfig.getProperty(someKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList("a", "b", "c"));
assertEquals(defaultConfig.getProperty(someNullKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList());
}
@Test
public void testLoadFromRepositoryFailedAndThenRecovered() {
String someKey = "someKey";
String someValue = "someValue";
String someDefaultValue = "someDefaultValue";
ConfigSourceType someSourceType = ConfigSourceType.REMOTE;
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
verify(configRepository, times(1)).addChangeListener(defaultConfig);
assertEquals(ConfigSourceType.NONE, defaultConfig.getSourceType());
assertEquals(someDefaultValue, defaultConfig.getProperty(someKey, someDefaultValue));
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getSourceType()).thenReturn(someSourceType);
defaultConfig.onRepositoryChange(someNamespace, someProperties);
assertEquals(someSourceType, defaultConfig.getSourceType());
assertEquals(someValue, defaultConfig.getProperty(someKey, someDefaultValue));
}
private void checkDatePropertyWithFormat(Config config, Date expected, String propertyName, String format, Date
defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, format, defaultValue));
}
private void checkDatePropertyWithoutFormat(Config config, Date expected, String propertyName, Date defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, defaultValue));
}
private Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
private enum SomeEnum {
someValue, defaultValue
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 10;
}
@Override
public long getConfigCacheExpireTime() {
return 1;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MINUTES;
}
}
public static class MockConfigUtilWithSmallCache extends MockConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 1;
}
}
public static class MockConfigUtilWithShortExpireTime extends MockConfigUtil {
@Override
public long getConfigCacheExpireTime() {
return 50;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MILLISECONDS;
}
}
}
| /*
* 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.awaitility.Awaitility.await;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import org.awaitility.core.ThrowingRunnable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigTest {
private File someResourceDir;
private String someNamespace;
private ConfigRepository configRepository;
private Properties someProperties;
private ConfigSourceType someSourceType;
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someResourceDir = new File(ClassLoaderUtil.getClassPath() + "/META-INF/config");
someResourceDir.mkdirs();
someNamespace = "someName";
configRepository = mock(ConfigRepository.class);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someResourceDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
@Test
public void testGetPropertyWithAllPropertyHierarchy() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String lastKey = "lastKey";
String someResourceValue = "resource-value";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someLocalFileValue);
someProperties.setProperty(anotherKey, someLocalFileValue);
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.write(someKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(anotherKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(lastKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
String someKeyValue = defaultConfig.getProperty(someKey, null);
String anotherKeyValue = defaultConfig.getProperty(anotherKey, null);
String lastKeyValue = defaultConfig.getProperty(lastKey, null);
//clean up
System.clearProperty(someKey);
assertEquals(someSystemPropertyValue, someKeyValue);
assertEquals(someLocalFileValue, anotherKeyValue);
assertEquals(someResourceValue, lastKeyValue);
assertEquals(someSourceType, defaultConfig.getSourceType());
}
@Test
public void testGetIntProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getIntProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithPropertyChanges() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer anotherValue = 3;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, String.valueOf(anotherValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithSmallCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
String anotherKey = "anotherKey";
Integer anotherValue = 3;
Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithSmallCache());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(someProperties.getProperty(anotherKey)).thenReturn(String.valueOf(anotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(anotherKey);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithShortExpireTime() throws Exception {
final String someKey = "someKey";
final Integer someValue = 2;
final Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithShortExpireTime());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
final DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
await().atMost(500, TimeUnit.MILLISECONDS).untilAsserted(new ThrowingRunnable() {
@Override
public void run() throws Throwable {
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
});
}
@Test
public void testGetLongProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Long someValue = 2L;
Long someDefaultValue = -1L;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getLongProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getLongProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetShortProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Short someValue = 2;
Short someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getShortProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getShortProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetFloatProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Float someValue = 2.20f;
Float someDefaultValue = -1f;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getFloatProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getFloatProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetDoubleProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Double someValue = 2.20d;
Double someDefaultValue = -1d;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getDoubleProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getDoubleProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetByteProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Byte someValue = 10;
Byte someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getByteProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getByteProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetBooleanProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Boolean someValue = true;
Boolean someDefaultValue = false;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getBooleanProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getBooleanProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetArrayProperty() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
}
@Test
public void testGetArrayPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
verify(someProperties, times(3)).getProperty(someKey);
}
@Test
public void testGetArrayPropertyMultipleTimesWithCacheAndValueChanges() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String[] values = new String[]{"a", "b", "c"};
String[] anotherValues = new String[]{"b", "c", "d"};
String someValue = Joiner.on(someDelimiter).join(values);
String anotherValue = Joiner.on(someDelimiter).join(anotherValues);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, anotherValue);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertArrayEquals(anotherValues, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
}
@Test
public void testGetDatePropertyWithFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithFormat(defaultConfig, shortDate, "shortDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "mediumDateProperty", "yyyy-MM-dd HH:mm:ss",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "mediumDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, longDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss.SSS",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "longDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, someDefaultValue, "stringProperty", "yyyy-MM-dd", someDefaultValue);
}
@Test
public void testGetDatePropertyWithNoFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithoutFormat(defaultConfig, shortDate, "shortDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, mediumDate, "mediumDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, longDate, "longDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, someDefaultValue, "stringProperty", someDefaultValue);
}
@Test
public void testGetEnumProperty() throws Exception {
SomeEnum someDefaultValue = SomeEnum.defaultValue;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("enumProperty", "someValue");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(SomeEnum.someValue, defaultConfig.getEnumProperty("enumProperty", SomeEnum.class, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getEnumProperty("stringProperty", SomeEnum.class, someDefaultValue));
}
@Test
public void testGetDurationProperty() throws Exception {
long someDefaultValue = 1000;
long result = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("durationProperty", "2D3H4m5S123ms");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(result, defaultConfig.getDurationProperty("durationProperty", someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getDurationProperty("stringProperty", someDefaultValue));
}
@Test
public void testOnRepositoryChange() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String keyToBeDeleted = "keyToBeDeleted";
String keyToBeDeletedValue = "keyToBeDeletedValue";
String yetAnotherKey = "yetAnotherKey";
String yetAnotherValue = "yetAnotherValue";
String yetAnotherResourceValue = "yetAnotherResourceValue";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.putAll(ImmutableMap
.of(someKey, someLocalFileValue, anotherKey, someLocalFileValue, keyToBeDeleted,
keyToBeDeletedValue, yetAnotherKey, yetAnotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.append(yetAnotherKey + "=" + yetAnotherResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someSourceType, defaultConfig.getSourceType());
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
defaultConfig.addChangeListener(someListener);
Properties newProperties = new Properties();
String someKeyNewValue = "new-some-value";
String anotherKeyNewValue = "another-new-value";
String newKey = "newKey";
String newValue = "newValue";
newProperties.putAll(ImmutableMap
.of(someKey, someKeyNewValue, anotherKey, anotherKeyNewValue, newKey, newValue));
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
defaultConfig.onRepositoryChange(someNamespace, newProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
//clean up
System.clearProperty(someKey);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(4, changeEvent.changedKeys().size());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(someLocalFileValue, anotherKeyChange.getOldValue());
assertEquals(anotherKeyNewValue, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, anotherKeyChange.getChangeType());
ConfigChange yetAnotherKeyChange = changeEvent.getChange(yetAnotherKey);
assertEquals(yetAnotherValue, yetAnotherKeyChange.getOldValue());
assertEquals(yetAnotherResourceValue, yetAnotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, yetAnotherKeyChange.getChangeType());
ConfigChange keyToBeDeletedChange = changeEvent.getChange(keyToBeDeleted);
assertEquals(keyToBeDeletedValue, keyToBeDeletedChange.getOldValue());
assertEquals(null, keyToBeDeletedChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, keyToBeDeletedChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, defaultConfig.getSourceType());
}
@Test
public void testFireConfigChangeWithInterestedKeys() throws Exception {
String someKeyChanged = "someKeyChanged";
String anotherKeyChanged = "anotherKeyChanged";
String someKeyNotChanged = "someKeyNotChanged";
String someNamespace = "someNamespace";
Map<String, ConfigChange> changes = Maps.newHashMap();
changes.put(someKeyChanged, mock(ConfigChange.class));
changes.put(anotherKeyChanged, mock(ConfigChange.class));
ConfigChangeEvent someChangeEvent = new ConfigChangeEvent(someNamespace, changes);
final SettableFuture<ConfigChangeEvent> interestedInAllKeysFuture = SettableFuture.create();
ConfigChangeListener interestedInAllKeys = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInAllKeysFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKey = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyNotChangedFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKeyNotChanged = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyNotChangedFuture.set(changeEvent);
}
};
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(interestedInAllKeys);
config.addChangeListener(interestedInSomeKey, Sets.newHashSet(someKeyChanged));
config.addChangeListener(interestedInSomeKeyNotChanged, Sets.newHashSet(someKeyNotChanged));
config.fireConfigChange(someChangeEvent);
ConfigChangeEvent changeEvent = interestedInAllKeysFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent, changeEvent);
{
// hidden variables in scope
ConfigChangeEvent actualConfigChangeEvent = interestedInSomeKeyFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent.changedKeys(), actualConfigChangeEvent.changedKeys());
for (String changedKey : someChangeEvent.changedKeys()) {
ConfigChange expectConfigChange = someChangeEvent.getChange(changedKey);
ConfigChange actualConfigChange = actualConfigChangeEvent.getChange(changedKey);
assertEquals(expectConfigChange, actualConfigChange);
}
}
assertFalse(interestedInSomeKeyNotChangedFuture.isDone());
}
@Test
public void testRemoveChangeListener() throws Exception {
String someNamespace = "someNamespace";
final ConfigChangeEvent someConfigChangeEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherConfigChangeEvent = mock(ConfigChangeEvent.class);
final SettableFuture<ConfigChangeEvent> someListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> someListenerFuture2 = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
someListenerFuture1.set(changeEvent);
} else {
someListenerFuture2.set(changeEvent);
}
}
};
final SettableFuture<ConfigChangeEvent> anotherListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> anotherListenerFuture2 = SettableFuture.create();
ConfigChangeListener anotherListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
anotherListenerFuture1.set(changeEvent);
} else {
anotherListenerFuture2.set(changeEvent);
}
}
};
ConfigChangeListener yetAnotherListener = mock(ConfigChangeListener.class);
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(someListener);
config.addChangeListener(anotherListener);
config.fireConfigChange(someConfigChangeEvent);
assertEquals(someConfigChangeEvent, someListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertEquals(someConfigChangeEvent, anotherListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertFalse(config.removeChangeListener(yetAnotherListener));
assertTrue(config.removeChangeListener(someListener));
config.fireConfigChange(anotherConfigChangeEvent);
assertEquals(anotherConfigChangeEvent, anotherListenerFuture2.get(500, TimeUnit.MILLISECONDS));
TimeUnit.MILLISECONDS.sleep(100);
assertFalse(someListenerFuture2.isDone());
}
@Test
public void testGetPropertyNames() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
//set up config repo
someProperties = new Properties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithOrderedProperties() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
//set up config repo
someProperties = new OrderedProperties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithNullProp() {
when(configRepository.getConfig()).thenReturn(null);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(Collections.emptySet(), propertyNames);
}
@Test
public void testGetPropertyWithFunction() throws Exception {
String someKey = "someKey";
String someValue = "a,b,c";
String someNullKey = "someNullKey";
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(defaultConfig.getProperty(someKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList("a", "b", "c"));
assertEquals(defaultConfig.getProperty(someNullKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList());
}
@Test
public void testLoadFromRepositoryFailedAndThenRecovered() {
String someKey = "someKey";
String someValue = "someValue";
String someDefaultValue = "someDefaultValue";
ConfigSourceType someSourceType = ConfigSourceType.REMOTE;
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
verify(configRepository, times(1)).addChangeListener(defaultConfig);
assertEquals(ConfigSourceType.NONE, defaultConfig.getSourceType());
assertEquals(someDefaultValue, defaultConfig.getProperty(someKey, someDefaultValue));
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getSourceType()).thenReturn(someSourceType);
defaultConfig.onRepositoryChange(someNamespace, someProperties);
assertEquals(someSourceType, defaultConfig.getSourceType());
assertEquals(someValue, defaultConfig.getProperty(someKey, someDefaultValue));
}
private void checkDatePropertyWithFormat(Config config, Date expected, String propertyName, String format, Date
defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, format, defaultValue));
}
private void checkDatePropertyWithoutFormat(Config config, Date expected, String propertyName, Date defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, defaultValue));
}
private Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
private enum SomeEnum {
someValue, defaultValue
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 10;
}
@Override
public long getConfigCacheExpireTime() {
return 1;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MINUTES;
}
}
public static class MockConfigUtilWithSmallCache extends MockConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 1;
}
}
public static class MockConfigUtilWithShortExpireTime extends MockConfigUtil {
@Override
public long getConfigCacheExpireTime() {
return 50;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MILLISECONDS;
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/create-cluster-detail.png | PNG
IHDR C IDATxweŝ, $ / @x I3c4;nLBњVLwK-0-p#;Ὡw=yu}MUoRɈsI<='όK)[sw.RJٺӜM( /!!!!!!!0/",^҆@@@@@@ y"a9O8B B B B B B 2c B B B B B B`DX$'/C B B B B B ",3B B B B B B @<Kˌy"a9O8B B B B B B 2c B B B B B B`,2O"{W{Z,Мkwy<e̙eV++\dpy>C7(,LYGw}wYxk=W^y^_<7,-\hz> ^q
+0[>`y뭷ꫯ^m-b@@@@@ *,k\r%eƌe6+g饗~B` uQec%N?O ƌ?I'?IenmҗKSN9=˲.;?;n{ KYwu}or-^|+_)K-T^{ (뭷^V\r@@@@@ 7*, r饗馛@9CYd EYQ~
6ؠ^#vZ/qy}yy_}յK/te[>lyꩧIXs9m- G_ho] yú?AI/b-'@@@@@@#0g]l$~BtﾭN-$aFlVe]v).h=/ D4=c
eO yvm5p44X~֫OqN]u]unK{IT+&l.+w_;5p+[l1p,-?#kmtLx;;=8ʣ%Xց$y{}09!!!!!0t拰$;OV1CB+"f]wE,Q=X)7|><='PQX;NX]'nnKd
ҚjX(+U*{m&Q3VP><yM6٤|߬Py{nA TE5\Snƞeo\m^ۛozS_yUGO.)UW]U5\eUVB$xx.=
(D6[[oMėg Bv-lQӟT=~w1T/'1j/>K!.r>؉Z*!GD<Z;~>A<XcZ B^yM%b}_~?!!!!!!LJp$*}c;f/.묳θ^VѶ]afzo~:
Rz}N╴%GLp6<zx&_dJ̶zxTAA^7SnG }htLtEzĦ\ ki3X>j]&̟&0ҳy<1 vaOy
7PWb DZMW%\| m`M$,J^T=!Z =Wټ}ΛKX9gq wON;|#-:ݗ5VqMo݀ !>D 9D];&^`paA믿z-F$ Mկ~UtaU[ي#4-_|BS&, U7{g9gCL yUd ?[9= ?≠3}B S<,_^% ohwyg.ۄ%ygV*4QB~p̫;7B\-]\b;ny: _ m V)K| 6lSߡc,2m bճ_|NS", N;J@ y<>(rJHYu=K<^="q\} {QD+MfXH 5 ORonX2ÛO$*=q >uH eHS~n=zJ~nja V_MʲN! ~@@@@taS H=7y<a0C믿~}o$QwcOGJm}ml^Sl喫S]# 3jlĠg$M+L %<_I+j0!<(H?9B_bM G uT *kszT~> !!!!!!0 K!nxy ?*RnE!F=Cu&NJEʴXEwx D+blB( =bL-XM :ڪ27t*(ύSKm8ĥt!lrq f
zՈۊ҈۞mtNMD{ ջ?~@@@@@ /IVN!1{XUqC V'm iO?]EUM^!בfKl^r%>utSO=W|e2mE:^X'y#f_eʫ|!)sm!X&ܱҶr} ;ηZa4i#!0( AE<K693&dڹzg+ɇ$&k#,lބ)fBN$oj,:s=UحjuʩWV9{U !mjvkgwږ4+qNicZ WTejɳ
r.,$Є9#J+4P;$f"Ĉ_U4yrme8lKۜx="G|M$([N7 |6?{zʱRl %\/4˶
',ŵhĩ",lC B B B B &&S
gEXMf ~Xn y#m9:}[^MuO`ݼxA>ۚ9M= :){P~nq '>QY/m?=;6-OdW57Y-$껅B B B B B Bo²8[BB;T9Nl6ayO? o;u#Lu8[Z}s=1 I "Ly1)Aybז+^sҍk *ߪ[ouڍ3ݘ@ K<{ ggصnB@@@@@4 $&3i$=by,y
Mցxj8g7^ ;a'pP<^@ BvN18(YKmZkjy]屴ZuWuαY ڄD` &ܚ@y8u Bi%齏oʖΫ+J qUu
c=gI~dWt<f9^W^Vq|z_?0~@@@@pҴP6w]wۼnY]kV_}nOR}S@G 4&O&1צ 'Ջ+oXAXŏZ}5}u,Vz߶-ؑ O<Q V>!!!!!0滰E<{@!p&KgzKt)ë2nz'"s=W^Z'b7=+٭CT=#y)*,
)~Vr;N r!}^,ܣ ΄'._ {uu'?I}H]?kP= v1|<V Bfv&#kĔ/W]uUD韼qSn rՇ9=']wݲ[eZ<hh#[}O<xhTG[) ksϫIv%!,S-,ⶺք}eGB@@@@@wae&*/xϬJYt! kN + ocNlAO
ʳ(_=uiu f[H$r~ߘ-~dlZ !0= J kWlZ? s1 F[2'f.D%Hpn6uj-^-BH6z _B˶nʛnrPט:5xmB@@@@@waIP3O QwmՅw;= ǫ`"&
7ܰ<+;aI(O~'Z 1u衇ӳm=->jo~SFkhtLYĬi^r=ܳzr9LOz}-/wmi/>;c;z>I^^+ne'B B B B B`( 7a9!5ɓf
4<]D{0;⥻=أټx<C^}NU Km"fBym;ë<YgU.rWш )? Kbײ Bʟkuwc:M$0߄xxB!`%D\P x*- .Xc XYGPKD6kZik,YˣKoE$ = ,l[o]<_OѴp&>'|rwc PD'tRF{.'vi M wB@@@@@L)UM|L/R}$7(Xkyż.D: ? HGDXU SY/p(g F
Z2-UZ xVЖ8#2:RYO[&D{< m0+TKN|pM7-Kۭh孼{
~aS]zzbi!!!!!A`J%ւXsXwKĵEv:"B3Vo̥g!Ͷx7W\qEs){By r-BЇ!XA FP$8^E/뭷^=6'rv˶c=Vv1S}1S믿~6QN@@@@@TXFO}"%a3Z Lx㍫U4%3M' y7hY g:kxMEij,K\rLmSI[A[ʰD` P={w=YQт67/hqlVR:h-`~u]{S_q;Eտ y%@@@@@hf\_JNRqkD @HlwG M g
-/Xb#O4CW y" ߿7(nѧΣ=*_YqM1rxGǒG Wsz<(~@@@@@ -\X- 65 ˳9f ,|i[ڮ( 5B B B B B
S:vNDT SU!!!!! z\pژ@@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`,#ִ1B B B B B B` QyȌu 3FF"+,dr:<m &0cƌL$@@@@@@=sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX
N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@@eEvB B B B B B @PK @@@@@@
˹4!!!!!!== sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX
N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@"LK###'(sOy饗6lS6xiYT*B B B B B`8 DXN~1cFӟT~ߖwy<Ss$,{rg7|s[eE2dd@@@@J *a2;Ƚe&}̙G ~?tO?t9sˊ+Xx3[lfe嗯}W^ys}ݲꪫyg}v2V^yZ̯ꏡz-//؋J+w0;!!!!!%r2믕_z)<Vf࿕;rBlw_Ko IDAT25l۫,6aI ]tC.R^PP~VW|ﭷު,½vmUl;(<fgQۨ^gvm7n z N(믿>V[mUvuׁMou쮹暵ZkYƒ +-R:]vٲr>XӼ /Xce ?^Sme7[KQ^0ov*RLjvzF;,Q hG;&q + \rtZj6/!!!!0 DXN' /ɧKYaRBn)QF3ˌ6+elE71x$2k"M~xˣ gw-( w\5Z[s9 Gʗ
+?v?om[= ] "__{Fޟ wU0%.vZ;{.W^ye9裫0k9B?i}Vwil qW7H.iwફ* ~xq gGO~Rnzk!z/V{ :ߵ:4n(;s?]\Kݪ<35]$ίYnzK:딏~Uwy5.?.+ vXr-Ye?B B B >Pu9Rvج?Ws +#OU) _RV[mܒ kƮgkbːFaF1X jply xs ~umSMq Spl-4WJ ^㬾UIO/t5.?lPob<s5<Ģq {X02|:~_2,fZ-CXwug߉Z.rGV;kS>e&Nоw}kA[yuQ$ y6MY \#QkW#ObULyA; }/.n-rα",'RK֊ts{R]V-#[nqojn]1Aaz~F{3JSn`e2f-҄&V|x!ܦ̶ҿՠ_mf)[<^1B9?0f0Q;9
cڢ@ vc5}_rj1Z:u]Wyc}衇M7ݴF馛
o~sC^ƝLc=ꨣ*W_}}ULzzU$ a>W׃2Nb@AU#}3oʮvr/ax w r!c*0!LڦNqƬ22uk7_p<mQ]=y ]v٥+m[\Zi5#,Pk }e_/3:,fKY賟-e
\67. kzB4c |a$|< ],B|xo>G z^ξq@(i-8O0מ-cDZnaw}{#0HS]//08Yleo,!!ouh?݂] Yxm|JL~*xO}%82F:^诽>s%B ބO~=Q .ui+ݜqDqNZlM
z{CUiƤ`ߘ&<]D2G>ƛ떸51.=oD]̄N",'7,s;bߖr f(2VM`hz,Q{ K^67+0V nPs|<Բ[-$5/$Cق+-Kĩ8</D<Z sLm?]\^Kv\ bA>mu"u0a}<>_m/榲
X&k\OK_cGC+7D(@0NA@o'GwC }E 0 ty A ܨW&ouцrK<:G V1,Ѯ6~ZډlqLUbY0nyիM#oZ}Z !!! Mf-}ˌÏ,#'e)PFXu)b FF,4%ã&8s " Qİf8
,p2y`e&0Z9<.3b4Gu5UR ,
&Z ?whb#|n_:SygJDnr;Zz&cc8S( (禃m7Kׄ(/5 ;b̹-
|oSTo1ۇXuuu!ȟnӴ]:®"T9ztI:~I7qLmm.",''Z,_',կVf>dewf3 b!6 W9C&"8 YV5b7Wh`8^C()d~1☠mpP^L<i<Mhv)<Z
y^
6ub(@\~u5VΠ 걱D c . } +AleKcߘʐke2w8+~ʕ_E[Sw=9z +J
c \\kPB@@@LK>Xeu <2c&<
(X D/D (L }` 4C !|oږ!;Z0c CWki\^e [!Ny䫍<S[TA&qy\Hh[F'yJJkqa%tnq'ꎡ-kL6S8zsM GwNƴ1.>&B B B B`rcׇKX1ly,dBTy)<v)K ' i9ȫ5MhN3֥c4!PyƯxA S+QiaqbP|Z FT]þtDe<Dl+gVބ0Oe OX0 s? _A -ܔ1Xtcx Ќtndy yٱŋɍ װ* Xy\@@@8e0 F`[#.1d*/xm`fD@{D7eon/_-Q*Hjà-k!M8Eɻ+* W"U\vhK-
&m5
uG'Mc?8./VAӝ-B9Gp"V|-uqxJT*,ě۠7v kЭ,VmoZnzMن@@@$a9?iRchmBƴP+[M .s!>eK-Fތi*7Cv}syttF.>zy뮳dk'۳MӦ+cڊԙK4!)dP[yø
7\ڴƃӧtї僵isƍœP e42P7ױgs̞a$nu,m\+Ss-y'Z0xބ",A/0M5fQBϸ |Cqx Deqߚe,Pf[`z c4?[PiA˃cg"!ӄ/,Qڪ D6q xyoWGkSwĪ-#o}M74ei|Rq1ژ#c}ƢL^]4G|771`{=c}q >>sA 8s rx\1hwo*$HkT3 O@]/d7kA=ǫYSs͵70jSMxɼ&2 ]%qSaInɔ4J" Cy3yjG\A+/ixM__{P'-#TB%y|B<߯ăgшKe{*;SzuHkt .M2ۖqĆt^堮DE]Tֿm#Xy-qe2DrL<7@.CҦnKPoP%>OXׁ^#_"|9ӱ}vq:Fy0ozƸi ۺdݸqx!ޤiyɵC^I{l۳n(+!B B B
CBMq#,oUAC1N0B4& n+ɿ</ #\ބ gLJKDb><5&
!oAՅ̧B}_P#uj( ~m|1?LanM=e]jgyf}ݫC;&Nµ^[n20ABl*9H\1264=k˕W^Yһ6]+Ę2x훨#<s]qU`L='fye56/A kAFW&v&^I!!!E rHe>*'W"1gdZTx,< #Akqx h_]%(1~}F3p2bRzi3֛XSq^xjMť?HGx.Qr衇DI /$^QB'4yaد?&fiɸtmz~V 8&%;_)8cS {D"MTn ֵ2P1u^V #8viuL|wYW?+z)_xᅵ u2=<v1:iHU%,15=((bG~r]!!!Ӆ`fnAΨxKx=h10}MXBt1ԃ<ZYDisNO1K2yzIVϴ7aў5 寮S.o)cxmuzf&_yuhr:/N:
sym %̫תgo ?+X&?W~#|ן@t/7]cl Gu{Fcӿn(7Za '+ TwyPʬJ#ڭ[w裏7 Fc%.. sLkm`Lj6fhF+C B B B`~_(`(2 H/#h ,6 @bT
<C l }bW 6ؾ Dhf-ChS[8'.
7oEQbx<lbMlS3GK 鶗$
l+B`z&'y&R>Į2y)[=[BUlAm pnƋ;oLk ",?^!L߳POLmD!֕1yyH SMM9d2 O<Din4a8Zum,q2Zcg A5q8ѱcyv
L4_i2ѴSoN0H!!!!0 ͇%"ݓ!T!n<H=tLuhuNilJ DX~}Pk<]Dd5BycxK'U5qv"$N@@@@122r})e6,1ͶX)BjVў +}΅@@@@@L:",'i2 "pÿ-9TmNcC B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@Xdۜ&@ [o_~7(3g +B B B B K,QYf36?r !022R^|c{, /<<yϗ{eV+,2r0B`A%+ z
UVY,b2S~A+B B B &Jw-fqD<.뮻n#,'J4B`$'^JwLsF "HB B B B bU[єgy e饗n.0gS:Si+Q>C#M
@FvkQ 2-vW%l$
!#`}r\yS|",l0!!!!0
&,">4= -DX6نp鯋/x 2,in@@@@@YJK.Y<w
]!#k;<C47B B B B`؋mJO7d.!4;B B B &HًB *9CF` !Ð@@@@A`,1r p9!!!!!!0>%F@@@@@",ǀS!!!!!! Qb@@@@@@A r 89!!!!!!0>r|F >hyʊ+X?/le=Se饗.-\ Tg/kFrՉW_}<e%(,LYy{'v8ovyJ+TgwV2F+;C B B B B`A$01~AlަG yzꩅ0vmq W]wU97ʆn8!W\QxQE?*֮Z/K-T!4
;cLmjc=*c%_|+{_|KU\+_}gO~o*߄,K@@@@ )oYFx*3XQ^D:Zo*k >袋VtWo̙3gF< wܱw_/7xcg⌌ Ս6ڨjx{4=X%tӄ4c .u_l
_ye vWϯ%RqqCw}T_vfӴ-۪ IDATGIlYYWfkO?5>ET *#⬾%\Na%TZS%֚ؔ7)Ѧ+U*\oFz !xg;c|婼8%XMy{x6U' W[q_~*&_yGxz{+GȦ&@@@@@J rV .3Zw-?Vy2cKYr1hUW]Up<tUO |>*"O9O߾lϮHyIX7tS*_Pބ\<?p9s(T/qCm[R^TXM>w)Os=+bѴX]SxիīN<"τ#z:.7礪x AAq7c?*SܱO۾|ocnSmJ'!!!!0] DXNy2УJyRZjeGe@5
5quuוn lYygA O<aA8\ zbO ^Zdʭ@xwW^ /(*Ok,/>*h[}ԗ
^ߵ_~S*> {y<ׂOiWN-]sFX1<놃k|3&/r7x& //}ceY]wݵg7N7]?i #h'5]36X 7W<|Wױ- Qqyv7@@@t$a9zeKY~Ry'_^)?SKb*/ˀе^[;＞"F-cb? Cx6K K/z-=1UO #(Gh/D_l:een'!+_b䠃EXj!.ڦV6#< b> MϜKQ`0va+_G>^!w]MsGq5l\{5Ծ7V
{+?Ɔ
oxWX7MXT&Px76 nחE,vqO9C B B > ",Q/j˲2 +-Re:dlM0͎`g23 .\$oޒx)J$xe－$n ~4J)+PƷ/{i6lS>OZu<%>Zv!ҟqUd?!ө|bBݕ[T(!@vY|_ sF͋O>zy6dvX{ʏ~WW_|
J7XQ #_;,[8c='mK.R9+7Jj̱xnr<Co:)இN8!c 2!!!
ө,,\̑RVYUW=ƫtw<0liBStq n Fn
߿TgM[yxrL P V뮻n5y
S> JDQG Uum-tEx>acDHO?zrMVB3G#<qx$o}[&C7Uþ0UZVD&qf>rMG
ד1~!ԛ#Z76._ƽ袋M~hiO rus+JYx2?u7re̳JcR:WA+P<"]-Qnqy)o3b0$$/"1#^dhð7
չ3ve<'IH KTMldBhA $6 F\oM%pMTτ9#`Cigͅڳn;Y[N7V5<}Ճ?
ƺ%nF xcV[t%C=t n@@@t"a9zjTԓe~[Ys2+e'T[qC 2 # xEKL<S@m}9SB 4 CBQqLƴ:s1Mt̳I5aQ]c^~'Fzꩺ/2 V~0'NA\⁐e]9hnB<O)MY X$G0-fOwW- R7[<E'<ʫj|zNn-ɠ|MϏZȸwsf==B B B B`Znݲe!"TX6ڲ
մBb &Kx-3';s<y<<My&}7r/Sdǔ|74AxZmT|λx-(C}
1%XP r)a{z뭫U?u Ѽw iMn)m8f<
ֹη4uč }k%j:71xKUXyA 1 xvC(qa9 N",So٦wΡd0lD o bp0o$&-yW3=/} h !,-ðƳ<U j"mW/qZy4
q,5T AEPKÃ{E4踶Uz% aη ϴnb_ۖvکi
M4 -qe:4~n귛
6
Vަ[ huo;J R=я~WB@@@| >L-H]{D#3U@+ `ϱ
4ýg* t Pyc&AƵlnƴD0s+ Ӟт"/h
Db%|yZ^!<+h
mg&kG$kRxwMus n(т8n J/UXYyRj,x~ִj>W3nݱ<^:i㫛xr>B B B T:
3"8%L!mynߊ^%<ք H'xм'5%оU2q
j! 7 #=BZyj _
ve< 14HG͛)gx K8csM2Usg+eܴ 79
ٖ[n9; ?y{`1`<[uXwa~ӟ -9:cmڸ8M`?B B B B`:N1u1ի9 ^he^ |yZ 8yr˶yZD eU5y<B3y h&ˇ)^CbbKJ8Z m{WyO_ORzNw'²b?>mb7x5Q&em?; ۹nF}ݶm}&WK/
cVY1ś+m͏6m'.qB B B B`:0Iu xe2Ʈ7&Cj+]{6< B]/Zq' < /MGtǔ~6K *]W-Sאop0skkPWL>5 H -6!V>;&1>m<zjTq13Z cƃ^WfGۖ1*{I ɳ,i嚎D*8ѠƙkĸKSoSW;cسH
ØMĝ~v2yyMxJb</'}aP7ڻ
DZ $N8븼 PK7$@9ABXuI"xN /w:ڴ/| %"|kmS&,[́vm71Kg,4&so'ai^n__1՟wcF955<'OZїM 7C B B B`:ν3u#LdGqg 8*"I-&> vءzxx.w}i"R姜3<kh@͠eODLK|B'k4!i%{zjyqZ{d0q<n n^?=7E<q3[}OpO {^ ۮvSC >cd 6'{֘T_+vk
v1~לEB B B BD [3f@eC9@l[ DxQSG7uִO_z5t"B
͋Gh~8`O?QyVl9餓곜#<V}B;/MM866<{k$,cܸqGGNa'5Ɖw j²{E:M76ac= lu8'|rbxҙ-nǵt~L r: Z xCT XI<C6<521Ga
mMl""p}|H Zg\{O^*/ݠܖg=ZYV.C'9^]v٥SNc\
Vj5)̦NF0n*_y*qƓ(|7Uؼ袋d[dJ:k:8(AkLP IӃӟ<ƩA_|L r: ֍0t] 靦{ER <ưwFnZ~yL H@/?7PO< zsΩ۶J˧mk
$?
<iMZ5 Jw |}Ջ{07Җ}Z?WP<SN6q3V d杷qfk
ge㮰t_el.*FyLS4};FКz!!! & ޚ@]'^i hS A"Q<* {l5W9 a-.g1 BS"}Hw} {QkBp'(i/>Ck=A" $zF+?| 'xb\Zqմƺ@vS@M9֧-8om[v+~ksMnغ;?V03
U])dό:r_kεF\lijGpMn<DG =VUs.B B B ###חRvVJeB /mWLvġe =?ל#009ׄzSjhEWxP. n2XG> /&So 7hƺ><Ǝh72<ޭole?B B B >pl3D K G
x!²®y~ԽAM%HF`,aӭRX T &KK˃!!! 6{֪7B B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSPL?,H\j!!!!0̜9̘1~~ ?K,Dyw{7ۏHSC B B B &@37,.htDXvid? /\[n[o^{mZ@@@@
~en ]!"cjZ<套^֧!!!!sB|l76$e7DXvid?b-V^{: 72
in@@@hysϕ |eV*+lg\_Ji39!0̕˓O>YŚ"B4F@@@8؊Xcꪫb_ߖ;!CVX,u:+Rf ii@@@@ ;,LY~嫽=ݏ~ 1݁I9!nsB+qC B B B B B f#a9 sB+qC B B B B B f#a9 sB+qC`H Xf;wzzzw몶<[|/yuIcu^ƫU>Ljx7562/{\Z Shgm/n~~_4 !0]dUGLc:
/}KԔK/QwCle--Xe2>"+E_wߕ;Ｓ eW %? 6X{o]p} p@=M(k%(G q WC` w^O ~x} z땥ZjBu]}9CG? -ӟw~\rѢy\>_}xˆn8uQ^r%UHG -Z>Oڪ?lz2<,r婧*7tSe]zr_uUA Tf#<2 ~J`vKN
k[moxB8
<Hs3O?oq< 'F[o]Ӌg{v4+O kQN8Z^
}c{<C[n)u
:ub(3 WoWǕ.n6W\QB_,m{9|gʃ>8(n4L6@ GcNĮ*U>r :f(K>ʚh`X,6C!yy 0~qebݠ>Σ7mVg Twmk -n{z u{vM@1Zh}kGqmsh?s-_;0Vz5:z0{k^Rmgci:nfc1O<Qûﾻ wqe5%V]'z'7pCvmWó>[W_]_ױ nJviu5G }t>W}۶뮻&,}QVU3,A7ʔ9Z j HE{c_gǍ!ɚA <Pvcލ}Qkdn_NO>Ye} 6ƵqAqӴﯿWuoJ+4ۘmMcTiA{ j+Ӯq
o~O?.(]u6ڨDq q O r-`1$ $# ftl3Fz~j wMH`
ʧ?j`8-آn& F mP7O?]x1DYnlDՉ)f`j>˨k?\`gc<+~6)`$co0`bL Ӹ7.mnek2ˀZwuk}2q; blͪǪDk]Վw_^
k6Ѧ.
cu1 IDAT NjΫGx
oyn( wq8RWߍ }ZMOhcqҦ{B 3a>2ҵ)q溑76
/Ck͡6V eK71hq|vy| [K{k ^zi9czhl3kBiAG擭zi~>K{l&m٦Q\0``z=@їnuDnƇ>p~oWP_\Inz6}_;}q}< {Z!y}^ߗAcL{_ /hf0ov_\s~+'2^=&!}g<m,s ]tQ nm믇T|)ݜu'e؉o=%In<3o1th~Wf[#a9uls|*/pjQ1V RҦ˿KҝV tW]4`|wWÁA `Tf D1Z>sNMcA"/ ?3gحJ<A{ce2cKƾ5u`dcϜ7Ny2/-ďzc9/s 0ʘH2xzd`/dhJ-`b@}<,~SLAc{PR:tvcr a"?SD cI
ZDzptLoԱ /ѮAP5^ us-rJ'.4ϽMi6z)&@s |, {パ~ Z:cƏ0hA=1۠^]a醍>;tR}ݷCz1`3[ojsMnZI&2lck8Ėx82UWnH#uo֮S]^.ظ«~}P(IZwЍA\u~_'39oD뮻y}/, hkV7^D
om^b~_m/nWd?M}Z2OכH}[7/u륿@_X9nm_m]aigi 7pck7k_ ׄ!a95\k|;.)ŝ_a(3}qDdj?jv'/F ~Q<=G#Ç" 1u?LqeD #8oD 1^?wbܨcD c |-7*ĉNƙx&C0&By1S // OEeQ v(϶/y uQ#8;[6ASsŇ md0ğ<LvƬ;8e&y`,xg0>7V Km#(T=ҩ;M 7pԑW1 o: "Iq;:"k(O߸9䘴>8UwVvél?5Ս=h
1#5c|]<nC ?"_ 2%~_{fk Ђ,פ {e9O8k s1}.:î~5/ DQfmuK ~KSW7 ^ơ:c,+pA}L}!D!-N
^mocA7v-gng,٠*v=~ (ß^uƠlpo|9[⹙oxA gx~ߍƎ!ƙ1#h߶Fa+cvh!0O]<? r.cI\To?G?tNn3 QAp?Js7E?%y1ΔM! c
Z-H/-4{E1f0!]Q A`zι/ (4N6CXˇ Xj}%-!ͩZvcܟ~wǼ <u>8y
0vƫscո"xy#Z%ȍ1~px l= o@=Z`3b[~v* YFe`c,)ϼ1'+Ƙ1[0qQ y6 a,bz }Wg:cH11 }@p+H
zsc&`)ˍ)J?5 1e\qڍ+7?\0pom%l 6ۊwkG Oګګ}ݺt_W-Qz |AKM}OeG۵Q'/ҽ( &65lfuoBKow] e \G_z67TeNVxt}~p"²I0~+_]b8 qwvujl]ƫX.c1m3~V(]vrDXN Z~& P<
cgٵ;^?M=j\yMO`ZO?,\bD2[>#y3wWdc]coя~T~[ߪm<˱ [nel_aLB#@iߎ1DS=C ZݤOaX?b@BA93 =!57qF7o3Lbh1(1~OWX: hX}q6 R3D@w쵼8ĉU[U`ey1VF^b Y|g
L7~V\60ʛ Gr߅ :|ꨜB9 ƀ=ؾ 033ޝwޙsg=w;Ύ2N`1
2`""P}Tj.ԭ (UW'Nz+GXH u1I8'} pƽ' Ga̋ヵuB +(펴/"lgבq |߲@}p <p8菊~8BW\q
& y);5 bvUFA$"0:E 9v_S;vg8~)Njxw1^~Oۭ7!2r|F*߸Wzm2&^yE jX
h.E ~ͼYLㅐ> Ѯ+ s\~ĴB`1vrRkܮ]{v" mq^x1 " #6빫 G>UYoFy|90Ҟynzga1Z}ˋFO1&8VB;Lid12(3)22YgD(
4?d0hq@daYD I
{H¤CP~-D%GXƘ ~ y'n& ;F?p0b$E11vU] 1O!-'QQZNXѺLBM#?7=^_ 䅧_˲7L1rk ]=KQ+,0vb#,0`K]s@|R䝲M 0D1Dic MZG\hң묳* Ge|O=6 D OS#As<RA.+C^0 Gҡy-uئ] !<m, zQf^<y$?oyC:b|E="Bzee^ Ãe@GŔr9L9 PN 2evA>?EZ^&$M0@Xw|eO}Ý[ 0_O_b tF uY M[8Kd`<#h
8.l|?2Ɛ:*@1q63/ҖY\ LhsS;A|R~<m:1NZ^`G\ c-K2f2 P 3 s8'qG m _^\LgΧF/ 8xf9aXb7 I}b ei4ʃw譜 DFF.;1~8ȠdǐIÌ 8p 1 gbh0h18,qb,2ar?'~pCF*q ;d4vp'\C1a^uI LM&0 ;i&k l= /?1\Gj \^ P c f+&43FHԈc@~#}!FH2sy%tmK_RݸaZG(;d=ab #b NۦGrb_?FGxq#66ZGd .v i// G7"]=y`W# #aKSUve1`16~10wﰡ}+F:,~f\
X=
gq (8'~`Î)W _h(c2",9qa|SV0ռ( m3K'I> V[wKc7G9j q4wvo98xJJD#|PΧo"}# @?ퟶD1﹐K< j ÂWF̕M8#]4$
90 9u6SXҧ(7}=)N;1Ў@Ѷ e9k5$0A B ڹd`T.
D1R'>"<2~&AȤdBL /$}D
o:#}³Jt\uL6<
0:yω\p3!0yMĄx0ZXQE yHiT2{V1Hp+~ !w]v(Hو A7ZGZ8)QXQύ a2ca/@ c.3IAW)7\j R?3"O\O ae/ R&ҥ/a(3ZGeYGN{+0J ~XTJc/ꐾ6<87. ?<ȅ0i9Ч9 868@yh p̶w]` 1u&}8kcaBhe s# )aEqʎ8^K/mrvqϴ2 )9"@Xb|ѧ(s WFm eu G,GBDsr"raxXo*qn4n,퇲u˸Qܜ 2sz)l=^v'~f&=cQ~{z?m<P^W3ewSv#G8H 8wi3䕾 0S:Z.e#9n C ' x)12:&` b&%"+j 0I1619A; \#]_0C^P4E3`1bֺ\'^&/u& ̈́GcTp_ #91HĆaq֮k c0`цn <*e# 娝a7w0 %4W_ |Fh y$ǤOa^ҧac66G3z#8 >9R0 Y );'aEXE i䥼;A|_nxAG=atyRr v9ZG aΪ>#Q3 !,VP78iOkm~A f~x賵&|ߝH5XD|:7he7d$GFzǑ.>Mq++̨k B7c_ ?ʖF7q2+/!x 0K:a<h/=NC-;BXxÜ1rwSؕ6/zaC惲V 4bL /C!hGgahr\ċ#8Ӷ@!/xqPH9im 8F73O!h܋1a\;Zm OH6 s4m JF
N`=@oKh/pGn CߪWucO@a9LQ@ɀ bH_&=
&&Rv YdgbA 9`\3XILL |' degR-3)ce",M ;X"_g~ !$ϊ/`YF슣Gv0vx1abŖ!1k¤ puYuXXa`2(' ++,6${a@`1@)/&Ҩc\6 4<:xoʎQ+3Ax҆1D1pp\I\/ 1yR o K :IgMH i9,_7q !a 1ZA'HN S'm5ix0.Kf?.6 6>\ÀGGGv[CE8&Ä!B B8De."e>vtX,b\g,alU _xJ7cCy|څFQo|?2rg_?eE ʎ "Z|Oџ uqD=);G W>}Kx ώ1 Ip, B
G L\/>.;2 e./,,1CHc1']ƛa/uI` 6 R!=EC$hd˶8]"|2W2[Q%ɋn l]}( L 9^rN|; #3'# FC&vpLW&AD
99@0&b9\sMa$7Fy,)/t0ĉ+)ϔ/x0R?3 '"$ aW<g `=E
Y'Ne1yb`2beYg]|/%_ Ypn9'0DX!Ή^H|ca|`N~ӱB FQW/vX !$ˎ87 P\2\'mر1.rѦ1:(\k$,i'-aH¸e^y/_ 2FFs qw0Y?#n .;PA:eG\wϔN/m2Hy& ㆡO~h1,#y/Bz}Fg fɕ epQ09M~ag|a<d=Kg|!˲1ҩFK Ʌ9er䟺'< hs<
npFx`~ȶIX#^xgq' )GXFY˾HfLq,<`~oF' N Rz2 KHN f zHe\ 0f Ye"6b(/~8A]eaɘVvp%q Y^* #;|Ǹn E,q/pcQ2;v/Ljo2.#4 LlL 윤)0 Z(N#\g7рLC$ns~W? qSE 䙉?LfL|&ċB~!1Il1"D& %EoA8&(7Cid00Ԉ q;`PˁɞUZB?!2[# '|X쌣<\rb`3D R~b7& IDAT=!%ċccr饗abp# ;4O"o l l Iz<;N{fxY-;lꍝ-F)<18%<u
7bX;0y-!fvB|zX.`
9aoE(N=Ga"iH? ^0YI4)A.iGM\/䇺]!wF=@8D_D{X48Y&i=O7_a+3&?){/āw>_^e5e`\A/Q^XgÑqėB/佶oRf> i uq90=5X\n߅-01j5d!M 퍾OO|,Rwu2. /xr ,""5peU>{XF?gg8s&M[N))NN>- ʆЦ~}8){Dyi,8_RwRꝟf"0o } #Y 'sǎc H```de`"(;&iy1/':^7I:C0qwّy! > r\( ;~5 0&" ]ّbq+|18 /~|VeaŖy(C"Ǒ{^v|\1( G^1hR}D'6 >Sv𨝘 Oa 1@ͮMDa#{Ðf$Ea v<p3'F'|802N4 $;겾G{) y:B4hg?6io) /j~=ޙμ.mF:I11h7 / ceL,z?9 }9nmvA{ 3m.=e@pE;ݑ0E:X5/ uSq.?p:m>wEr2N_BHUx~1N]QʒK͌}A҇+O Ja|aBqN댥;Z7NFB}~HK=0Ý15>3.&"5A _WL-uF QqKE,\[I?# !*q9B=65K mq)1Kp.F ]_2oԊJ: fNX$!-Y ӎogX!A @I8Z/ưđ&m!@Ss yjmZs^ w.$ NI Ä;qI %WꙘYd{ XLĉ0i0 Fil_b]vEXaa23ELL,L }{ # ?'I VJ141 2bt33""0\2gz0<7 L|[6ڒu+va01& K?C`dy40䍺,7&pbSp`?/ p}?{q7.a1pT82ꏧb˂xࡼI\C(L:K9Í#8 TJ11l('m1A(3mqAQ q pK2D ÞC}#1i?-H_LF P7\'o e/_ M\'
v8Q8w?: ꒺z!5qK=QVD q`K//Ӷ;`.&ui,NQn&y~9/hgG!I
"cB8h˴tG%zL)3b#L(c 40AxSWGG}_/ie _>]Frї@ "nD>YL`1N/~N6%fx""qq 2 Q%m|@A8NO/{W)'m OrBі:}ee??Cø?y7w-iܧL= .oxv:uXIySxV5c"
f#9|Ciz䓹{}>ͼB,:e~5
]gh LxL$Lxc[!&t 䬸'AJǀWA?dDŽ]W;ch 3aNJ 1h+"%vISTO 1v(>#7yg 2BLIZ)`y' &`)*G#B0NS0bHc`c?]Lzǰ& H\#A$q>$<;qĉwL/꒶H\
s80 Wk1"<a :Hvu
1G~9Ң`arߍ9 [ R/i/àFb5O~ER<w#S NjRŋٍ/QgG0@1", iѾbT# Y Y o)x1SP T.ܳ=fxW?36 >(+^ig\@/)-AN$ `,Fapϋh{bJڴtK(g`^Wّ _O{$@ G
,{/Q<@]h _e# mBbSǔ G=4b kPmtk1VҎ)cE9"7}䏼 Sh{0&n u!>33}2BN_i,nP\'K
\p0at !̵p"%9b iˈc(
Jm ,J2uk,Pr(#uM ?=E? tNn l=}( L`"0$pec"c# M113hj'b?Lt L5l0X[LneaXBHrS?M8b+OXLVa䓎4(+4~0XM%#__' ¯sùBA_&4aKy&|w=@ٳL\ _^#9u?D y Qq(// qR4 u\9N/J~V6k9 PG}8 mgG \}A71E",TY?z1B?F$m5 eȦ6ak[5" ;e~a AIߠ=7uD!' `de&.ܼ}()(- A_e1ws_/_;P
6 ,B 29P#? mazWƗ웙V{m("*lo|`K<Q_/!c ReG}_sZ 6l'#c啎YȤ-1Ǯrvc]JW幻6`3N,BDy'5 )y]sT 3J@ F͎:+ {LL>q7H[ob .'r ga)+\!}&Q ayULaԍ-]$v4c.},(-+ezm{: Pz}8}$
NT0߸|'):ٍM2-⦯Wpd9_);c ?'oYKɤˮuE Wa3~Ǘ$1qi=a▨y9 pTE&a_C=B
;gZؖ q},Np]~]S,RX6J`^&mok Ot㬀
^./ YkYx]|h
/%b{9" G9S"ςⓅîWZ,H8~K } v"[ H@D8O8<G9MUO[ǎ>sr|EV²x\$ H@O`/V$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@hZN H`[^)Jmm1[$- ,~@T.YDCu*`L<9,X0mf% H@B@a*5m9%PCݟiӦ: wj5{6͟$ He (,[-xH,$ H@f1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@ cQ3V)SɓիRٳc`` n g}6k/wqGľ[e\vڸ뮻2#<rUx'8by$ H@$P²> { k68cڴieY~}x㍱t8s-DSO='tҨ[āpX As . ,X=k֬)o___Nܵ_n)im%,|/Y{+,GU;z$ H@xm 6D#f̈!Do77n믿>}XbElذ!wӋ\cӦMloob8vd" y`7q=Üs9~ x~ [7EN:5ϟ sOQ;C wq[ dzCIJe
J`.,ob2{!ą^Xw8. H@$ V%5ߪa<o{oGD7 Kvwbw݅hzbͅ8O<!* }PG?m/S/R!s3g,E=8;Bg)eƍ?0cƌ# {;|p0"-d8qą~燽][(qt
$ H@$0L@a9b||wIElX.bٲ.}6* 1kVÌ".\Xo|1҇ z(8co/M^)± !C^({4v=\qdt֬Y}Yd':xk_[JDUW]UAr4 BDn
_ҟ4iRq %\RH>_zWEZ) Sv)F|'hѢXn]!O=bQ#KJk.g H@$ 28KcX!b"ohǶ{,7)~ ;'pBq"@"wn" 96p}٧K?5\S<q@C<rd?y-o ɧ~ήܹsI;c~__yWR 8R d uQ^{m?8ڊFR 'B1L>_!9jK="o G) _ܣNh o!/H@$ H`& OjuQFxGC9(De̛10]aIC% b 1CkW^ye!<>Pb×w+"Fy`W_]ۿ[!(O\3<3ou2n/yMa[8
.~@"Ge`]YdP""̑WHn/)NI'
M3iZj mb7ͧ?EeWdi Ph ['|y7% H@PX & w\bʿ_5$"I뀽k_ʉ'Gtu:SN9hVr ED.
\ Ov-dW w`gqF TX)ęFk C Mܙ >K!C R"eG^^~({= C;uđksReXl5 _]
}ۧ䎈gV}+qJtLG}p/3;|ehc,оXyX<9]uA}e??avܹ79e+Hoۼs {^_rO^$ H@@@a <( E7wE Xj]Tz&*g;<a5w Hz{< 0H(j:g.+Ip 2-; <i?q!o`PgQ5,B'r7MG^,Y7pC"cW]uUa A o~ ?&kmvvAɐ;vbaXEG|lChtuRG5jJ㸶;eƫl3gNўio .?,q?oSB)zEX?* qgQ7Xw 0uOf^Z^$ H@;B@a#^,#vE[of/~Ƌ"fl v8 WqCa"xa.EF)B
!.wUCX t.>Xx%~sD߯~°&
v09ya'Qb: 3.dC p9w@09Ky",yc̿K>~j|jbqJW[}ꥈoSJ GOo i#7
E;+6 >$횣eG;f1ȑ \Wbq vEgsݓ\ƿ% H@PX(&oΝ[<-oD,\/>cY ;>P^*v`Q 1idA8wGyNv1o{XƘE3˫^#øFH,!ʎ(:y% kCbا// 9q#1I ?eG~a"rcw =CZ;
uoDW"*?GWêqМ ,1P$ ]{őq:-?v>?le? ?rVX'ʟAQzY$ Nakb ~ R'F*
O. k0 IDAT%[{LX( w8,' !(M5TXv$s+K.-KSai<D?-r .(Ǯ7\" 캲QYD'B>8wv~x Of ( /~Q0Woeї~`m1ϨƦu[mĪϬ8h>@h
}ߑ袋9 - qxEc~N|Gȸ|$ H@#PXDgk0>فCadk;aqd|/##Rb"X1`{&qOJOLD#y 3
B` Br_(c u]G+CY~P]VCzƬ)[j?G=xx`ݭ@{s7bM{Q:: *x21;Ew삲ý tt jꀾB?I@$ fPX68"Ҹ? 1Ʊ9bEL}g}vB Ʋ 41/;5~4_u8jcwK/t |%fL<o/ }0Ph}{@|8tnG,"PluP
K ϐ: #l]ӆy ;qgaNa { q q[ $ H@
˱8A`= Z1 Uι"u!x*,Oa#ӈX*q<('3c$Gaya0sgC,"+8㵯}mi /08{i
{aG[VadㇼGuI< 1| WG?.9U+/n &.= 2;оʎM#QmSM9/qXs_3|$ H@@(,Ev ŋ!.$G>9 =餓%(/brLKv8_!6eMG Ԥ<` "o m]k^S[?Zx·.a]Mْ ;GN\^+"F qr``0; :}JQ_ڸk`L61; }vő;s\6;eQU2 s%GcpN$ 4²Ydwc>v
1^j _ h_~A %kb"nFo:" 8t>rcMa."I/O> trWO<u4!1bx#8)?~)3;BZ6 aR.c̴E۩nEφp} Θ]iٚCh\/%,heGgᅾĩS~EZ,"R % H@B +D8RHpet iN<VHM .JP,% b0F>9& (f<;1]GX6Dv^;< wb'${B{-lU Ϟꗶ=) ?0ԆmGUbjX;)Nܒ"{{KXpWb O&nNp % I8& H@v@kn
q aOn#!ص@Dq$1ϑu]Ch *;+ܷE cu '>'d'QS B8v# $?\q=82Oܼɮc E1`>4K v Qv8ˎq^&@9xq=qc}o[ 1?>tƔ9=?!~p9kN츽 Ӟ~OOiv Bm{ӛ R;N$ 4"lDf^@8=<Ao!Q 葎k9{DTÇW?*JXy$b"btH;rr<aF>8W!"w;c([pc7~JvHy,(W2Nc`:y xX3tGwųkz[wo1)LiVm/߲!ںDwWXOk=G *SO=.]Ps1Qo?'xb,yM$ )ܽ!0&H dx= 9HeG0||Ǯc# ccv93 )KNSQ/?ˀ iS
JvKqPvz٩E !vV)3;]@'VbCtUm'̈?<;Nٿg ׯ'_쌽fcxPntM{K _(,m/.efaivi[N Rva+KK8ZhQ $ H`W (,w8
|w#1V/N N^> `^-CrX
K~#((*i8ZOg::! Z^;r, GR. s`"FW\<H!0)3Gu{@%*{:n\ǙL -kz1n^23g̈-?r=턇<qFhIю;]:/K>_}ѵ#fpwN$ 4²ل_1LyH;kGGBk]%Nq}{*o A-w3rĕF>o/ ipc Y._ !8\v4r|{gL<9_ ^ֶ8f܋}n DWWgC}#tY& ,qʎ
"d$߳ÑX <Q9. H@v@ZJ$Z=/TC Nʍaŵsfķ;_茩ӦGGн(m \Tem9DhH|E\8}$ H@u,z鼎/I@( pvs#K ;o3O7Ƈ:L3fLQTFLgGCiM#Wצ%$ &+A4$ ZD@`II1c1cZ!638pu!yQ$ w,[-vԮ+Nk#"Mԡo'qawW` u<WopHTO'Ooo H@$ D@a9j˼J`F%jT5Wё-JwG%q Gͫ>I9͆$ H@qҗ$P@Oވj l#너=rzWĔ^( H@$0U_V^uϼ H@$ &=Mk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V
,]!n}X s/K`!PFtu!fi9v8xQf
)$ H`O"PVwD{R,$0zոg~tW<bcEuـ :R~{MO^rb1۵, H@&Ha9+K`vg3_U
Fפ vd.ځQ }):۪ O\r|uMK@LrϬXK%Qxv~rO7ӦG[D%ٷs "*mm>iJtM XQՋ$ H@D#h5f~%0F6շ<w><&O mlaƎ@m1iڌxvmƞߘ$ H@8! 'a6$J w>BL νfA[{Gtuw=KVĚ=Jx% H@n#mMX@_`<ºhoJ{*u# ] /ƞ%c$ H`7PX&&+M`Zu6GV+XR_
67-c$ H@r7@7I H@$ H@{TE$ H@n
MR$ H@D@a'զe$ H@$(,wt$ H@$'PXIiY$ H@$
$% H@$ I{RmZ H@$ H@@nH$% #PF ` mV"CV-:ڢl"$ H(,[-^qi q!bٓ○{Rss@E:cygcђUq/Dwg{ H@$ $A`zv`5wzo?.tǪˊ9S⭧ suon^G7 IuHXGFwg[ ߌ5vS_V H@$ (,GW@PΝUD։FT#=5>~aFZ7=.~qBr #iq>ㄅ}폮c5 $ H@ (,:m
V Jm@mRWO{BvvTbr+iy1oFp|Fs []K|יsp {ևV~g4]$ 0e WE@3 p-*mD$n*ѸB/{C }AQw,cYg?.8~~
TE{{mԑb; H@$zWXM'DW{{, yqмi'Wo+7 `3 "04P|}O<|}Lj/a@ erRbp<<hڇkZ@_CQ$ H@-As< } _p6N |vm?^<{M^],9bmO͏^ӻ )Ŏй{O/z&~dM`<~xǙ 㶇WĔ-Br36E{?[&* H@%ܖW$ ]${bI͝Rʍ7]WI}'Voco0-'ￕ_ϬO-XD1ըT#f8 V^p~qӊ0o:iXlC\g A W6K@$ L@a9kϼK`T <P<C_"|qۣ
qSZ ̘>3:J;CM+;XgF>0 >{}q OA= OYϟ N
}UeV$ H` (,w% `r 57ڴy _RwЩE';d'q?ɝswH!$7ĕ?{(n^b̒zs߾+>;?5>{+Ni$ H@[/ H` ڶ>V:}RG{Ǹr]o?#1xvMO
Fww6
sƟ\px\rE9fƭ ޓŪDLklqokW˿y㗋E'۟: H@$ QPX % !0^<$VSħ.:*GKxtד ?>:+qo:&NX8-])v8zyg O|KW w,Y!x|Uy^aN|θ u( H@Z²E+bK ߌ89CU"NX8 sup6/]ڢ'HIM}۞,Dlj gE'SigSo㔃1گx% OL~I/+ip
H@Z²+"K8zYkG735i8ɍ[SfqFٴ8ʃ{*Qi:bRg[VcݦQyg%?ܺXeI o=6 yn}|qSswǟ\td?"bw]ԯxxb"sw=jp H@$=
{ H` F 6oz}
@=ci|wqYg _p<rcw'.w?:GW WJ%^A@( sý/#ϯ/@t妘:Gg{9(O/8*V9Z1>uᑱﬡʼq}/)j}ok w?&V-
*! H@$А²!v@G[%|bU\pxzxfx ]'g =9fM5{ Sdqׁ~ GkE_@ح=]CF '뎝 N_~|v1ǖbg uvŪuE5l
' H@Z²jJ ^[ \~Bsܸ*CS;┃qxi`tWE͍E J"v1+UvE_^}o| qsySō}t<q[$ H@;K( T# AZS]O4W~rrW[I V6%;{1ؑ ql (ݯ Y=}+$ H@ c9zVƐs1 f1=;x~uBUZ e'="^!:jv(3KHDɶW*qS~6Z/;}A `F o, ;$ H@' l IDAT =+}J@c@8~ZBDNDBF<. D8{ˮe cE&mm[N/<lV?er=m,D,39wF|}ϯ ]WT<bc3a1g$ HlյV-$d IeGĖ\@5^>q{Wdu~!s]g-, Å{O+^spX; tuD''IϚ Oq86=k{ _+Ϭ{hRđ(^:|n<sɪ
H@C@a @~- 8k\v]Hb⩫ >И
? =>>qqi6ş 2_><&>#⠽ŬE|7ŵw?Wxv"<h.Y!GI)d'>|Ƀѽe4]$ H>e}.^v /n+v5 }u6v#+{?Ss xqsc֔a>'ŲkzXzS,_9x-o<+< ?3jq|6 ϊl鏇[W<]'pxt".Vx5gJ@$ "l궰xe wo:; v 'xVv"{6 - h<怙1kRg;gO\9~؊Woz,u恱fq/D(A}R771X1>wy' 8;?.nz`yxL$ H`djzGD>74wߍI}ʌ>o::h+|
i4Vv8y0O[ ەUOY1H:䩲 SoknukV[㸅CiF& H@v EX>,= BC|e=?,"_l;+&q"L:Sg H@$ m Է H@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X(=@[&wEZݭ%qS'uFgn $ H)pH%0 tu!ΈV't/?(f^$ !KhG澨ED[88 {zǜivK LT$ 4²t[@WG{;z6ވrlލbٓs) cI@$ q@@a9*,H`w7 ;ڢw-bvADq`KyTҳ#t% H@@S T qzSS1r H` ~*tݽQi&w/w҆{Ϛ 䄸_@
) H@&Ha9+I!a^>~uX kc HI mq>3s[;3* 3 $ H`PXN2$ H@+Eymf|I@$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8'E8ϧٓ$ H@$ I`Һ^ IENDB` | PNG
IHDR C IDATxweŝ, $ / @x I3c4;nLBњVLwK-0-p#;Ὡw=yu}MUoRɈsI<='όK)[sw.RJٺӜM( /!!!!!!!0/",^҆@@@@@@ y"a9O8B B B B B B 2c B B B B B B`DX$'/C B B B B B ",3B B B B B B @<Kˌy"a9O8B B B B B B 2c B B B B B B`,2O"{W{Z,Мkwy<e̙eV++\dpy>C7(,LYGw}wYxk=W^y^_<7,-\hz> ^q
+0[>`y뭷ꫯ^m-b@@@@@ *,k\r%eƌe6+g饗~B` uQec%N?O ƌ?I'?IenmҗKSN9=˲.;?;n{ KYwu}or-^|+_)K-T^{ (뭷^V\r@@@@@ 7*, r饗馛@9CYd EYQ~
6ؠ^#vZ/qy}yy_}յK/te[>lyꩧIXs9m- G_ho] yú?AI/b-'@@@@@@#0g]l$~BtﾭN-$aFlVe]v).h=/ D4=c
eO yvm5p44X~֫OqN]u]unK{IT+&l.+w_;5p+[l1p,-?#kmtLx;;=8ʣ%Xց$y{}09!!!!!0t拰$;OV1CB+"f]wE,Q=X)7|><='PQX;NX]'nnKd
ҚjX(+U*{m&Q3VP><yM6٤|߬Py{nA TE5\Snƞeo\m^ۛozS_yUGO.)UW]U5\eUVB$xx.=
(D6[[oMėg Bv-lQӟT=~w1T/'1j/>K!.r>؉Z*!GD<Z;~>A<XcZ B^yM%b}_~?!!!!!!LJp$*}c;f/.묳θ^VѶ]afzo~:
Rz}N╴%GLp6<zx&_dJ̶zxTAA^7SnG }htLtEzĦ\ ki3X>j]&̟&0ҳy<1 vaOy
7PWb DZMW%\| m`M$,J^T=!Z =Wټ}ΛKX9gq wON;|#-:ݗ5VqMo݀ !>D 9D];&^`paA믿z-F$ Mկ~UtaU[ي#4-_|BS&, U7{g9gCL yUd ?[9= ?≠3}B S<,_^% ohwyg.ۄ%ygV*4QB~p̫;7B\-]\b;ny: _ m V)K| 6lSߡc,2m bճ_|NS", N;J@ y<>(rJHYu=K<^="q\} {QD+MfXH 5 ORonX2ÛO$*=q >uH eHS~n=zJ~nja V_MʲN! ~@@@@taS H=7y<a0C믿~}o$QwcOGJm}ml^Sl喫S]# 3jlĠg$M+L %<_I+j0!<(H?9B_bM G uT *kszT~> !!!!!!0 K!nxy ?*RnE!F=Cu&NJEʴXEwx D+blB( =bL-XM :ڪ27t*(ύSKm8ĥt!lrq f
zՈۊ҈۞mtNMD{ ջ?~@@@@@ /IVN!1{XUqC V'm iO?]EUM^!בfKl^r%>utSO=W|e2mE:^X'y#f_eʫ|!)sm!X&ܱҶr} ;ηZa4i#!0( AE<K693&dڹzg+ɇ$&k#,lބ)fBN$oj,:s=UحjuʩWV9{U !mjvkgwږ4+qNicZ WTejɳ
r.,$Є9#J+4P;$f"Ĉ_U4yrme8lKۜx="G|M$([N7 |6?{zʱRl %\/4˶
',ŵhĩ",lC B B B B &&S
gEXMf ~Xn y#m9:}[^MuO`ݼxA>ۚ9M= :){P~nq '>QY/m?=;6-OdW57Y-$껅B B B B B Bo²8[BB;T9Nl6ayO? o;u#Lu8[Z}s=1 I "Ly1)Aybז+^sҍk *ߪ[ouڍ3ݘ@ K<{ ggصnB@@@@@4 $&3i$=by,y
Mցxj8g7^ ;a'pP<^@ BvN18(YKmZkjy]屴ZuWuαY ڄD` &ܚ@y8u Bi%齏oʖΫ+J qUu
c=gI~dWt<f9^W^Vq|z_?0~@@@@pҴP6w]wۼnY]kV_}nOR}S@G 4&O&1צ 'Ջ+oXAXŏZ}5}u,Vz߶-ؑ O<Q V>!!!!!0滰E<{@!p&KgzKt)ë2nz'"s=W^Z'b7=+٭CT=#y)*,
)~Vr;N r!}^,ܣ ΄'._ {uu'?I}H]?kP= v1|<V Bfv&#kĔ/W]uUD韼qSn rՇ9=']wݲ[eZ<hh#[}O<xhTG[) ksϫIv%!,S-,ⶺք}eGB@@@@@wae&*/xϬJYt! kN + ocNlAO
ʳ(_=uiu f[H$r~ߘ-~dlZ !0= J kWlZ? s1 F[2'f.D%Hpn6uj-^-BH6z _B˶nʛnrPט:5xmB@@@@@waIP3O QwmՅw;= ǫ`"&
7ܰ<+;aI(O~'Z 1u衇ӳm=->jo~SFkhtLYĬi^r=ܳzr9LOz}-/wmi/>;c;z>I^^+ne'B B B B B`( 7a9!5ɓf
4<]D{0;⥻=أټx<C^}NU Km"fBym;ë<YgU.rWш )? Kbײ Bʟkuwc:M$0߄xxB!`%D\P x*- .Xc XYGPKD6kZik,YˣKoE$ = ,l[o]<_OѴp&>'|rwc PD'tRF{.'vi M wB@@@@@L)UM|L/R}$7(Xkyż.D: ? HGDXU SY/p(g F
Z2-UZ xVЖ8#2:RYO[&D{< m0+TKN|pM7-Kۭh孼{
~aS]zzbi!!!!!A`J%ւXsXwKĵEv:"B3Vo̥g!Ͷx7W\qEs){By r-BЇ!XA FP$8^E/뭷^=6'rv˶c=Vv1S}1S믿~6QN@@@@@TXFO}"%a3Z Lx㍫U4%3M' y7hY g:kxMEij,K\rLmSI[A[ʰD` P={w=YQт67/hqlVR:h-`~u]{S_q;Eտ y%@@@@@hf\_JNRqkD @HlwG M g
-/Xb#O4CW y" ߿7(nѧΣ=*_YqM1rxGǒG Wsz<(~@@@@@ -\X- 65 ˳9f ,|i[ڮ( 5B B B B B
S:vNDT SU!!!!! z\pژ@@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r
&ic@@@@@L!)C B B B B B`,#ִ1B B B B B B` QyȌu 3FF"+,dr:<m &0cƌL$@@@@@@=sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX
N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@@eEvB B B B B B @PK @@@@@@
˹4!!!!!!== sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX
N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@"LK###'(sOy饗6lS6xiYT*B B B B B`8 DXN~1cFӟT~ߖwy<Ss$,{rg7|s[eE2dd@@@@J *a2;Ƚe&}̙G ~?tO?t9sˊ+Xx3[lfe嗯}W^ys}ݲꪫyg}v2V^yZ̯ꏡz-//؋J+w0;!!!!!%r2믕_z)<Vf࿕;rBlw_Ko IDAT25l۫,6aI ]tC.R^PP~VW|ﭷު,½vmUl;(<fgQۨ^gvm7n z N(믿>V[mUvuׁMou쮹暵ZkYƒ +-R:]vٲr>XӼ /Xce ?^Sme7[KQ^0ov*RLjvzF;,Q hG;&q + \rtZj6/!!!!0 DXN' /ɧKYaRBn)QF3ˌ6+elE71x$2k"M~xˣ gw-( w\5Z[s9 Gʗ
+?v?om[= ] "__{Fޟ wU0%.vZ;{.W^ye9裫0k9B?i}Vwil qW7H.iwફ* ~xq gGO~Rnzk!z/V{ :ߵ:4n(;s?]\Kݪ<35]$ίYnzK:딏~Uwy5.?.+ vXr-Ye?B B B >Pu9Rvج?Ws +#OU) _RV[mܒ kƮgkbːFaF1X jply xs ~umSMq Spl-4WJ ^㬾UIO/t5.?lPob<s5<Ģq {X02|:~_2,fZ-CXwug߉Z.rGV;kS>e&Nоw}kA[yuQ$ y6MY \#QkW#ObULyA; }/.n-rα",'RK֊ts{R]V-#[nqojn]1Aaz~F{3JSn`e2f-҄&V|x!ܦ̶ҿՠ_mf)[<^1B9?0f0Q;9
cڢ@ vc5}_rj1Z:u]Wyc}衇M7ݴF馛
o~sC^ƝLc=ꨣ*W_}}ULzzU$ a>W׃2Nb@AU#}3oʮvr/ax w r!c*0!LڦNqƬ22uk7_p<mQ]=y ]v٥+m[\Zi5#,Pk }e_/3:,fKY賟-e
\67. kzB4c |a$|< ],B|xo>G z^ξq@(i-8O0מ-cDZnaw}{#0HS]//08Yleo,!!ouh?݂] Yxm|JL~*xO}%82F:^诽>s%B ބO~=Q .ui+ݜqDqNZlM
z{CUiƤ`ߘ&<]D2G>ƛ떸51.=oD]̄N",'7,s;bߖr f(2VM`hz,Q{ K^67+0V nPs|<Բ[-$5/$Cق+-Kĩ8</D<Z sLm?]\^Kv\ bA>mu"u0a}<>_m/榲
X&k\OK_cGC+7D(@0NA@o'GwC }E 0 ty A ܨW&ouцrK<:G V1,Ѯ6~ZډlqLUbY0nyիM#oZ}Z !!! Mf-}ˌÏ,#'e)PFXu)b FF,4%ã&8s " Qİf8
,p2y`e&0Z9<.3b4Gu5UR ,
&Z ?whb#|n_:SygJDnr;Zz&cc8S( (禃m7Kׄ(/5 ;b̹-
|oSTo1ۇXuuu!ȟnӴ]:®"T9ztI:~I7qLmm.",''Z,_',կVf>dewf3 b!6 W9C&"8 YV5b7Wh`8^C()d~1☠mpP^L<i<Mhv)<Z
y^
6ub(@\~u5VΠ 걱D c . } +AleKcߘʐke2w8+~ʕ_E[Sw=9z +J
c \\kPB@@@LK>Xeu <2c&<
(X D/D (L }` 4C !|oږ!;Z0c CWki\^e [!Ny䫍<S[TA&qy\Hh[F'yJJkqa%tnq'ꎡ-kL6S8zsM GwNƴ1.>&B B B B`rcׇKX1ly,dBTy)<v)K ' i9ȫ5MhN3֥c4!PyƯxA S+QiaqbP|Z FT]þtDe<Dl+gVބ0Oe OX0 s? _A -ܔ1Xtcx Ќtndy yٱŋɍ װ* Xy\@@@8e0 F`[#.1d*/xm`fD@{D7eon/_-Q*Hjà-k!M8Eɻ+* W"U\vhK-
&m5
uG'Mc?8./VAӝ-B9Gp"V|-uqxJT*,ě۠7v kЭ,VmoZnzMن@@@$a9?iRchmBƴP+[M .s!>eK-Fތi*7Cv}syttF.>zy뮳dk'۳MӦ+cڊԙK4!)dP[yø
7\ڴƃӧtї僵isƍœP e42P7ױgs̞a$nu,m\+Ss-y'Z0xބ",A/0M5fQBϸ |Cqx Deqߚe,Pf[`z c4?[PiA˃cg"!ӄ/,Qڪ D6q xyoWGkSwĪ-#o}M74ei|Rq1ژ#c}ƢL^]4G|771`{=c}q >>sA 8s rx\1hwo*$HkT3 O@]/d7kA=ǫYSs͵70jSMxɼ&2 ]%qSaInɔ4J" Cy3yjG\A+/ixM__{P'-#TB%y|B<߯ăgшKe{*;SzuHkt .M2ۖqĆt^堮DE]Tֿm#Xy-qe2DrL<7@.CҦnKPoP%>OXׁ^#_"|9ӱ}vq:Fy0ozƸi ۺdݸqx!ޤiyɵC^I{l۳n(+!B B B
CBMq#,oUAC1N0B4& n+ɿ</ #\ބ gLJKDb><5&
!oAՅ̧B}_P#uj( ~m|1?LanM=e]jgyf}ݫC;&Nµ^[n20ABl*9H\1264=k˕W^Yһ6]+Ę2x훨#<s]qU`L='fye56/A kAFW&v&^I!!!E rHe>*'W"1gdZTx,< #Akqx h_]%(1~}F3p2bRzi3֛XSq^xjMť?HGx.Qr衇DI /$^QB'4yaد?&fiɸtmz~V 8&%;_)8cS {D"MTn ֵ2P1u^V #8viuL|wYW?+z)_xᅵ u2=<v1:iHU%,15=((bG~r]!!!Ӆ`fnAΨxKx=h10}MXBt1ԃ<ZYDisNO1K2yzIVϴ7aў5 寮S.o)cxmuzf&_yuhr:/N:
sym %̫תgo ?+X&?W~#|ן@t/7]cl Gu{Fcӿn(7Za '+ TwyPʬJ#ڭ[w裏7 Fc%.. sLkm`Lj6fhF+C B B B`~_(`(2 H/#h ,6 @bT
<C l }bW 6ؾ Dhf-ChS[8'.
7oEQbx<lbMlS3GK 鶗$
l+B`z&'y&R>Į2y)[=[BUlAm pnƋ;oLk ",?^!L߳POLmD!֕1yyH SMM9d2 O<Din4a8Zum,q2Zcg A5q8ѱcyv
L4_i2ѴSoN0H!!!!0 ͇%"ݓ!T!n<H=tLuhuNilJ DX~}Pk<]Dd5BycxK'U5qv"$N@@@@122r})e6,1ͶX)BjVў +}΅@@@@@L:",'i2 "pÿ-9TmNcC B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@ NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@Xdۜ&@ [o_~7(3g +B B B B K,QYf36?r !022R^|c{, /<<yϗ{eV+,2r0B`A%+ z
UVY,b2S~A+B B B &Jw-fqD<.뮻n#,'J4B`$'^JwLsF "HB B B B bU[єgy e饗n.0gS:Si+Q>C#M
@FvkQ 2-vW%l$
!#`}r\yS|",l0!!!!0
&,">4= -DX6نp鯋/x 2,in@@@@@YJK.Y<w
]!#k;<C47B B B B`؋mJO7d.!4;B B B &HًB *9CF` !Ð@@@@A`,1r p9!!!!!!0>%F@@@@@",ǀS!!!!!! Qb@@@@@@A r 89!!!!!!0>r|F >hyʊ+X?/le=Se饗.-\ Tg/kFrՉW_}<e%(,LYy{'v8ovyJ+TgwV2F+;C B B B B`A$01~AlަG yzꩅ0vmq W]wU97ʆn8!W\QxQE?*֮Z/K-T!4
;cLmjc=*c%_|+{_|KU\+_}gO~o*߄,K@@@@ )oYFx*3XQ^D:Zo*k >袋VtWo̙3gF< wܱw_/7xcg⌌ Ս6ڨjx{4=X%tӄ4c .u_l
_ye vWϯ%RqqCw}T_vfӴ-۪ IDATGIlYYWfkO?5>ET *#⬾%\Na%TZS%֚ؔ7)Ѧ+U*\oFz !xg;c|婼8%XMy{x6U' W[q_~*&_yGxz{+GȦ&@@@@@J rV .3Zw-?Vy2cKYr1hUW]Up<tUO |>*"O9O߾lϮHyIX7tS*_Pބ\<?p9s(T/qCm[R^TXM>w)Os=+bѴX]SxիīN<"τ#z:.7礪x AAq7c?*SܱO۾|ocnSmJ'!!!!0] DXNy2УJyRZjeGe@5
5quuוn lYygA O<aA8\ zbO ^Zdʭ@xwW^ /(*Ok,/>*h[}ԗ
^ߵ_~S*> {y<ׂOiWN-]sFX1<놃k|3&/r7x& //}ceY]wݵg7N7]?i #h'5]36X 7W<|Wױ- Qqyv7@@@t$a9zeKY~Ry'_^)?SKb*/ˀе^[;＞"F-cb? Cx6K K/z-=1UO #(Gh/D_l:een'!+_b䠃EXj!.ڦV6#< b> MϜKQ`0va+_G>^!w]MsGq5l\{5Ծ7V
{+?Ɔ
oxWX7MXT&Px76 nחE,vqO9C B B > ",Q/j˲2 +-Re:dlM0͎`g23 .\$oޒx)J$xe－$n ~4J)+PƷ/{i6lS>OZu<%>Zv!ҟqUd?!ө|bBݕ[T(!@vY|_ sF͋O>zy6dvX{ʏ~WW_|
J7XQ #_;,[8c='mK.R9+7Jj̱xnr<Co:)இN8!c 2!!!
ө,,\̑RVYUW=ƫtw<0liBStq n Fn
߿TgM[yxrL P V뮻n5y
S> JDQG Uum-tEx>acDHO?zrMVB3G#<qx$o}[&C7Uþ0UZVD&qf>rMG
ד1~!ԛ#Z76._ƽ袋M~hiO rus+JYx2?u7re̳JcR:WA+P<"]-Qnqy)o3b0$$/"1#^dhð7
չ3ve<'IH KTMldBhA $6 F\oM%pMTτ9#`Cigͅڳn;Y[N7V5<}Ճ?
ƺ%nF xcV[t%C=t n@@@t"a9zjTԓe~[Ys2+e'T[qC 2 # xEKL<S@m}9SB 4 CBQqLƴ:s1Mt̳I5aQ]c^~'Fzꩺ/2 V~0'NA\⁐e]9hnB<O)MY X$G0-fOwW- R7[<E'<ʫj|zNn-ɠ|MϏZȸwsf==B B B B`Znݲe!"TX6ڲ
մBb &Kx-3';s<y<<My&}7r/Sdǔ|74AxZmT|λx-(C}
1%XP r)a{z뭫U?u Ѽw iMn)m8f<
ֹη4uč }k%j:71xKUXyA 1 xvC(qa9 N",So٦wΡd0lD o bp0o$&-yW3=/} h !,-ðƳ<U j"mW/qZy4
q,5T AEPKÃ{E4踶Uz% aη ϴnb_ۖvکi
M4 -qe:4~n귛
6
Vަ[ huo;J R=я~WB@@@| >L-H]{D#3U@+ `ϱ
4ýg* t Pyc&AƵlnƴD0s+ Ӟт"/h
Db%|yZ^!<+h
mg&kG$kRxwMus n(т8n J/UXYyRj,x~ִj>W3nݱ<^:i㫛xr>B B B T:
3"8%L!mynߊ^%<ք H'xм'5%оU2q
j! 7 #=BZyj _
ve< 14HG͛)gx K8csM2Usg+eܴ 79
ٖ[n9; ?y{`1`<[uXwa~ӟ -9:cmڸ8M`?B B B B`:N1u1ի9 ^he^ |yZ 8yr˶yZD eU5y<B3y h&ˇ)^CbbKJ8Z m{WyO_ORzNw'²b?>mb7x5Q&em?; ۹nF}ݶm}&WK/
cVY1ś+m͏6m'.qB B B B`:0Iu xe2Ʈ7&Cj+]{6< B]/Zq' < /MGtǔ~6K *]W-Sאop0skkPWL>5 H -6!V>;&1>m<zjTq13Z cƃ^WfGۖ1*{I ɳ,i嚎D*8ѠƙkĸKSoSW;cسH
ØMĝ~v2yyMxJb</'}aP7ڻ
DZ $N8븼 PK7$@9ABXuI"xN /w:ڴ/| %"|kmS&,[́vm71Kg,4&so'ai^n__1՟wcF955<'OZїM 7C B B B`:ν3u#LdGqg 8*"I-&> vءzxx.w}i"R姜3<kh@͠eODLK|B'k4!i%{zjyqZ{d0q<n n^?=7E<q3[}OpO {^ ۮvSC >cd 6'{֘T_+vk
v1~לEB B B BD [3f@eC9@l[ DxQSG7uִO_z5t"B
͋Gh~8`O?QyVl9餓곜#<V}B;/MM866<{k$,cܸqGGNa'5Ɖw j²{E:M76ac= lu8'|rbxҙ-nǵt~L r: Z xCT XI<C6<521Ga
mMl""p}|H Zg\{O^*/ݠܖg=ZYV.C'9^]v٥SNc\
Vj5)̦NF0n*_y*qƓ(|7Uؼ袋d[dJ:k:8(AkLP IӃӟ<ƩA_|L r: ֍0t] 靦{ER <ưwFnZ~yL H@/?7PO< zsΩ۶J˧mk
$?
<iMZ5 Jw |}Ջ{07Җ}Z?WP<SN6q3V d杷qfk
ge㮰t_el.*FyLS4};FКz!!! & ޚ@]'^i hS A"Q<* {l5W9 a-.g1 BS"}Hw} {QkBp'(i/>Ck=A" $zF+?| 'xb\Zqմƺ@vS@M9֧-8om[v+~ksMnغ;?V03
U])dό:r_kεF\lijGpMn<DG =VUs.B B B ###חRvVJeB /mWLvġe =?ל#009ׄzSjhEWxP. n2XG> /&So 7hƺ><Ǝh72<ޭole?B B B >pl3D K G
x!²®y~ԽAM%HF`,aӭRX T &KK˃!!! 6{֪7B B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSPL?,H\j!!!!0̜9̘1~~ ?K,Dyw{7ۏHSC B B B &@37,.htDXvid? /\[n[o^{mZ@@@@
~en ]!"cjZ<套^֧!!!!sB|l76$e7DXvid?b-V^{: 72
in@@@hysϕ |eV*+lg\_Ji39!0̕˓O>YŚ"B4F@@@8؊Xcꪫb_ߖ;!CVX,u:+Rf ii@@@@ ;,LY~嫽=ݏ~ 1݁I9!nsB+qC B B B B B f#a9 sB+qC B B B B B f#a9 sB+qC`H Xf;wzzzw몶<[|/yuIcu^ƫU>Ljx7562/{\Z Shgm/n~~_4 !0]dUGLc:
/}KԔK/QwCle--Xe2>"+E_wߕ;Ｓ eW %? 6X{o]p} p@=M(k%(G q WC` w^O ~x} z땥ZjBu]}9CG? -ӟw~\rѢy\>_}xˆn8uQ^r%UHG -Z>Oڪ?lz2<,r婧*7tSe]zr_uUA Tf#<2 ~J`vKN
k[moxB8
<Hs3O?oq< 'F[o]Ӌg{v4+O kQN8Z^
}c{<C[n)u
:ub(3 WoWǕ.n6W\QB_,m{9|gʃ>8(n4L6@ GcNĮ*U>r :f(K>ʚh`X,6C!yy 0~qebݠ>Σ7mVg Twmk -n{z u{vM@1Zh}kGqmsh?s-_;0Vz5:z0{k^Rmgci:nfc1O<Qûﾻ wqe5%V]'z'7pCvmWó>[W_]_ױ nJviu5G }t>W}۶뮻&,}QVU3,A7ʔ9Z j HE{c_gǍ!ɚA <Pvcލ}Qkdn_NO>Ye} 6ƵqAqӴﯿWuoJ+4ۘmMcTiA{ j+Ӯq
o~O?.(]u6ڨDq q O r-`1$ $# ftl3Fz~j wMH`
ʧ?j`8-آn& F mP7O?]x1DYnlDՉ)f`j>˨k?\`gc<+~6)`$co0`bL Ӹ7.mnek2ˀZwuk}2q; blͪǪDk]Վw_^
k6Ѧ.
cu1 IDAT NjΫGx
oyn( wq8RWߍ }ZMOhcqҦ{B 3a>2ҵ)q溑76
/Ck͡6V eK71hq|vy| [K{k ^zi9czhl3kBiAG擭zi~>K{l&m٦Q\0``z=@їnuDnƇ>p~oWP_\Inz6}_;}q}< {Z!y}^ߗAcL{_ /hf0ov_\s~+'2^=&!}g<m,s ]tQ nm믇T|)ݜu'e؉o=%In<3o1th~Wf[#a9uls|*/pjQ1V RҦ˿KҝV tW]4`|wWÁA `Tf D1Z>sNMcA"/ ?3gحJ<A{ce2cKƾ5u`dcϜ7Ny2/-ďzc9/s 0ʘH2xzd`/dhJ-`b@}<,~SLAc{PR:tvcr a"?SD cI
ZDzptLoԱ /ѮAP5^ us-rJ'.4ϽMi6z)&@s |, {パ~ Z:cƏ0hA=1۠^]a醍>;tR}ݷCz1`3[ojsMnZI&2lck8Ėx82UWnH#uo֮S]^.ظ«~}P(IZwЍA\u~_'39oD뮻y}/, hkV7^D
om^b~_m/nWd?M}Z2OכH}[7/u륿@_X9nm_m]aigi 7pck7k_ ׄ!a95\k|;.)ŝ_a(3}qDdj?jv'/F ~Q<=G#Ç" 1u?LqeD #8oD 1^?wbܨcD c |-7*ĉNƙx&C0&By1S // OEeQ v(϶/y uQ#8;[6ASsŇ md0ğ<LvƬ;8e&y`,xg0>7V Km#(T=ҩ;M 7pԑW1 o: "Iq;:"k(O߸9䘴>8UwVvél?5Ս=h
1#5c|]<nC ?"_ 2%~_{fk Ђ,פ {e9O8k s1}.:î~5/ DQfmuK ~KSW7 ^ơ:c,+pA}L}!D!-N
^mocA7v-gng,٠*v=~ (ß^uƠlpo|9[⹙oxA gx~ߍƎ!ƙ1#h߶Fa+cvh!0O]<? r.cI\To?G?tNn3 QAp?Js7E?%y1ΔM! c
Z-H/-4{E1f0!]Q A`zι/ (4N6CXˇ Xj}%-!ͩZvcܟ~wǼ <u>8y
0vƫscո"xy#Z%ȍ1~px l= o@=Z`3b[~v* YFe`c,)ϼ1'+Ƙ1[0qQ y6 a,bz }Wg:cH11 }@p+H
zsc&`)ˍ)J?5 1e\qڍ+7?\0pom%l 6ۊwkG Oګګ}ݺt_W-Qz |AKM}OeG۵Q'/ҽ( &65lfuoBKow] e \G_z67TeNVxt}~p"²I0~+_]b8 qwvujl]ƫX.c1m3~V(]vrDXN Z~& P<
cgٵ;^?M=j\yMO`ZO?,\bD2[>#y3wWdc]coя~T~[ߪm<˱ [nel_aLB#@iߎ1DS=C ZݤOaX?b@BA93 =!57qF7o3Lbh1(1~OWX: hX}q6 R3D@w쵼8ĉU[U`ey1VF^b Y|g
L7~V\60ʛ Gr߅ :|ꨜB9 ƀ=ؾ 033ޝwޙsg=w;Ύ2N`1
2`""P}Tj.ԭ (UW'Nz+GXH u1I8'} pƽ' Ga̋ヵuB +(펴/"lgבq |߲@}p <p8菊~8BW\q
& y);5 bvUFA$"0:E 9v_S;vg8~)Njxw1^~Oۭ7!2r|F*߸Wzm2&^yE jX
h.E ~ͼYLㅐ> Ѯ+ s\~ĴB`1vrRkܮ]{v" mq^x1 " #6빫 G>UYoFy|90Ҟynzga1Z}ˋFO1&8VB;Lid12(3)22YgD(
4?d0hq@daYD I
{H¤CP~-D%GXƘ ~ y'n& ;F?p0b$E11vU] 1O!-'QQZNXѺLBM#?7=^_ 䅧_˲7L1rk ]=KQ+,0vb#,0`K]s@|R䝲M 0D1Dic MZG\hң묳* Ge|O=6 D OS#As<RA.+C^0 Gҡy-uئ] !<m, zQf^<y$?oyC:b|E="Bzee^ Ãe@GŔr9L9 PN 2evA>?EZ^&$M0@Xw|eO}Ý[ 0_O_b tF uY M[8Kd`<#h
8.l|?2Ɛ:*@1q63/ҖY\ LhsS;A|R~<m:1NZ^`G\ c-K2f2 P 3 s8'qG m _^\LgΧF/ 8xf9aXb7 I}b ei4ʃw譜 DFF.;1~8ȠdǐIÌ 8p 1 gbh0h18,qb,2ar?'~pCF*q ;d4vp'\C1a^uI LM&0 ;i&k l= /?1\Gj \^ P c f+&43FHԈc@~#}!FH2sy%tmK_RݸaZG(;d=ab #b NۦGrb_?FGxq#66ZGd .v i// G7"]=y`W# #aKSUve1`16~10wﰡ}+F:,~f\
X=
gq (8'~`Î)W _h(c2",9qa|SV0ռ( m3K'I> V[wKc7G9j q4wvo98xJJD#|PΧo"}# @?ퟶD1﹐K< j ÂWF̕M8#]4$
90 9u6SXҧ(7}=)N;1Ў@Ѷ e9k5$0A B ڹd`T.
D1R'>"<2~&AȤdBL /$}D
o:#}³Jt\uL6<
0:yω\p3!0yMĄx0ZXQE yHiT2{V1Hp+~ !w]v(Hو A7ZGZ8)QXQύ a2ca/@ c.3IAW)7\j R?3"O\O ae/ R&ҥ/a(3ZGeYGN{+0J ~XTJc/ꐾ6<87. ?<ȅ0i9Ч9 868@yh p̶w]` 1u&}8kcaBhe s# )aEqʎ8^K/mrvqϴ2 )9"@Xb|ѧ(s WFm eu G,GBDsr"raxXo*qn4n,퇲u˸Qܜ 2sz)l=^v'~f&=cQ~{z?m<P^W3ewSv#G8H 8wi3䕾 0S:Z.e#9n C ' x)12:&` b&%"+j 0I1619A; \#]_0C^P4E3`1bֺ\'^&/u& ̈́GcTp_ #91HĆaq֮k c0`цn <*e# 娝a7w0 %4W_ |Fh y$ǤOa^ҧac66G3z#8 >9R0 Y );'aEXE i䥼;A|_nxAG=atyRr v9ZG aΪ>#Q3 !,VP78iOkm~A f~x賵&|ߝH5XD|:7he7d$GFzǑ.>Mq++̨k B7c_ ?ʖF7q2+/!x 0K:a<h/=NC-;BXxÜ1rwSؕ6/zaC惲V 4bL /C!hGgahr\ċ#8Ӷ@!/xqPH9im 8F73O!h܋1a\;Zm OH6 s4m JF
N`=@oKh/pGn CߪWucO@a9LQ@ɀ bH_&=
&&Rv YdgbA 9`\3XILL |' degR-3)ce",M ;X"_g~ !$ϊ/`YF슣Gv0vx1abŖ!1k¤ puYuXXa`2(' ++,6${a@`1@)/&Ҩc\6 4<:xoʎQ+3Ax҆1D1pp\I\/ 1yR o K :IgMH i9,_7q !a 1ZA'HN S'm5ix0.Kf?.6 6>\ÀGGGv[CE8&Ä!B B8De."e>vtX,b\g,alU _xJ7cCy|څFQo|?2rg_?eE ʎ "Z|Oџ uqD=);G W>}Kx ώ1 Ip, B
G L\/>.;2 e./,,1CHc1']ƛa/uI` 6 R!=EC$hd˶8]"|2W2[Q%ɋn l]}( L 9^rN|; #3'# FC&vpLW&AD
99@0&b9\sMa$7Fy,)/t0ĉ+)ϔ/x0R?3 '"$ aW<g `=E
Y'Ne1yb`2beYg]|/%_ Ypn9'0DX!Ή^H|ca|`N~ӱB FQW/vX !$ˎ87 P\2\'mر1.rѦ1:(\k$,i'-aH¸e^y/_ 2FFs qw0Y?#n .;PA:eG\wϔN/m2Hy& ㆡO~h1,#y/Bz}Fg fɕ epQ09M~ag|a<d=Kg|!˲1ҩFK Ʌ9er䟺'< hs<
npFx`~ȶIX#^xgq' )GXFY˾HfLq,<`~oF' N Rz2 KHN f zHe\ 0f Ye"6b(/~8A]eaɘVvp%q Y^* #;|Ǹn E,q/pcQ2;v/Ljo2.#4 LlL 윤)0 Z(N#\g7рLC$ns~W? qSE 䙉?LfL|&ċB~!1Il1"D& %EoA8&(7Cid00Ԉ q;`PˁɞUZB?!2[# '|X쌣<\rb`3D R~b7& IDAT=!%ċccr饗abp# ;4O"o l l Iz<;N{fxY-;lꍝ-F)<18%<u
7bX;0y-!fvB|zX.`
9aoE(N=Ga"iH? ^0YI4)A.iGM\/䇺]!wF=@8D_D{X48Y&i=O7_a+3&?){/āw>_^e5e`\A/Q^XgÑqėB/佶oRf> i uq90=5X\n߅-01j5d!M 퍾OO|,Rwu2. /xr ,""5peU>{XF?gg8s&M[N))NN>- ʆЦ~}8){Dyi,8_RwRꝟf"0o } #Y 'sǎc H```de`"(;&iy1/':^7I:C0qwّy! > r\( ;~5 0&" ]ّbq+|18 /~|VeaŖy(C"Ǒ{^v|\1( G^1hR}D'6 >Sv𨝘 Oa 1@ͮMDa#{Ðf$Ea v<p3'F'|802N4 $;겾G{) y:B4hg?6io) /j~=ޙμ.mF:I11h7 / ceL,z?9 }9nmvA{ 3m.=e@pE;ݑ0E:X5/ uSq.?p:m>wEr2N_BHUx~1N]QʒK͌}A҇+O Ja|aBqN댥;Z7NFB}~HK=0Ý15>3.&"5A _WL-uF QqKE,\[I?# !*q9B=65K mq)1Kp.F ]_2oԊJ: fNX$!-Y ӎogX!A @I8Z/ưđ&m!@Ss yjmZs^ w.$ NI Ä;qI %WꙘYd{ XLĉ0i0 Fil_b]vEXaa23ELL,L }{ # ?'I VJ141 2bt33""0\2gz0<7 L|[6ڒu+va01& K?C`dy40䍺,7&pbSp`?/ p}?{q7.a1pT82ꏧb˂xࡼI\C(L:K9Í#8 TJ11l('m1A(3mqAQ q pK2D ÞC}#1i?-H_LF P7\'o e/_ M\'
v8Q8w?: ꒺z!5qK=QVD q`K//Ӷ;`.&ui,NQn&y~9/hgG!I
"cB8h˴tG%zL)3b#L(c 40AxSWGG}_/ie _>]Frї@ "nD>YL`1N/~N6%fx""qq 2 Q%m|@A8NO/{W)'m OrBі:}ee??Cø?y7w-iܧL= .oxv:uXIySxV5c"
f#9|Ciz䓹{}>ͼB,:e~5
]gh LxL$Lxc[!&t 䬸'AJǀWA?dDŽ]W;ch 3aNJ 1h+"%vISTO 1v(>#7yg 2BLIZ)`y' &`)*G#B0NS0bHc`c?]Lzǰ& H\#A$q>$<;qĉwL/꒶H\
s80 Wk1"<a :Hvu
1G~9Ң`arߍ9 [ R/i/àFb5O~ER<w#S NjRŋٍ/QgG0@1", iѾbT# Y Y o)x1SP T.ܳ=fxW?36 >(+^ig\@/)-AN$ `,Fapϋh{bJڴtK(g`^Wّ _O{$@ G
,{/Q<@]h _e# mBbSǔ G=4b kPmtk1VҎ)cE9"7}䏼 Sh{0&n u!>33}2BN_i,nP\'K
\p0at !̵p"%9b iˈc(
Jm ,J2uk,Pr(#uM ?=E? tNn l=}( L`"0$pec"c# M113hj'b?Lt L5l0X[LneaXBHrS?M8b+OXLVa䓎4(+4~0XM%#__' ¯sùBA_&4aKy&|w=@ٳL\ _^#9u?D y Qq(// qR4 u\9N/J~V6k9 PG}8 mgG \}A71E",TY?z1B?F$m5 eȦ6ak[5" ;e~a AIߠ=7uD!' `de&.ܼ}()(- A_e1ws_/_;P
6 ,B 29P#? mazWƗ웙V{m("*lo|`K<Q_/!c ReG}_sZ 6l'#c啎YȤ-1Ǯrvc]JW幻6`3N,BDy'5 )y]sT 3J@ F͎:+ {LL>q7H[ob .'r ga)+\!}&Q ayULaԍ-]$v4c.},(-+ezm{: Pz}8}$
NT0߸|'):ٍM2-⦯Wpd9_);c ?'oYKɤˮuE Wa3~Ǘ$1qi=a▨y9 pTE&a_C=B
;gZؖ q},Np]~]S,RX6J`^&mok Ot㬀
^./ YkYx]|h
/%b{9" G9S"ςⓅîWZ,H8~K } v"[ H@D8O8<G9MUO[ǎ>sr|EV²x\$ H@O`/V$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@PXJM[N H@$ H@M"lX$ H@$*RӖS$ H@@(,h% H@$
eԴ唀$ H@$$
&5Z H@$ H@B@a*5m9% H@$ 4²I`V$ H@@hZN H`[^)Jmm1[$- ,~@T.YDCu*`L<9,X0mf% H@B@a*5m9%PCݟiӦ: wj5{6͟$ He (,[-xH,$ H@f1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@
1h$ H@Z²k߲K@$ H@ cQ3V)SɓիRٳc`` n g}6k/wqGľ[e\vڸ뮻2#<rUx'8by$ H@$P²> { k68cڴieY~}x㍱t8s-DSO='tҨ[āpX As . ,X=k֬)o___Nܵ_n)im%,|/Y{+,GU;z$ H@xm 6D#f̈!Do77n믿>}XbElذ!wӋ\cӦMloob8vd" y`7q=Üs9~ x~ [7EN:5ϟ sOQ;C wq[ dzCIJe
J`.,ob2{!ą^Xw8. H@$ V%5ߪa<o{oGD7 Kvwbw݅hzbͅ8O<!* }PG?m/S/R!s3g,E=8;Bg)eƍ?0cƌ# {;|p0"-d8qą~燽][(qt
$ H@$0L@a9b||wIElX.bٲ.}6* 1kVÌ".\Xo|1҇ z(8co/M^)± !C^({4v=\qdt֬Y}Yd':xk_[JDUW]UAr4 BDn
_ҟ4iRq %\RH>_zWEZ) Sv)F|'hѢXn]!O=bQ#KJk.g H@$ 28KcX!b"ohǶ{,7)~ ;'pBq"@"wn" 96p}٧K?5\S<q@C<rd?y-o ɧ~ήܹsI;c~__yWR 8R d uQ^{m?8ڊFR 'B1L>_!9jK="o G) _ܣNh o!/H@$ H`& OjuQFxGC9(De̛10]aIC% b 1CkW^ye!<>Pb×w+"Fy`W_]ۿ[!(O\3<3ou2n/yMa[8
.~@"Ge`]YdP""̑WHn/)NI'
M3iZj mb7ͧ?EeWdi Ph ['|y7% H@PX & w\bʿ_5$"I뀽k_ʉ'Gtu:SN9hVr ED.
\ Ov-dW w`gqF TX)ęFk C Mܙ >K!C R"eG^^~({= C;uđksReXl5 _]
}ۧ䎈gV}+qJtLG}p/3;|ehc,оXyX<9]uA}e??avܹ79e+Hoۼs {^_rO^$ H@@@a <( E7wE Xj]Tz&*g;<a5w Hz{< 0H(j:g.+Ip 2-; <i?q!o`PgQ5,B'r7MG^,Y7pC"cW]uUa A o~ ?&kmvvAɐ;vbaXEG|lChtuRG5jJ㸶;eƫl3gNўio .?,q?oSB)zEX?* qgQ7Xw 0uOf^Z^$ H@;B@a#^,#vE[of/~Ƌ"fl v8 WqCa"xa.EF)B
!.wUCX t.>Xx%~sD߯~°&
v09ya'Qb: 3.dC p9w@09Ky",yc̿K>~j|jbqJW[}ꥈoSJ GOo i#7
E;+6 >$횣eG;f1ȑ \Wbq vEgsݓ\ƿ% H@PX(&oΝ[<-oD,\/>cY ;>P^*v`Q 1idA8wGyNv1o{XƘE3˫^#øFH,!ʎ(:y% kCbا// 9q#1I ?eG~a"rcw =CZ;
uoDW"*?GWêqМ ,1P$ ]{őq:-?v>?le? ?rVX'ʟAQzY$ Nakb ~ R'F*
O. k0 IDAT%[{LX( w8,' !(M5TXv$s+K.-KSai<D?-r .(Ǯ7\" 캲QYD'B>8wv~x Of ( /~Q0Woeї~`m1ϨƦu[mĪϬ8h>@h
}ߑ袋9 - qxEc~N|Gȸ|$ H@#PXDgk0>فCadk;aqd|/##Rb"X1`{&qOJOLD#y 3
B` Br_(c u]G+CY~P]VCzƬ)[j?G=xx`ݭ@{s7bM{Q:: *x21;Ew삲ý tt jꀾB?I@$ fPX68"Ҹ? 1Ʊ9bEL}g}vB Ʋ 41/;5~4_u8jcwK/t |%fL<o/ }0Ph}{@|8tnG,"PluP
K ϐ: #l]ӆy ;qgaNa { q q[ $ H@
˱8A`= Z1 Uι"u!x*,Oa#ӈX*q<('3c$Gaya0sgC,"+8㵯}mi /08{i
{aG[VadㇼGuI< 1| WG?.9U+/n &.= 2;оʎM#QmSM9/qXs_3|$ H@@(,Ev ŋ!.$G>9 =餓%(/brLKv8_!6eMG Ԥ<` "o m]k^S[?Zx·.a]Mْ ;GN\^+"F qr``0; :}JQ_ڸk`L61; }vő;s\6;eQU2 s%GcpN$ 4²Ydwc>v
1^j _ h_~A %kb"nFo:" 8t>rcMa."I/O> trWO<u4!1bx#8)?~)3;BZ6 aR.c̴E۩nEφp} Θ]iٚCh\/%,heGgᅾĩS~EZ,"R % H@B +D8RHpet iN<VHM .JP,% b0F>9& (f<;1]GX6Dv^;< wb'${B{-lU Ϟꗶ=) ?0ԆmGUbjX;)Nܒ"{{KXpWb O&nNp % I8& H@v@kn
q aOn#!ص@Dq$1ϑu]Ch *;+ܷE cu '>'d'QS B8v# $?\q=82Oܼɮc E1`>4K v Qv8ˎq^&@9xq=qc}o[ 1?>tƔ9=?!~p9kN츽 Ӟ~OOiv Bm{ӛ R;N$ 4"lDf^@8=<Ao!Q 葎k9{DTÇW?*JXy$b"btH;rr<aF>8W!"w;c([pc7~JvHy,(W2Nc`:y xX3tGwųkz[wo1)LiVm/߲!ںDwWXOk=G *SO=.]Ps1Qo?'xb,yM$ )ܽ!0&H dx= 9HeG0||Ǯc# ccv93 )KNSQ/?ˀ iS
JvKqPvz٩E !vV)3;]@'VbCtUm'̈?<;Nٿg ׯ'_쌽fcxPntM{K _(,m/.efaivi[N Rva+KK8ZhQ $ H`W (,w8
|w#1V/N N^> `^-CrX
K~#((*i8ZOg::! Z^;r, GR. s`"FW\<H!0)3Gu{@%*{:n\ǙL -kz1n^23g̈-?r=턇<qFhIю;]:/K>_}ѵ#fpwN$ 4²ل_1LyH;kGGBk]%Nq}{*o A-w3rĕF>o/ ipc Y._ !8\v4r|{gL<9_ ^ֶ8f܋}n DWWgC}#tY& ,qʎ
"d$߳ÑX <Q9. H@v@ZJ$Z=/TC Nʍaŵsfķ;_茩ӦGGн(m \Tem9DhH|E\8}$ H@u,z鼎/I@( pvs#K ;o3O7Ƈ:L3fLQTFLgGCiM#Wצ%$ &+A4$ ZD@`II1c1cZ!638pu!yQ$ w,[-vԮ+Nk#"Mԡo'qawW` u<WopHTO'Ooo H@$ D@a9j˼J`F%jT5Wё-JwG%q Gͫ>I9͆$ H@qҗ$P@Oވj l#너=rzWĔ^( H@$0U_V^uϼ H@$ &=Mk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V lZ$ H@H@aDF- H@$ H(,[-$ H@$ &PX6QK@$ H@h
Ve( H@$ HMk$ H@Z²j2J@$ H@h"e$ H@$ V
,]!n}X s/K`!PFtu!fi9v8xQf
)$ H`O"PVwD{R,$0zոg~tW<bcEuـ :R~{MO^rb1۵, H@&Ha9+K`vg3_U
Fפ vd.ځQ }):۪ O\r|uMK@LrϬXK%Qxv~rO7ӦG[D%ٷs "*mm>iJtM XQՋ$ H@D#h5f~%0F6շ<w><&O mlaƎ@m1iڌxvmƞߘ$ H@8! 'a6$J w>BL νfA[{Gtuw=KVĚ=Jx% H@n#mMX@_`<ºhoJ{*u# ] /ƞ%c$ H`7PX&&+M`Zu6GV+XR_
67-c$ H@r7@7I H@$ H@{TE$ H@n
MR$ H@D@a'զe$ H@$(,wt$ H@$'PXIiY$ H@$
$% H@$ I{RmZ H@$ H@@nH$% #PF ` mV"CV-:ڢl"$ H(,[-^qi q!bٓ○{Rss@E:cygcђUq/Dwg{ H@$ $A`zv`5wzo?.tǪˊ9S⭧ suon^G7 IuHXGFwg[ ߌ5vS_V H@$ (,GW@PΝUD։FT#=5>~aFZ7=.~qBr #iq>ㄅ}폮c5 $ H@ (,:m
V Jm@mRWO{BvvTbr+iy1oFp|Fs []K|יsp {ևV~g4]$ 0e WE@3 p-*mD$n*ѸB/{C }AQw,cYg?.8~~
TE{{mԑb; H@$zWXM'DW{{, yqмi'Wo+7 `3 "04P|}O<|}Lj/a@ erRbp<<hڇkZ@_CQ$ H@-As< } _p6N |vm?^<{M^],9bmO͏^ӻ )Ŏй{O/z&~dM`<~xǙ 㶇WĔ-Br36E{?[&* H@%ܖW$ ]${bI͝Rʍ7]WI}'Voco0-'ￕ_ϬO-XD1ըT#f8 V^p~qӊ0o:iXlC\g A W6K@$ L@a9kϼK`T <P<C_"|qۣ
qSZ ̘>3:J;CM+;XgF>0 >{}q OA= OYϟ N
}UeV$ H` (,w% `r 57ڴy _RwЩE';d'q?ɝswH!$7ĕ?{(n^b̒zs߾+>;?5>{+Ni$ H@[/ H` ڶ>V:}RG{Ǹr]o?#1xvMO
Fww6
sƟ\px\rE9fƭ ޓŪDLklqokW˿y㗋E'۟: H@$ QPX % !0^<$VSħ.:*GKxtד ?>:+qo:&NX8-])v8zyg O|KW w,Y!x|Uy^aN|θ u( H@Z²E+bK ߌ89CU"NX8 sup6/]ڢ'HIM}۞,Dlj gE'SigSo㔃1گx% OL~I/+ip
H@Z²+"K8zYkG735i8ɍ[SfqFٴ8ʃ{*Qi:bRg[VcݦQyg%?ܺXeI o=6 yn}|qSswǟ\td?"bw]ԯxxb"sw=jp H@$=
{ H` F 6oz}
@=ci|wqYg _p<rcw'.w?:GW WJ%^A@( sý/#ϯ/@t妘:Gg{9(O/8*V9Z1>uᑱﬡʼq}/)j}ok w?&V-
*! H@$А²!v@G[%|bU\pxzxfx ]'g =9fM5{ Sdqׁ~ GkE_@ح=]CF '뎝 N_~|v1ǖbg uvŪuE5l
' H@Z²jJ ^[ \~Bsܸ*CS;┃qxi`tWE͍E J"v1+UvE_^}o| qsySō}t<q[$ H@;K( T# AZS]O4W~rrW[I V6%;{1ؑ ql (ݯ Y=}+$ H@ c9zVƐs1 f1=;x~uBUZ e'="^!:jv(3KHDɶW*qS~6Z/;}A `F o, ;$ H@' l IDAT =+}J@c@8~ZBDNDBF<. D8{ˮe cE&mm[N/<lV?er=m,D,39wF|}ϯ ]WT<bc3a1g$ HlյV-$d IeGĖ\@5^>q{Wdu~!s]g-, Å{O+^spX; tuD''IϚ Oq86=k{ _+Ϭ{hRđ(^:|n<sɪ
H@C@a @~- 8k\v]Hb⩫ >И
? =>>qqi6ş 2_><&>#⠽ŬE|7ŵw?Wxv"<h.Y!GI)d'>|Ƀѽe4]$ H>e}.^v /n+v5 }u6v#+{?Ss xqsc֔a>'ŲkzXzS,_9x-o<+< ?3jq|6 ϊl鏇[W<]'pxt".Vx5gJ@$ "l궰xe wo:; v 'xVv"{6 - h<怙1kRg;gO\9~؊Woz,u恱fq/D(A}R771X1>wy' 8;?.nz`yxL$ H`djzGD>74wߍI}ʌ>o::h+|
i4Vv8y0O[ ەUOY1H:䩲 SoknukV[㸅CiF& H@v EX>,= BC|e=?,"_l;+&q"L:Sg H@$ m Է H@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X( H@$ H@% -)I@$ H@@]
˺X(=@[&wEZݭ%qS'uFgn $ H)pH%0 tu!ΈV't/?(f^$ !KhG澨ED[88 {zǜivK LT$ 4²t[@WG{;z6ވrlލbٓs) cI@$ q@@a9*,H`w7 ;ڢw-bvADq`KyTҳ#t% H@@S T qzSS1r H` ~*tݽQi&w/w҆{Ϛ 䄸_@
) H@&Ha9+I!a^>~uX kc HI mq>3s[;3* 3 $ H`PXN2$ H@+Eymf|I@$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8' d$ H@$ w
^CO$ H@8'E8ϧٓ$ H@$ I`Һ^ IENDB` | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/flyway/portaldb/V1.1.1__extend_appId.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.
--
# delta schema to upgrade apollo portal db from v1.7.0 to v1.8.0
Use ApolloPortalDB;
alter table `AppNamespace` change AppId AppId varchar(64) NOT NULL DEFAULT 'default' COMMENT 'app id';
| --
-- 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.
--
# delta schema to upgrade apollo portal db from v1.7.0 to v1.8.0
Use ApolloPortalDB;
alter table `AppNamespace` change AppId AppId varchar(64) NOT NULL DEFAULT 'default' COMMENT 'app id';
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/service/AdminService.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.service;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
@Service
public class AdminService {
private final static Logger logger = LoggerFactory.getLogger(AdminService.class);
private final AppService appService;
private final AppNamespaceService appNamespaceService;
private final ClusterService clusterService;
private final NamespaceService namespaceService;
public AdminService(
final AppService appService,
final @Lazy AppNamespaceService appNamespaceService,
final @Lazy ClusterService clusterService,
final @Lazy NamespaceService namespaceService) {
this.appService = appService;
this.appNamespaceService = appNamespaceService;
this.clusterService = clusterService;
this.namespaceService = namespaceService;
}
@Transactional
public App createNewApp(App app) {
String createBy = app.getDataChangeCreatedBy();
App createdApp = appService.save(app);
String appId = createdApp.getAppId();
appNamespaceService.createDefaultAppNamespace(appId, createBy);
clusterService.createDefaultCluster(appId, createBy);
namespaceService.instanceOfAppNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT, createBy);
return app;
}
@Transactional
public void deleteApp(App app, String operator) {
String appId = app.getAppId();
logger.info("{} is deleting App:{}", operator, appId);
List<Cluster> managedClusters = clusterService.findParentClusters(appId);
// 1. delete clusters
if (Objects.nonNull(managedClusters)) {
for (Cluster cluster : managedClusters) {
clusterService.delete(cluster.getId(), operator);
}
}
// 2. delete appNamespace
appNamespaceService.batchDelete(appId, operator);
// 3. delete app
appService.delete(app.getId(), 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.biz.service;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
@Service
public class AdminService {
private final static Logger logger = LoggerFactory.getLogger(AdminService.class);
private final AppService appService;
private final AppNamespaceService appNamespaceService;
private final ClusterService clusterService;
private final NamespaceService namespaceService;
public AdminService(
final AppService appService,
final @Lazy AppNamespaceService appNamespaceService,
final @Lazy ClusterService clusterService,
final @Lazy NamespaceService namespaceService) {
this.appService = appService;
this.appNamespaceService = appNamespaceService;
this.clusterService = clusterService;
this.namespaceService = namespaceService;
}
@Transactional
public App createNewApp(App app) {
String createBy = app.getDataChangeCreatedBy();
App createdApp = appService.save(app);
String appId = createdApp.getAppId();
appNamespaceService.createDefaultAppNamespace(appId, createBy);
clusterService.createDefaultCluster(appId, createBy);
namespaceService.instanceOfAppNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT, createBy);
return app;
}
@Transactional
public void deleteApp(App app, String operator) {
String appId = app.getAppId();
logger.info("{} is deleting App:{}", operator, appId);
List<Cluster> managedClusters = clusterService.findParentClusters(appId);
// 1. delete clusters
if (Objects.nonNull(managedClusters)) {
for (Cluster cluster : managedClusters) {
clusterService.delete(cluster.getId(), operator);
}
}
// 2. delete appNamespace
appNamespaceService.batchDelete(appId, operator);
// 3. delete app
appService.delete(app.getId(), operator);
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/angular/ui-bootstrap-tpls-0.13.0.min.js | /*
* angular-ui-bootstrap
* http://angular-ui.github.io/bootstrap/
* Version: 0.13.0 - 2015-05-02
* License: MIT
*/
angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) {
return {
link: function (b, c, d) {
function e() {
c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f)
}
function f() {
c.removeClass("collapsing"), c.css({height: "auto"})
}
function g() {
c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h)
}
function h() {
c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse")
}
b.$watch(d.collapse, function (a) {
a ? g() : e()
})
}
}
}]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) {
this.groups = [], this.closeOthers = function (d) {
var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers;
e && angular.forEach(this.groups, function (a) {
a !== d && (a.isOpen = !1)
})
}, this.addGroup = function (a) {
var b = this;
this.groups.push(a), a.$on("$destroy", function () {
b.removeGroup(a)
})
}, this.removeGroup = function (a) {
var b = this.groups.indexOf(a);
-1 !== b && this.groups.splice(b, 1)
}
}]).directive("accordion", function () {
return {
restrict: "EA",
controller: "AccordionController",
transclude: !0,
replace: !1,
templateUrl: "template/accordion/accordion.html"
}
}).directive("accordionGroup", function () {
return {
require: "^accordion",
restrict: "EA",
transclude: !0,
replace: !0,
templateUrl: "template/accordion/accordion-group.html",
scope: {heading: "@", isOpen: "=?", isDisabled: "=?"},
controller: function () {
this.setHeading = function (a) {
this.heading = a
}
},
link: function (a, b, c, d) {
d.addGroup(a), a.$watch("isOpen", function (b) {
b && d.closeOthers(a)
}), a.toggleOpen = function () {
a.isDisabled || (a.isOpen = !a.isOpen)
}
}
}
}).directive("accordionHeading", function () {
return {
restrict: "EA",
transclude: !0,
template: "",
replace: !0,
require: "^accordionGroup",
link: function (a, b, c, d, e) {
d.setHeading(e(a, angular.noop))
}
}
}).directive("accordionTransclude", function () {
return {
require: "^accordionGroup", link: function (a, b, c, d) {
a.$watch(function () {
return d[c.accordionTransclude]
}, function (a) {
a && (b.html(""), b.append(a))
})
}
}
}), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) {
a.closeable = "close" in b, this.close = a.close
}]).directive("alert", function () {
return {
restrict: "EA",
controller: "AlertController",
templateUrl: "template/alert/alert.html",
transclude: !0,
replace: !0,
scope: {type: "@", close: "&"}
}
}).directive("dismissOnTimeout", ["$timeout", function (a) {
return {
require: "alert", link: function (b, c, d, e) {
a(function () {
e.close()
}, parseInt(d.dismissOnTimeout, 10))
}
}
}]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () {
return function (a, b, c) {
b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) {
b.html(a || "")
})
}
}), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", {
activeClass: "active",
toggleEvent: "click"
}).controller("ButtonsController", ["buttonConfig", function (a) {
this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click"
}]).directive("btnRadio", function () {
return {
require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) {
var e = d[0], f = d[1];
f.$render = function () {
b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio)))
}, b.bind(e.toggleEvent, function () {
var d = b.hasClass(e.activeClass);
(!d || angular.isDefined(c.uncheckable)) && a.$apply(function () {
f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render()
})
})
}
}
}).directive("btnCheckbox", function () {
return {
require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) {
function e() {
return g(c.btnCheckboxTrue, !0)
}
function f() {
return g(c.btnCheckboxFalse, !1)
}
function g(b, c) {
var d = a.$eval(b);
return angular.isDefined(d) ? d : c
}
var h = d[0], i = d[1];
i.$render = function () {
b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e()))
}, b.bind(h.toggleEvent, function () {
a.$apply(function () {
i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render()
})
})
}
}
}), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) {
function d(a) {
if (angular.isUndefined(k[a].index))return k[a];
{
var b;
k.length
}
for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b]
}
function e() {
f();
var c = +a.interval;
!isNaN(c) && c > 0 && (h = b(g, c))
}
function f() {
h && (b.cancel(h), h = null)
}
function g() {
var b = +a.interval;
i && !isNaN(b) && b > 0 ? a.next() : a.pause()
}
var h, i, j = this, k = j.slides = a.slides = [], l = -1;
j.currentSlide = null;
var m = !1;
j.select = a.select = function (b, d) {
function f() {
m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, {
direction: d,
active: !1
}), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () {
a.$currentTransition = null
})), j.currentSlide = b, l = g, e())
}
var g = j.indexOfSlide(b);
void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f()
}, a.$on("$destroy", function () {
m = !0
}), j.getCurrentIndex = function () {
return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l
}, j.indexOfSlide = function (a) {
return angular.isDefined(a.index) ? +a.index : k.indexOf(a)
}, a.next = function () {
var b = (j.getCurrentIndex() + 1) % k.length;
return a.$currentTransition ? void 0 : j.select(d(b), "next")
}, a.prev = function () {
var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1;
return a.$currentTransition ? void 0 : j.select(d(b), "prev")
}, a.isActive = function (a) {
return j.currentSlide === a
}, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () {
i || (i = !0, e())
}, a.pause = function () {
a.noPause || (i = !1, f())
}, j.addSlide = function (b, c) {
b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1
}, j.removeSlide = function (a) {
angular.isDefined(a.index) && k.sort(function (a, b) {
return +a.index > +b.index
});
var b = k.indexOf(a);
k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l--
}
}]).directive("carousel", [function () {
return {
restrict: "EA",
transclude: !0,
replace: !0,
controller: "CarouselController",
require: "carousel",
templateUrl: "template/carousel/carousel.html",
scope: {interval: "=", noTransition: "=", noPause: "="}
}
}]).directive("slide", function () {
return {
require: "^carousel",
restrict: "EA",
transclude: !0,
replace: !0,
templateUrl: "template/carousel/slide.html",
scope: {active: "=?", index: "=?"},
link: function (a, b, c, d) {
d.addSlide(a, b), a.$on("$destroy", function () {
d.removeSlide(a)
}), a.$watch("active", function (b) {
b && d.select(a)
})
}
}
}).animation(".item", ["$animate", function (a) {
return {
beforeAddClass: function (b, c, d) {
if ("active" == c && b.parent() && !b.parent().scope().noTransition) {
var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right";
return b.addClass(f), a.addClass(b, g).then(function () {
e || b.removeClass(g + " " + f), d()
}), function () {
e = !0
}
}
d()
}, beforeRemoveClass: function (b, c, d) {
if ("active" == c && b.parent() && !b.parent().scope().noTransition) {
var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right";
return a.addClass(b, g).then(function () {
e || b.removeClass(g), d()
}), function () {
e = !0
}
}
d()
}
}
}]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) {
function c(a) {
var c = [], d = a.split("");
return angular.forEach(f, function (b, e) {
var f = a.indexOf(e);
if (f > -1) {
a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$";
for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$";
a = a.join(""), c.push({index: f, apply: b.apply})
}
}), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")}
}
function d(a, b, c) {
return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0
}
var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
this.parsers = {};
var f = {
yyyy: {
regex: "\\d{4}", apply: function (a) {
this.year = +a
}
},
yy: {
regex: "\\d{2}", apply: function (a) {
this.year = +a + 2e3
}
},
y: {
regex: "\\d{1,4}", apply: function (a) {
this.year = +a
}
},
MMMM: {
regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) {
this.month = a.DATETIME_FORMATS.MONTH.indexOf(b)
}
},
MMM: {
regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) {
this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)
}
},
MM: {
regex: "0[1-9]|1[0-2]", apply: function (a) {
this.month = a - 1
}
},
M: {
regex: "[1-9]|1[0-2]", apply: function (a) {
this.month = a - 1
}
},
dd: {
regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) {
this.date = +a
}
},
d: {
regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) {
this.date = +a
}
},
EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")},
EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")},
HH: {
regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) {
this.hours = +a
}
},
H: {
regex: "1?[0-9]|2[0-3]", apply: function (a) {
this.hours = +a
}
},
mm: {
regex: "[0-5][0-9]", apply: function (a) {
this.minutes = +a
}
},
m: {
regex: "[0-9]|[1-5][0-9]", apply: function (a) {
this.minutes = +a
}
},
sss: {
regex: "[0-9][0-9][0-9]", apply: function (a) {
this.milliseconds = +a
}
},
ss: {
regex: "[0-5][0-9]", apply: function (a) {
this.seconds = +a
}
},
s: {
regex: "[0-9]|[1-5][0-9]", apply: function (a) {
this.seconds = +a
}
}
};
this.parse = function (b, f, g) {
if (!angular.isString(b) || !f)return b;
f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f));
var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i);
if (k && k.length) {
var l, m;
l = g ? {
year: g.getFullYear(),
month: g.getMonth(),
date: g.getDate(),
hours: g.getHours(),
minutes: g.getMinutes(),
seconds: g.getSeconds(),
milliseconds: g.getMilliseconds()
} : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0};
for (var n = 1, o = k.length; o > n; n++) {
var p = j[n - 1];
p.apply && p.apply.call(l, k[n])
}
return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m
}
}
}]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) {
function c(a, c) {
return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c]
}
function d(a) {
return "static" === (c(a, "position") || "static")
}
var e = function (b) {
for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent;
return e || c
};
return {
position: function (b) {
var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]);
f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft);
var g = b[0].getBoundingClientRect();
return {
width: g.width || b.prop("offsetWidth"),
height: g.height || b.prop("offsetHeight"),
top: c.top - d.top,
left: c.left - d.left
}
}, offset: function (c) {
var d = c[0].getBoundingClientRect();
return {
width: d.width || c.prop("offsetWidth"),
height: d.height || c.prop("offsetHeight"),
top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop),
left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft)
}
}, positionElements: function (a, b, c, d) {
var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center";
e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight");
var l = {
center: function () {
return e.left + e.width / 2 - f / 2
}, left: function () {
return e.left
}, right: function () {
return e.left + e.width
}
}, m = {
center: function () {
return e.top + e.height / 2 - g / 2
}, top: function () {
return e.top
}, bottom: function () {
return e.top + e.height
}
};
switch (j) {
case"right":
h = {top: m[k](), left: l[j]()};
break;
case"left":
h = {top: m[k](), left: e.left - f};
break;
case"bottom":
h = {top: m[j](), left: l[k]()};
break;
default:
h = {top: e.top - g, left: l[k]()}
}
return h
}
}
}]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", {
formatDay: "dd",
formatMonth: "MMMM",
formatYear: "yyyy",
formatDayHeader: "EEE",
formatDayTitle: "MMMM yyyy",
formatMonthTitle: "yyyy",
datepickerMode: "day",
minMode: "day",
maxMode: "year",
showWeeks: !0,
startingDay: 0,
yearRange: 20,
minDate: null,
maxDate: null,
shortcutPropagation: !1
}).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) {
var i = this, j = {$setViewValue: angular.noop};
this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) {
i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c]
}), angular.forEach(["minDate", "maxDate"], function (d) {
b[d] ? a.$parent.$watch(c(b[d]), function (a) {
i[d] = a ? new Date(a) : null, i.refreshView()
}) : i[d] = h[d] ? new Date(h[d]) : null
}), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) {
a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView())
})) : this.activeDate = new Date, a.isActive = function (b) {
return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1
}, this.init = function (a) {
j = a, j.$render = function () {
i.render()
}
}, this.render = function () {
if (j.$viewValue) {
var a = new Date(j.$viewValue), b = !isNaN(a);
b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b)
}
this.refreshView()
}, this.refreshView = function () {
if (this.element) {
this._refreshView();
var a = j.$viewValue ? new Date(j.$viewValue) : null;
j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a))
}
}, this.createDateObject = function (a, b) {
var c = j.$viewValue ? new Date(j.$viewValue) : null;
return {
date: a,
label: g(a, b),
selected: c && 0 === this.compare(a, c),
disabled: this.isDisabled(a),
current: 0 === this.compare(a, new Date),
customClass: this.customClass(a)
}
}, this.isDisabled = function (c) {
return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({
date: c,
mode: a.datepickerMode
})
}, this.customClass = function (b) {
return a.customClass({date: b, mode: a.datepickerMode})
}, this.split = function (a, b) {
for (var c = []; a.length > 0;)c.push(a.splice(0, b));
return c
}, a.select = function (b) {
if (a.datepickerMode === i.minMode) {
var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0);
c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render()
} else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1]
}, a.move = function (a) {
var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0);
i.activeDate.setFullYear(b, c, 1), i.refreshView()
}, a.toggleMode = function (b) {
b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b])
}, a.keys = {
13: "enter",
32: "space",
33: "pageup",
34: "pagedown",
35: "end",
36: "home",
37: "left",
38: "up",
39: "right",
40: "down"
};
var k = function () {
e(function () {
i.element[0].focus()
}, 0, !1)
};
a.$on("datepicker.focus", k), a.keydown = function (b) {
var c = a.keys[b.which];
if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) {
if (i.isDisabled(i.activeDate))return;
a.select(i.activeDate), k()
} else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k())
}
}]).directive("datepicker", function () {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/datepicker.html",
scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"},
require: ["datepicker", "?^ngModel"],
controller: "DatepickerController",
link: function (a, b, c, d) {
var e = d[0], f = d[1];
f && e.init(f)
}
}
}).directive("daypicker", ["dateFilter", function (a) {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/day.html",
require: "^datepicker",
link: function (b, c, d, e) {
function f(a, b) {
return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29
}
function g(a, b) {
var c = new Array(b), d = new Date(a), e = 0;
for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1);
return c
}
function h(a) {
var b = new Date(a);
b.setDate(b.getDate() + 4 - (b.getDay() || 7));
var c = b.getTime();
return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1
}
b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c;
var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
e._refreshView = function () {
var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f);
j > 0 && k.setDate(-j + 1);
for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), {
secondary: l[m].getMonth() !== d,
uid: b.uniqueId + "-" + m
});
b.labels = new Array(7);
for (var n = 0; 7 > n; n++)b.labels[n] = {
abbr: a(l[n].date, e.formatDayHeader),
full: a(l[n].date, "EEEE")
};
if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) {
b.weekNumbers = [];
for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date))
}
}, e.compare = function (a, b) {
return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate())
}, e.handleKeyDown = function (a) {
var b = e.activeDate.getDate();
if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) {
var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1);
e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b)
} else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth()));
e.activeDate.setDate(b)
}, e.refreshView()
}
}
}]).directive("monthpicker", ["dateFilter", function (a) {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/month.html",
require: "^datepicker",
link: function (b, c, d, e) {
e.step = {years: 1}, e.element = c, e._refreshView = function () {
for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f});
b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3)
}, e.compare = function (a, b) {
return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth())
}, e.handleKeyDown = function (a) {
var b = e.activeDate.getMonth();
if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) {
var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1);
e.activeDate.setFullYear(c)
} else"home" === a ? b = 0 : "end" === a && (b = 11);
e.activeDate.setMonth(b)
}, e.refreshView()
}
}
}]).directive("yearpicker", ["dateFilter", function () {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/year.html",
require: "^datepicker",
link: function (a, b, c, d) {
function e(a) {
return parseInt((a - 1) / f, 10) * f + 1
}
var f = d.yearRange;
d.step = {years: f}, d.element = b, d._refreshView = function () {
for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c});
a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5)
}, d.compare = function (a, b) {
return a.getFullYear() - b.getFullYear()
}, d.handleKeyDown = function (a) {
var b = d.activeDate.getFullYear();
"left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b)
}, d.refreshView()
}
}
}]).constant("datepickerPopupConfig", {
datepickerPopup: "yyyy-MM-dd",
html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"},
currentText: "Today",
clearText: "Clear",
closeText: "Done",
closeOnDateSelection: !0,
appendToBody: !1,
showButtonBar: !0
}).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) {
return {
restrict: "EA",
require: "ngModel",
scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"},
link: function (h, i, j, k) {
function l(a) {
return a.replace(/([A-Z])/g, function (a) {
return "-" + a.toLowerCase()
})
}
function m(a) {
if (angular.isNumber(a) && (a = new Date(a)), a) {
if (angular.isDate(a) && !isNaN(a))return a;
if (angular.isString(a)) {
var b = f.parse(a, o, h.date) || new Date(a);
return isNaN(b) ? void 0 : b
}
return void 0
}
return null
}
function n(a, b) {
var c = a || b;
if (angular.isNumber(c) && (c = new Date(c)), c) {
if (angular.isDate(c) && !isNaN(c))return !0;
if (angular.isString(c)) {
var d = f.parse(c, o) || new Date(c);
return !isNaN(d)
}
return !1
}
return !0
}
var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody;
h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) {
return h[a + "Text"] || g[a + "Text"]
};
var r = !1;
if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) {
var b = a || g.datepickerPopup;
if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.")
})), !o)throw new Error("datepickerPopup must have a date format specified.");
if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");
var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");
s.attr({"ng-model": "date", "ng-change": "dateSelection()"});
var t = angular.element(s.children()[0]);
if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) {
var u = h.$parent.$eval(j.datepickerOptions);
u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) {
t.attr(l(b), a)
})
}
h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) {
if (j[a]) {
var c = b(j[a]);
if (h.$parent.$watch(c, function (b) {
h.watchData[a] = b
}), t.attr(l(a), "watchData." + a), "datepickerMode" === a) {
var d = c.assign;
h.$watch("watchData." + a, function (a, b) {
a !== b && d(h.$parent, a)
})
}
}
}), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) {
return h.date = a, a
}) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) {
return h.date = a, k.$isEmpty(a) ? a : e(a, o)
})), h.dateSelection = function (a) {
angular.isDefined(a) && (h.date = a);
var b = h.date ? e(h.date, o) : "";
i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus())
}, k.$viewChangeListeners.push(function () {
h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue)
});
var v = function (a) {
h.isOpen && a.target !== i[0] && h.$apply(function () {
h.isOpen = !1
})
}, w = function (a) {
h.keydown(a)
};
i.bind("keydown", w), h.keydown = function (a) {
27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0)
}, h.$watch("isOpen", function (a) {
a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v)
}), h.select = function (a) {
if ("today" === a) {
var b = new Date;
angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0))
}
h.dateSelection(a)
}, h.close = function () {
h.isOpen = !1, i[0].focus()
};
var x = a(s)(h);
s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () {
x.remove(), i.unbind("keydown", w), c.unbind("click", v)
})
}
}
}]).directive("datepickerPopupWrap", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
templateUrl: "template/datepicker/popup.html",
link: function (a, b) {
b.bind("click", function (a) {
a.preventDefault(), a.stopPropagation()
})
}
}
}), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) {
var c = null;
this.open = function (b) {
c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b
}, this.close = function (b) {
c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e))
};
var d = function (a) {
if (c && (!a || "disabled" !== c.getAutoClose())) {
var d = c.getToggleElement();
if (!(a && d && d[0].contains(a.target))) {
var e = c.getElement();
a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply())
}
}
}, e = function (a) {
27 === a.which && (c.focusToggleElement(), d())
}
}]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) {
var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1;
this.init = function (d) {
j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) {
k.isOpen = !!a
})), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () {
j.dropdownMenu.remove()
}))
}, this.toggle = function (a) {
return k.isOpen = arguments.length ? !!a : !k.isOpen
}, this.isOpen = function () {
return k.isOpen
}, k.getToggleElement = function () {
return j.toggleElement
}, k.getAutoClose = function () {
return b.autoClose || "always"
}, k.getElement = function () {
return j.$element
}, k.focusToggleElement = function () {
j.toggleElement && j.toggleElement[0].focus()
}, k.$watch("isOpen", function (b, c) {
if (o && j.dropdownMenu) {
var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0);
j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"})
}
f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b})
}), a.$on("$locationChangeSuccess", function () {
k.isOpen = !1
}), a.$on("$destroy", function () {
k.$destroy()
})
}]).directive("dropdown", function () {
return {
controller: "DropdownController", link: function (a, b, c, d) {
d.init(b)
}
}
}).directive("dropdownMenu", function () {
return {
restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) {
d && (d.dropdownMenu = b)
}
}
}).directive("dropdownToggle", function () {
return {
require: "?^dropdown", link: function (a, b, c, d) {
if (d) {
d.toggleElement = b;
var e = function (e) {
e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () {
d.toggle()
})
};
b.bind("click", e), b.attr({
"aria-haspopup": !0,
"aria-expanded": !1
}), a.$watch(d.isOpen, function (a) {
b.attr("aria-expanded", !!a)
}), a.$on("$destroy", function () {
b.unbind("click", e)
})
}
}
}
}), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () {
return {
createNew: function () {
var a = [];
return {
add: function (b, c) {
a.push({key: b, value: c})
}, get: function (b) {
for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c]
}, keys: function () {
for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key);
return b
}, top: function () {
return a[a.length - 1]
}, remove: function (b) {
for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) {
c = d;
break
}
return a.splice(c, 1)[0]
}, removeTop: function () {
return a.splice(a.length - 1, 1)[0]
}, length: function () {
return a.length
}
}
}
}
}).directive("modalBackdrop", ["$timeout", function (a) {
function b(b) {
b.animate = !1, a(function () {
b.animate = !0
})
}
return {
restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) {
return a.addClass(c.backdropClass), b
}
}
}]).directive("modalWindow", ["$modalStack", "$q", function (a, b) {
return {
restrict: "EA",
scope: {index: "@", animate: "="},
replace: !0,
transclude: !0,
templateUrl: function (a, b) {
return b.templateUrl || "template/modal/window.html"
},
link: function (c, d, e) {
d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) {
var c = a.getTop();
c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click"))
}, c.$isRendered = !0;
var f = b.defer();
e.$observe("modalRender", function (a) {
"true" == a && f.resolve()
}), f.promise.then(function () {
c.animate = !0;
var b = d[0].querySelectorAll("[autofocus]");
b.length ? b[0].focus() : d[0].focus();
var e = a.getTop();
e && a.modalRendered(e.key)
})
}
}
}]).directive("modalAnimationClass", [function () {
return {
compile: function (a, b) {
b.modalAnimation && a.addClass(b.modalAnimationClass)
}
}
}]).directive("modalTransclude", function () {
return {
link: function (a, b, c, d, e) {
e(a.$parent, function (a) {
b.empty(), b.append(a)
})
}
}
}).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) {
function g() {
for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c);
return a
}
function h(a) {
var b = c.find("body").eq(0), d = o.get(a).value;
o.remove(a), j(d.modalDomEl, d.modalScope, function () {
b.toggleClass(n, o.length() > 0), i()
})
}
function i() {
if (l && -1 == g()) {
var a = m;
j(l, m, function () {
a = null
}), l = void 0, m = void 0
}
}
function j(c, d, f) {
function g() {
g.done || (g.done = !0, c.remove(), d.$destroy(), f && f())
}
d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () {
e.$evalAsync(g)
}) : b(g)
}
function k(a, b, c) {
return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented
}
var l, m, n = "modal-open", o = f.createNew(), p = {};
return e.$watch(g, function (a) {
m && (m.index = a)
}), c.bind("keydown", function (a) {
var b;
27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () {
p.dismiss(b.key, "escape key press")
})))
}), p.open = function (a, b) {
var f = c[0].activeElement;
o.add(a, {
deferred: b.deferred,
renderDeferred: b.renderDeferred,
modalScope: b.scope,
backdrop: b.backdrop,
keyboard: b.keyboard
});
var h = c.find("body").eq(0), i = g();
if (i >= 0 && !l) {
m = e.$new(!0), m.index = i;
var j = angular.element('<div modal-backdrop="modal-backdrop"></div>');
j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l)
}
var k = angular.element('<div modal-window="modal-window"></div>');
k.attr({
"template-url": b.windowTemplateUrl,
"window-class": b.windowClass,
size: b.size,
index: o.length() - 1,
animate: "animate"
}).html(b.content), b.animation && k.attr("modal-animation", "true");
var p = d(k)(b.scope);
o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n)
}, p.close = function (a, b) {
var c = o.get(a);
return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c
}, p.dismiss = function (a, b) {
var c = o.get(a);
return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c
}, p.dismissAll = function (a) {
for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop()
}, p.getTop = function () {
return o.top()
}, p.modalRendered = function (a) {
var b = o.get(a);
b && b.value.renderDeferred.resolve()
}, p
}]).provider("$modal", function () {
var a = {
options: {animation: !0, backdrop: !0, keyboard: !0},
$get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) {
function h(a) {
return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl)
}
function i(a) {
var c = [];
return angular.forEach(a, function (a) {
(angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a)))
}), c
}
var j = {};
return j.open = function (b) {
var e = d.defer(), j = d.defer(), k = d.defer(), l = {
result: e.promise,
opened: j.promise,
rendered: k.promise,
close: function (a) {
return g.close(l, a)
},
dismiss: function (a) {
return g.dismiss(l, a)
}
};
if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required.");
var m = d.all([h(b)].concat(i(b.resolve)));
return m.then(function (a) {
var d = (b.scope || c).$new();
d.$close = l.close, d.$dismiss = l.dismiss;
var h, i = {}, j = 1;
b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) {
i[c] = a[j++]
}), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, {
scope: d,
deferred: e,
renderDeferred: k,
content: a[0],
animation: b.animation,
backdrop: b.backdrop,
keyboard: b.keyboard,
backdropClass: b.backdropClass,
windowClass: b.windowClass,
windowTemplateUrl: b.windowTemplateUrl,
size: b.size
})
}, function (a) {
e.reject(a)
}), m.then(function () {
j.resolve(!0)
}, function (a) {
j.reject(a)
}), l
}, j
}]
};
return a
}), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) {
var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop;
this.init = function (g, h) {
e = g, this.config = h, e.$render = function () {
d.render()
}, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) {
d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages()
}) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () {
a.totalPages = d.calculateTotalPages()
}), a.$watch("totalPages", function (b) {
f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render()
})
}, this.calculateTotalPages = function () {
var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage);
return Math.max(b || 0, 1)
}, this.render = function () {
a.page = parseInt(e.$viewValue, 10) || 1
}, a.selectPage = function (b, c) {
a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render())
}, a.getText = function (b) {
return a[b + "Text"] || d.config[b + "Text"]
}, a.noPrevious = function () {
return 1 === a.page
}, a.noNext = function () {
return a.page === a.totalPages
}
}]).constant("paginationConfig", {
itemsPerPage: 10,
boundaryLinks: !1,
directionLinks: !0,
firstText: "First",
previousText: "Previous",
nextText: "Next",
lastText: "Last",
rotate: !0
}).directive("pagination", ["$parse", "paginationConfig", function (a, b) {
return {
restrict: "EA",
scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"},
require: ["pagination", "?ngModel"],
controller: "PaginationController",
templateUrl: "template/pagination/pagination.html",
replace: !0,
link: function (c, d, e, f) {
function g(a, b, c) {
return {number: a, text: b, active: c}
}
function h(a, b) {
var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k;
f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b)));
for (var h = d; e >= h; h++) {
var i = g(h, h, h === a);
c.push(i)
}
if (f && !l) {
if (d > 1) {
var j = g(d - 1, "...", !1);
c.unshift(j)
}
if (b > e) {
var m = g(e + 1, "...", !1);
c.push(m)
}
}
return c
}
var i = f[0], j = f[1];
if (j) {
var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate;
c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) {
k = parseInt(a, 10), i.render()
});
var m = i.render;
i.render = function () {
m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages))
}
}
}
}
}]).constant("pagerConfig", {
itemsPerPage: 10,
previousText: "« Previous",
nextText: "Next »",
align: !0
}).directive("pager", ["pagerConfig", function (a) {
return {
restrict: "EA",
scope: {totalItems: "=", previousText: "@", nextText: "@"},
require: ["pager", "?ngModel"],
controller: "PaginationController",
templateUrl: "template/pagination/pager.html",
replace: !0,
link: function (b, c, d, e) {
var f = e[0], g = e[1];
g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a))
}
}
}]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () {
function a(a) {
var b = /[A-Z]/g, c = "-";
return a.replace(b, function (a, b) {
return (b ? c : "") + a.toLowerCase()
})
}
var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = {
mouseenter: "mouseleave",
click: "click",
focus: "blur"
}, d = {};
this.options = function (a) {
angular.extend(d, a)
}, this.setTriggers = function (a) {
angular.extend(c, a)
}, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) {
return function (e, k, l, m) {
function n(a) {
var b = a || m.trigger || l, d = c[b] || b;
return {show: b, hide: d}
}
m = angular.extend({}, b, d, m);
var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>';
return {
restrict: "EA", compile: function () {
var a = f(r);
return function (b, c, d) {
function f() {
E.isOpen ? l() : j()
}
function j() {
(!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) {
a()
})) : o()())
}
function l() {
b.$apply(function () {
p()
})
}
function o() {
return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({
top: 0,
left: 0,
display: "block"
}), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop
}
function p() {
E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r()
}
function q() {
x && r(), y = E.$new(), x = a(y, function (a) {
B ? h.find("body").append(a) : c.after(a)
}), y.$watch(function () {
g(F, 0, !1)
}), m.useContentExp && y.$watch("contentExp()", function (a) {
!a && E.isOpen && p()
})
}
function r() {
z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null)
}
function s() {
t(), u(), v()
}
function t() {
E.popupClass = d[k + "Class"]
}
function u() {
var a = d[k + "Placement"];
E.placement = angular.isDefined(a) ? a : m.placement
}
function v() {
var a = d[k + "PopupDelay"], b = parseInt(a, 10);
E.popupDelay = isNaN(b) ? m.popupDelay : b
}
function w() {
var a = d[k + "Trigger"];
G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l))
}
var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () {
if (x) {
var a = i.positionElements(c, x, E.placement, B);
a.top += "px", a.left += "px", x.css(a)
}
};
E.origScope = b, E.isOpen = !1, E.contentExp = function () {
return b.$eval(d[e])
}, m.useContentExp || d.$observe(e, function (a) {
E.content = a, !a && E.isOpen && p()
}), d.$observe("disabled", function (a) {
a && E.isOpen && p()
}), d.$observe(k + "Title", function (a) {
E.title = a
});
var G = function () {
c.unbind(C.show, j), c.unbind(C.hide, l)
};
w();
var H = b.$eval(d[k + "Animation"]);
E.animation = angular.isDefined(H) ? !!H : m.animation;
var I = b.$eval(d[k + "AppendToBody"]);
B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () {
E.isOpen && p()
}), b.$on("$destroy", function () {
g.cancel(z), g.cancel(A), G(), r(), E = null
})
}
}
}
}
}]
}).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) {
return {
link: function (e, f, g) {
var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () {
i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () {
i = null
}), i = j, j = null)
};
e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) {
var g = ++l;
b ? (d(b, !0).then(function (d) {
if (g === l) {
var e = k.$new(), i = d, n = c(i)(e, function (b) {
m(), a.enter(b, f)
});
h = e, j = n, h.$emit("$includeContentLoaded", b)
}
}, function () {
g === l && (m(), e.$emit("$includeContentError", b))
}), e.$emit("$includeContentRequested", b)) : m()
}), e.$on("$destroy", m)
}
}
}]).directive("tooltipClasses", function () {
return {
restrict: "A", link: function (a, b, c) {
a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass)
}
}
}).directive("tooltipPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-popup.html"
}
}).directive("tooltip", ["$tooltip", function (a) {
return a("tooltip", "tooltip", "mouseenter")
}]).directive("tooltipTemplatePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"},
templateUrl: "template/tooltip/tooltip-template-popup.html"
}
}).directive("tooltipTemplate", ["$tooltip", function (a) {
return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0})
}]).directive("tooltipHtmlPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-html-popup.html"
}
}).directive("tooltipHtml", ["$tooltip", function (a) {
return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0})
}]).directive("tooltipHtmlUnsafePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html"
}
}).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) {
return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter")
}]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {
title: "@",
contentExp: "&",
placement: "@",
popupClass: "@",
animation: "&",
isOpen: "&",
originScope: "&"
},
templateUrl: "template/popover/popover-template.html"
}
}).directive("popoverTemplate", ["$tooltip", function (a) {
return a("popoverTemplate", "popover", "click", {useContentExp: !0})
}]).directive("popoverPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/popover/popover.html"
}
}).directive("popover", ["$tooltip", function (a) {
return a("popover", "popover", "click")
}]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", {
animate: !0,
max: 100
}).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) {
var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate;
this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) {
e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) {
b.percent = +(100 * c / a.max).toFixed(2)
}), b.$on("$destroy", function () {
c = null, d.removeBar(b)
})
}, this.removeBar = function (a) {
this.bars.splice(this.bars.indexOf(a), 1)
}
}]).directive("progress", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
controller: "ProgressController",
require: "progress",
scope: {},
templateUrl: "template/progressbar/progress.html"
}
}).directive("bar", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
require: "^progress",
scope: {value: "=", max: "=?", type: "@"},
templateUrl: "template/progressbar/bar.html",
link: function (a, b, c, d) {
d.addBar(a, b)
}
}
}).directive("progressbar", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
controller: "ProgressController",
scope: {value: "=", max: "=?", type: "@"},
templateUrl: "template/progressbar/progressbar.html",
link: function (a, b, c, d) {
d.addBar(a, angular.element(b.children()[0]))
}
}
}), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", {
max: 5,
stateOn: null,
stateOff: null
}).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) {
var d = {$setViewValue: angular.noop};
this.init = function (e) {
d = e, d.$render = this.render, d.$formatters.push(function (a) {
return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a
}), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff;
var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max);
a.range = this.buildTemplateObjects(f)
}, this.buildTemplateObjects = function (a) {
for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, {
stateOn: this.stateOn,
stateOff: this.stateOff
}, a[b]);
return a
}, a.rate = function (b) {
!a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render())
}, a.enter = function (b) {
a.readonly || (a.value = b), a.onHover({value: b})
}, a.reset = function () {
a.value = d.$viewValue, a.onLeave()
}, a.onKeydown = function (b) {
/(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1)))
}, this.render = function () {
a.value = d.$viewValue
}
}]).directive("rating", function () {
return {
restrict: "EA",
require: ["rating", "ngModel"],
scope: {readonly: "=?", onHover: "&", onLeave: "&"},
controller: "RatingController",
templateUrl: "template/rating/rating.html",
replace: !0,
link: function (a, b, c, d) {
var e = d[0], f = d[1];
e.init(f)
}
}
}), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) {
var b = this, c = b.tabs = a.tabs = [];
b.select = function (a) {
angular.forEach(c, function (b) {
b.active && b !== a && (b.active = !1, b.onDeselect())
}), a.active = !0, a.onSelect()
}, b.addTab = function (a) {
c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1
}, b.removeTab = function (a) {
var e = c.indexOf(a);
if (a.active && c.length > 1 && !d) {
var f = e == c.length - 1 ? e - 1 : e + 1;
b.select(c[f])
}
c.splice(e, 1)
};
var d;
a.$on("$destroy", function () {
d = !0
})
}]).directive("tabset", function () {
return {
restrict: "EA",
transclude: !0,
replace: !0,
scope: {type: "@"},
controller: "TabsetController",
templateUrl: "template/tabs/tabset.html",
link: function (a, b, c) {
a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1
}
}
}).directive("tab", ["$parse", "$log", function (a, b) {
return {
require: "^tabset",
restrict: "EA",
replace: !0,
templateUrl: "template/tabs/tab.html",
transclude: !0,
scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"},
controller: function () {
},
compile: function (c, d, e) {
return function (c, d, f, g) {
c.$watch("active", function (a) {
a && g.select(c)
}), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) {
c.disabled = !!a
}), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) {
c.disabled = !!a
})), c.select = function () {
c.disabled || (c.active = !0)
}, g.addTab(c), c.$on("$destroy", function () {
g.removeTab(c)
}), c.$transcludeFn = e
}
}
}
}]).directive("tabHeadingTransclude", [function () {
return {
restrict: "A", require: "^tab", link: function (a, b) {
a.$watch("headingElement", function (a) {
a && (b.html(""), b.append(a))
})
}
}
}]).directive("tabContentTransclude", function () {
function a(a) {
return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase())
}
return {
restrict: "A", require: "^tabset", link: function (b, c, d) {
var e = b.$eval(d.tabContentTransclude);
e.$transcludeFn(e.$parent, function (b) {
angular.forEach(b, function (b) {
a(b) ? e.headingElement = b : c.append(b)
})
})
}
}
}), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", {
hourStep: 1,
minuteStep: 1,
showMeridian: !0,
meridians: null,
readonlyInput: !1,
mousewheel: !0,
arrowkeys: !0
}).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) {
function g() {
var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b;
return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0
}
function h() {
var b = parseInt(a.minutes, 10);
return b >= 0 && 60 > b ? b : void 0
}
function i(a) {
return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString()
}
function j(a) {
k(), o.$setViewValue(new Date(n)), l(a)
}
function k() {
o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1
}
function l(b) {
var c = n.getHours(), d = n.getMinutes();
a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1]
}
function m(a) {
var b = new Date(n.getTime() + 6e4 * a);
n.setHours(b.getHours(), b.getMinutes()), j()
}
var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS;
this.init = function (c, d) {
o = c, o.$render = this.render, o.$formatters.unshift(function (a) {
return a ? new Date(a) : null
});
var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel;
h && this.setupMousewheelEvents(e, g);
var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys;
i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g)
};
var q = f.hourStep;
b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) {
q = parseInt(a, 10)
});
var r = f.minuteStep;
b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) {
r = parseInt(a, 10)
}), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) {
if (a.showMeridian = !!b, o.$error.time) {
var c = g(), d = h();
angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j())
} else l()
}), this.setupMousewheelEvents = function (b, c) {
var d = function (a) {
a.originalEvent && (a = a.originalEvent);
var b = a.wheelDelta ? a.wheelDelta : -a.deltaY;
return a.detail || b > 0
};
b.bind("mousewheel wheel", function (b) {
a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault()
}), c.bind("mousewheel wheel", function (b) {
a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault()
})
}, this.setupArrowkeyEvents = function (b, c) {
b.bind("keydown", function (b) {
38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply())
}), c.bind("keydown", function (b) {
38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply())
})
}, this.setupInputEvents = function (b, c) {
if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop);
var d = function (b, c) {
o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c)
};
a.updateHours = function () {
var a = g();
angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0)
}, b.bind("blur", function () {
!a.invalidHours && a.hours < 10 && a.$apply(function () {
a.hours = i(a.hours)
})
}), a.updateMinutes = function () {
var a = h();
angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0)
}, c.bind("blur", function () {
!a.invalidMinutes && a.minutes < 10 && a.$apply(function () {
a.minutes = i(a.minutes)
})
})
}, this.render = function () {
var a = o.$viewValue;
isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l())
}, a.incrementHours = function () {
m(60 * q)
}, a.decrementHours = function () {
m(60 * -q)
}, a.incrementMinutes = function () {
m(r)
}, a.decrementMinutes = function () {
m(-r)
}, a.toggleMeridian = function () {
m(720 * (n.getHours() < 12 ? 1 : -1))
}
}]).directive("timepicker", function () {
return {
restrict: "EA",
require: ["timepicker", "?^ngModel"],
controller: "TimepickerController",
replace: !0,
scope: {},
templateUrl: "template/timepicker/timepicker.html",
link: function (a, b, c, d) {
var e = d[0], f = d[1];
f && e.init(f, b.find("input"))
}
}
}), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) {
function f(a) {
for (var b in a)if (void 0 !== h.style[b])return a[b]
}
e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead.");
var g = function (d, e, f) {
f = f || {};
var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () {
c.$apply(function () {
d.unbind(i, j), h.resolve(d)
})
};
return i && d.bind(i, j), b(function () {
angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d)
}), h.promise.cancel = function () {
i && d.unbind(i, j), h.reject("Transition cancelled")
}, h.promise
}, h = document.createElement("trans"), i = {
WebkitTransition: "webkitTransitionEnd",
MozTransition: "transitionend",
OTransition: "oTransitionEnd",
transition: "transitionend"
}, j = {
WebkitTransition: "webkitAnimationEnd",
MozTransition: "animationend",
OTransition: "oAnimationEnd",
transition: "animationend"
};
return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g
}]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) {
var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
return {
parse: function (c) {
var d = c.match(b);
if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".');
return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])}
}
}
}]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) {
var h = [9, 13, 27, 38, 40];
return {
require: "ngModel", link: function (i, j, k, l) {
var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new();
i.$on("$destroy", function () {
x.$destroy()
});
var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random());
j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y});
var z = angular.element("<div typeahead-popup></div>");
z.attr({
id: y,
matches: "matches",
active: "activeIdx",
select: "select(activeIdx)",
query: "query",
position: "position"
}), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl);
var A = function () {
x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1)
}, B = function (a) {
return y + "-option-" + a
};
x.$watch("activeIdx", function (a) {
0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a))
});
var C = function (a) {
var b = {$viewValue: a};
q(i, !0), c.when(w.source(i, b)).then(function (c) {
var d = a === l.$viewValue;
if (d && m)if (c && c.length > 0) {
x.activeIdx = u ? 0 : -1, x.matches.length = 0;
for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({
id: B(e),
label: w.viewMapper(x, b),
model: c[e]
});
x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0)
} else A();
d && q(i, !1)
}, function () {
A(), q(i, !1)
})
};
A(), x.query = void 0;
var D, E = function (a) {
D = d(function () {
C(a)
}, o)
}, F = function () {
D && d.cancel(D)
};
l.$parsers.unshift(function (a) {
return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a)
}), l.$formatters.push(function (a) {
var b, c, d = {};
return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a)
}), x.select = function (a) {
var b, c, e = {};
e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, {
$item: c,
$model: b,
$label: w.viewMapper(i, e)
}), A(), d(function () {
j[0].focus()
}, 0, !1)
}, j.bind("keydown", function (a) {
0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () {
x.select(x.activeIdx)
}) : 27 === a.which && (a.stopPropagation(), A(), x.$digest()))
}), j.bind("blur", function () {
m = !1
});
var G = function (a) {
j[0] !== a.target && (A(), x.$digest())
};
e.bind("click", G), i.$on("$destroy", function () {
e.unbind("click", G), t && H.remove(), z.remove()
});
var H = a(z)(x);
t ? e.find("body").append(H) : j.after(H)
}
}
}]).directive("typeaheadPopup", function () {
return {
restrict: "EA",
scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"},
replace: !0,
templateUrl: "template/typeahead/typeahead-popup.html",
link: function (a, b, c) {
a.templateUrl = c.templateUrl, a.isOpen = function () {
return a.matches.length > 0
}, a.isActive = function (b) {
return a.active == b
}, a.selectActive = function (b) {
a.active = b
}, a.selectMatch = function (b) {
a.select({activeIdx: b})
}
}
}
}).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) {
return {
restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) {
var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html";
a(g).then(function (a) {
b(a.trim())(d, function (a) {
e.replaceWith(a)
})
})
}
}
}]).filter("typeaheadHighlight", function () {
function a(a) {
return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1")
}
return function (b, c) {
return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b
}
}), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) {
a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n')
}]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) {
a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>')
}]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) {
a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">×</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n')
}]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) {
a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')
}]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) {
a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n')
}]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')
}]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n')
}]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) {
a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')
}]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) {
a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n')
}]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) {
a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>')
}]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) {
a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>')
}]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n')
}]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n')
}]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n')
}]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n')
}]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n')
}]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>')
}]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n')
}]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) {
a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>')
}]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) {
a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')
}]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) {
a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n')
}]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) {
a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td> </td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td> </td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) {
a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')
}]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) {
a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n')
}]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
| /*
* angular-ui-bootstrap
* http://angular-ui.github.io/bootstrap/
* Version: 0.13.0 - 2015-05-02
* License: MIT
*/
angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) {
return {
link: function (b, c, d) {
function e() {
c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f)
}
function f() {
c.removeClass("collapsing"), c.css({height: "auto"})
}
function g() {
c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h)
}
function h() {
c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse")
}
b.$watch(d.collapse, function (a) {
a ? g() : e()
})
}
}
}]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) {
this.groups = [], this.closeOthers = function (d) {
var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers;
e && angular.forEach(this.groups, function (a) {
a !== d && (a.isOpen = !1)
})
}, this.addGroup = function (a) {
var b = this;
this.groups.push(a), a.$on("$destroy", function () {
b.removeGroup(a)
})
}, this.removeGroup = function (a) {
var b = this.groups.indexOf(a);
-1 !== b && this.groups.splice(b, 1)
}
}]).directive("accordion", function () {
return {
restrict: "EA",
controller: "AccordionController",
transclude: !0,
replace: !1,
templateUrl: "template/accordion/accordion.html"
}
}).directive("accordionGroup", function () {
return {
require: "^accordion",
restrict: "EA",
transclude: !0,
replace: !0,
templateUrl: "template/accordion/accordion-group.html",
scope: {heading: "@", isOpen: "=?", isDisabled: "=?"},
controller: function () {
this.setHeading = function (a) {
this.heading = a
}
},
link: function (a, b, c, d) {
d.addGroup(a), a.$watch("isOpen", function (b) {
b && d.closeOthers(a)
}), a.toggleOpen = function () {
a.isDisabled || (a.isOpen = !a.isOpen)
}
}
}
}).directive("accordionHeading", function () {
return {
restrict: "EA",
transclude: !0,
template: "",
replace: !0,
require: "^accordionGroup",
link: function (a, b, c, d, e) {
d.setHeading(e(a, angular.noop))
}
}
}).directive("accordionTransclude", function () {
return {
require: "^accordionGroup", link: function (a, b, c, d) {
a.$watch(function () {
return d[c.accordionTransclude]
}, function (a) {
a && (b.html(""), b.append(a))
})
}
}
}), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) {
a.closeable = "close" in b, this.close = a.close
}]).directive("alert", function () {
return {
restrict: "EA",
controller: "AlertController",
templateUrl: "template/alert/alert.html",
transclude: !0,
replace: !0,
scope: {type: "@", close: "&"}
}
}).directive("dismissOnTimeout", ["$timeout", function (a) {
return {
require: "alert", link: function (b, c, d, e) {
a(function () {
e.close()
}, parseInt(d.dismissOnTimeout, 10))
}
}
}]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () {
return function (a, b, c) {
b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) {
b.html(a || "")
})
}
}), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", {
activeClass: "active",
toggleEvent: "click"
}).controller("ButtonsController", ["buttonConfig", function (a) {
this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click"
}]).directive("btnRadio", function () {
return {
require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) {
var e = d[0], f = d[1];
f.$render = function () {
b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio)))
}, b.bind(e.toggleEvent, function () {
var d = b.hasClass(e.activeClass);
(!d || angular.isDefined(c.uncheckable)) && a.$apply(function () {
f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render()
})
})
}
}
}).directive("btnCheckbox", function () {
return {
require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) {
function e() {
return g(c.btnCheckboxTrue, !0)
}
function f() {
return g(c.btnCheckboxFalse, !1)
}
function g(b, c) {
var d = a.$eval(b);
return angular.isDefined(d) ? d : c
}
var h = d[0], i = d[1];
i.$render = function () {
b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e()))
}, b.bind(h.toggleEvent, function () {
a.$apply(function () {
i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render()
})
})
}
}
}), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) {
function d(a) {
if (angular.isUndefined(k[a].index))return k[a];
{
var b;
k.length
}
for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b]
}
function e() {
f();
var c = +a.interval;
!isNaN(c) && c > 0 && (h = b(g, c))
}
function f() {
h && (b.cancel(h), h = null)
}
function g() {
var b = +a.interval;
i && !isNaN(b) && b > 0 ? a.next() : a.pause()
}
var h, i, j = this, k = j.slides = a.slides = [], l = -1;
j.currentSlide = null;
var m = !1;
j.select = a.select = function (b, d) {
function f() {
m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, {
direction: d,
active: !1
}), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () {
a.$currentTransition = null
})), j.currentSlide = b, l = g, e())
}
var g = j.indexOfSlide(b);
void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f()
}, a.$on("$destroy", function () {
m = !0
}), j.getCurrentIndex = function () {
return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l
}, j.indexOfSlide = function (a) {
return angular.isDefined(a.index) ? +a.index : k.indexOf(a)
}, a.next = function () {
var b = (j.getCurrentIndex() + 1) % k.length;
return a.$currentTransition ? void 0 : j.select(d(b), "next")
}, a.prev = function () {
var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1;
return a.$currentTransition ? void 0 : j.select(d(b), "prev")
}, a.isActive = function (a) {
return j.currentSlide === a
}, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () {
i || (i = !0, e())
}, a.pause = function () {
a.noPause || (i = !1, f())
}, j.addSlide = function (b, c) {
b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1
}, j.removeSlide = function (a) {
angular.isDefined(a.index) && k.sort(function (a, b) {
return +a.index > +b.index
});
var b = k.indexOf(a);
k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l--
}
}]).directive("carousel", [function () {
return {
restrict: "EA",
transclude: !0,
replace: !0,
controller: "CarouselController",
require: "carousel",
templateUrl: "template/carousel/carousel.html",
scope: {interval: "=", noTransition: "=", noPause: "="}
}
}]).directive("slide", function () {
return {
require: "^carousel",
restrict: "EA",
transclude: !0,
replace: !0,
templateUrl: "template/carousel/slide.html",
scope: {active: "=?", index: "=?"},
link: function (a, b, c, d) {
d.addSlide(a, b), a.$on("$destroy", function () {
d.removeSlide(a)
}), a.$watch("active", function (b) {
b && d.select(a)
})
}
}
}).animation(".item", ["$animate", function (a) {
return {
beforeAddClass: function (b, c, d) {
if ("active" == c && b.parent() && !b.parent().scope().noTransition) {
var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right";
return b.addClass(f), a.addClass(b, g).then(function () {
e || b.removeClass(g + " " + f), d()
}), function () {
e = !0
}
}
d()
}, beforeRemoveClass: function (b, c, d) {
if ("active" == c && b.parent() && !b.parent().scope().noTransition) {
var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right";
return a.addClass(b, g).then(function () {
e || b.removeClass(g), d()
}), function () {
e = !0
}
}
d()
}
}
}]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) {
function c(a) {
var c = [], d = a.split("");
return angular.forEach(f, function (b, e) {
var f = a.indexOf(e);
if (f > -1) {
a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$";
for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$";
a = a.join(""), c.push({index: f, apply: b.apply})
}
}), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")}
}
function d(a, b, c) {
return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0
}
var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
this.parsers = {};
var f = {
yyyy: {
regex: "\\d{4}", apply: function (a) {
this.year = +a
}
},
yy: {
regex: "\\d{2}", apply: function (a) {
this.year = +a + 2e3
}
},
y: {
regex: "\\d{1,4}", apply: function (a) {
this.year = +a
}
},
MMMM: {
regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) {
this.month = a.DATETIME_FORMATS.MONTH.indexOf(b)
}
},
MMM: {
regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) {
this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)
}
},
MM: {
regex: "0[1-9]|1[0-2]", apply: function (a) {
this.month = a - 1
}
},
M: {
regex: "[1-9]|1[0-2]", apply: function (a) {
this.month = a - 1
}
},
dd: {
regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) {
this.date = +a
}
},
d: {
regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) {
this.date = +a
}
},
EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")},
EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")},
HH: {
regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) {
this.hours = +a
}
},
H: {
regex: "1?[0-9]|2[0-3]", apply: function (a) {
this.hours = +a
}
},
mm: {
regex: "[0-5][0-9]", apply: function (a) {
this.minutes = +a
}
},
m: {
regex: "[0-9]|[1-5][0-9]", apply: function (a) {
this.minutes = +a
}
},
sss: {
regex: "[0-9][0-9][0-9]", apply: function (a) {
this.milliseconds = +a
}
},
ss: {
regex: "[0-5][0-9]", apply: function (a) {
this.seconds = +a
}
},
s: {
regex: "[0-9]|[1-5][0-9]", apply: function (a) {
this.seconds = +a
}
}
};
this.parse = function (b, f, g) {
if (!angular.isString(b) || !f)return b;
f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f));
var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i);
if (k && k.length) {
var l, m;
l = g ? {
year: g.getFullYear(),
month: g.getMonth(),
date: g.getDate(),
hours: g.getHours(),
minutes: g.getMinutes(),
seconds: g.getSeconds(),
milliseconds: g.getMilliseconds()
} : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0};
for (var n = 1, o = k.length; o > n; n++) {
var p = j[n - 1];
p.apply && p.apply.call(l, k[n])
}
return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m
}
}
}]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) {
function c(a, c) {
return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c]
}
function d(a) {
return "static" === (c(a, "position") || "static")
}
var e = function (b) {
for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent;
return e || c
};
return {
position: function (b) {
var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]);
f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft);
var g = b[0].getBoundingClientRect();
return {
width: g.width || b.prop("offsetWidth"),
height: g.height || b.prop("offsetHeight"),
top: c.top - d.top,
left: c.left - d.left
}
}, offset: function (c) {
var d = c[0].getBoundingClientRect();
return {
width: d.width || c.prop("offsetWidth"),
height: d.height || c.prop("offsetHeight"),
top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop),
left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft)
}
}, positionElements: function (a, b, c, d) {
var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center";
e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight");
var l = {
center: function () {
return e.left + e.width / 2 - f / 2
}, left: function () {
return e.left
}, right: function () {
return e.left + e.width
}
}, m = {
center: function () {
return e.top + e.height / 2 - g / 2
}, top: function () {
return e.top
}, bottom: function () {
return e.top + e.height
}
};
switch (j) {
case"right":
h = {top: m[k](), left: l[j]()};
break;
case"left":
h = {top: m[k](), left: e.left - f};
break;
case"bottom":
h = {top: m[j](), left: l[k]()};
break;
default:
h = {top: e.top - g, left: l[k]()}
}
return h
}
}
}]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", {
formatDay: "dd",
formatMonth: "MMMM",
formatYear: "yyyy",
formatDayHeader: "EEE",
formatDayTitle: "MMMM yyyy",
formatMonthTitle: "yyyy",
datepickerMode: "day",
minMode: "day",
maxMode: "year",
showWeeks: !0,
startingDay: 0,
yearRange: 20,
minDate: null,
maxDate: null,
shortcutPropagation: !1
}).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) {
var i = this, j = {$setViewValue: angular.noop};
this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) {
i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c]
}), angular.forEach(["minDate", "maxDate"], function (d) {
b[d] ? a.$parent.$watch(c(b[d]), function (a) {
i[d] = a ? new Date(a) : null, i.refreshView()
}) : i[d] = h[d] ? new Date(h[d]) : null
}), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) {
a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView())
})) : this.activeDate = new Date, a.isActive = function (b) {
return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1
}, this.init = function (a) {
j = a, j.$render = function () {
i.render()
}
}, this.render = function () {
if (j.$viewValue) {
var a = new Date(j.$viewValue), b = !isNaN(a);
b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b)
}
this.refreshView()
}, this.refreshView = function () {
if (this.element) {
this._refreshView();
var a = j.$viewValue ? new Date(j.$viewValue) : null;
j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a))
}
}, this.createDateObject = function (a, b) {
var c = j.$viewValue ? new Date(j.$viewValue) : null;
return {
date: a,
label: g(a, b),
selected: c && 0 === this.compare(a, c),
disabled: this.isDisabled(a),
current: 0 === this.compare(a, new Date),
customClass: this.customClass(a)
}
}, this.isDisabled = function (c) {
return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({
date: c,
mode: a.datepickerMode
})
}, this.customClass = function (b) {
return a.customClass({date: b, mode: a.datepickerMode})
}, this.split = function (a, b) {
for (var c = []; a.length > 0;)c.push(a.splice(0, b));
return c
}, a.select = function (b) {
if (a.datepickerMode === i.minMode) {
var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0);
c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render()
} else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1]
}, a.move = function (a) {
var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0);
i.activeDate.setFullYear(b, c, 1), i.refreshView()
}, a.toggleMode = function (b) {
b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b])
}, a.keys = {
13: "enter",
32: "space",
33: "pageup",
34: "pagedown",
35: "end",
36: "home",
37: "left",
38: "up",
39: "right",
40: "down"
};
var k = function () {
e(function () {
i.element[0].focus()
}, 0, !1)
};
a.$on("datepicker.focus", k), a.keydown = function (b) {
var c = a.keys[b.which];
if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) {
if (i.isDisabled(i.activeDate))return;
a.select(i.activeDate), k()
} else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k())
}
}]).directive("datepicker", function () {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/datepicker.html",
scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"},
require: ["datepicker", "?^ngModel"],
controller: "DatepickerController",
link: function (a, b, c, d) {
var e = d[0], f = d[1];
f && e.init(f)
}
}
}).directive("daypicker", ["dateFilter", function (a) {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/day.html",
require: "^datepicker",
link: function (b, c, d, e) {
function f(a, b) {
return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29
}
function g(a, b) {
var c = new Array(b), d = new Date(a), e = 0;
for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1);
return c
}
function h(a) {
var b = new Date(a);
b.setDate(b.getDate() + 4 - (b.getDay() || 7));
var c = b.getTime();
return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1
}
b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c;
var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
e._refreshView = function () {
var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f);
j > 0 && k.setDate(-j + 1);
for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), {
secondary: l[m].getMonth() !== d,
uid: b.uniqueId + "-" + m
});
b.labels = new Array(7);
for (var n = 0; 7 > n; n++)b.labels[n] = {
abbr: a(l[n].date, e.formatDayHeader),
full: a(l[n].date, "EEEE")
};
if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) {
b.weekNumbers = [];
for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date))
}
}, e.compare = function (a, b) {
return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate())
}, e.handleKeyDown = function (a) {
var b = e.activeDate.getDate();
if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) {
var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1);
e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b)
} else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth()));
e.activeDate.setDate(b)
}, e.refreshView()
}
}
}]).directive("monthpicker", ["dateFilter", function (a) {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/month.html",
require: "^datepicker",
link: function (b, c, d, e) {
e.step = {years: 1}, e.element = c, e._refreshView = function () {
for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f});
b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3)
}, e.compare = function (a, b) {
return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth())
}, e.handleKeyDown = function (a) {
var b = e.activeDate.getMonth();
if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) {
var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1);
e.activeDate.setFullYear(c)
} else"home" === a ? b = 0 : "end" === a && (b = 11);
e.activeDate.setMonth(b)
}, e.refreshView()
}
}
}]).directive("yearpicker", ["dateFilter", function () {
return {
restrict: "EA",
replace: !0,
templateUrl: "template/datepicker/year.html",
require: "^datepicker",
link: function (a, b, c, d) {
function e(a) {
return parseInt((a - 1) / f, 10) * f + 1
}
var f = d.yearRange;
d.step = {years: f}, d.element = b, d._refreshView = function () {
for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c});
a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5)
}, d.compare = function (a, b) {
return a.getFullYear() - b.getFullYear()
}, d.handleKeyDown = function (a) {
var b = d.activeDate.getFullYear();
"left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b)
}, d.refreshView()
}
}
}]).constant("datepickerPopupConfig", {
datepickerPopup: "yyyy-MM-dd",
html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"},
currentText: "Today",
clearText: "Clear",
closeText: "Done",
closeOnDateSelection: !0,
appendToBody: !1,
showButtonBar: !0
}).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) {
return {
restrict: "EA",
require: "ngModel",
scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"},
link: function (h, i, j, k) {
function l(a) {
return a.replace(/([A-Z])/g, function (a) {
return "-" + a.toLowerCase()
})
}
function m(a) {
if (angular.isNumber(a) && (a = new Date(a)), a) {
if (angular.isDate(a) && !isNaN(a))return a;
if (angular.isString(a)) {
var b = f.parse(a, o, h.date) || new Date(a);
return isNaN(b) ? void 0 : b
}
return void 0
}
return null
}
function n(a, b) {
var c = a || b;
if (angular.isNumber(c) && (c = new Date(c)), c) {
if (angular.isDate(c) && !isNaN(c))return !0;
if (angular.isString(c)) {
var d = f.parse(c, o) || new Date(c);
return !isNaN(d)
}
return !1
}
return !0
}
var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody;
h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) {
return h[a + "Text"] || g[a + "Text"]
};
var r = !1;
if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) {
var b = a || g.datepickerPopup;
if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.")
})), !o)throw new Error("datepickerPopup must have a date format specified.");
if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");
var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");
s.attr({"ng-model": "date", "ng-change": "dateSelection()"});
var t = angular.element(s.children()[0]);
if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) {
var u = h.$parent.$eval(j.datepickerOptions);
u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) {
t.attr(l(b), a)
})
}
h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) {
if (j[a]) {
var c = b(j[a]);
if (h.$parent.$watch(c, function (b) {
h.watchData[a] = b
}), t.attr(l(a), "watchData." + a), "datepickerMode" === a) {
var d = c.assign;
h.$watch("watchData." + a, function (a, b) {
a !== b && d(h.$parent, a)
})
}
}
}), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) {
return h.date = a, a
}) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) {
return h.date = a, k.$isEmpty(a) ? a : e(a, o)
})), h.dateSelection = function (a) {
angular.isDefined(a) && (h.date = a);
var b = h.date ? e(h.date, o) : "";
i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus())
}, k.$viewChangeListeners.push(function () {
h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue)
});
var v = function (a) {
h.isOpen && a.target !== i[0] && h.$apply(function () {
h.isOpen = !1
})
}, w = function (a) {
h.keydown(a)
};
i.bind("keydown", w), h.keydown = function (a) {
27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0)
}, h.$watch("isOpen", function (a) {
a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v)
}), h.select = function (a) {
if ("today" === a) {
var b = new Date;
angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0))
}
h.dateSelection(a)
}, h.close = function () {
h.isOpen = !1, i[0].focus()
};
var x = a(s)(h);
s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () {
x.remove(), i.unbind("keydown", w), c.unbind("click", v)
})
}
}
}]).directive("datepickerPopupWrap", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
templateUrl: "template/datepicker/popup.html",
link: function (a, b) {
b.bind("click", function (a) {
a.preventDefault(), a.stopPropagation()
})
}
}
}), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) {
var c = null;
this.open = function (b) {
c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b
}, this.close = function (b) {
c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e))
};
var d = function (a) {
if (c && (!a || "disabled" !== c.getAutoClose())) {
var d = c.getToggleElement();
if (!(a && d && d[0].contains(a.target))) {
var e = c.getElement();
a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply())
}
}
}, e = function (a) {
27 === a.which && (c.focusToggleElement(), d())
}
}]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) {
var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1;
this.init = function (d) {
j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) {
k.isOpen = !!a
})), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () {
j.dropdownMenu.remove()
}))
}, this.toggle = function (a) {
return k.isOpen = arguments.length ? !!a : !k.isOpen
}, this.isOpen = function () {
return k.isOpen
}, k.getToggleElement = function () {
return j.toggleElement
}, k.getAutoClose = function () {
return b.autoClose || "always"
}, k.getElement = function () {
return j.$element
}, k.focusToggleElement = function () {
j.toggleElement && j.toggleElement[0].focus()
}, k.$watch("isOpen", function (b, c) {
if (o && j.dropdownMenu) {
var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0);
j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"})
}
f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b})
}), a.$on("$locationChangeSuccess", function () {
k.isOpen = !1
}), a.$on("$destroy", function () {
k.$destroy()
})
}]).directive("dropdown", function () {
return {
controller: "DropdownController", link: function (a, b, c, d) {
d.init(b)
}
}
}).directive("dropdownMenu", function () {
return {
restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) {
d && (d.dropdownMenu = b)
}
}
}).directive("dropdownToggle", function () {
return {
require: "?^dropdown", link: function (a, b, c, d) {
if (d) {
d.toggleElement = b;
var e = function (e) {
e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () {
d.toggle()
})
};
b.bind("click", e), b.attr({
"aria-haspopup": !0,
"aria-expanded": !1
}), a.$watch(d.isOpen, function (a) {
b.attr("aria-expanded", !!a)
}), a.$on("$destroy", function () {
b.unbind("click", e)
})
}
}
}
}), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () {
return {
createNew: function () {
var a = [];
return {
add: function (b, c) {
a.push({key: b, value: c})
}, get: function (b) {
for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c]
}, keys: function () {
for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key);
return b
}, top: function () {
return a[a.length - 1]
}, remove: function (b) {
for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) {
c = d;
break
}
return a.splice(c, 1)[0]
}, removeTop: function () {
return a.splice(a.length - 1, 1)[0]
}, length: function () {
return a.length
}
}
}
}
}).directive("modalBackdrop", ["$timeout", function (a) {
function b(b) {
b.animate = !1, a(function () {
b.animate = !0
})
}
return {
restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) {
return a.addClass(c.backdropClass), b
}
}
}]).directive("modalWindow", ["$modalStack", "$q", function (a, b) {
return {
restrict: "EA",
scope: {index: "@", animate: "="},
replace: !0,
transclude: !0,
templateUrl: function (a, b) {
return b.templateUrl || "template/modal/window.html"
},
link: function (c, d, e) {
d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) {
var c = a.getTop();
c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click"))
}, c.$isRendered = !0;
var f = b.defer();
e.$observe("modalRender", function (a) {
"true" == a && f.resolve()
}), f.promise.then(function () {
c.animate = !0;
var b = d[0].querySelectorAll("[autofocus]");
b.length ? b[0].focus() : d[0].focus();
var e = a.getTop();
e && a.modalRendered(e.key)
})
}
}
}]).directive("modalAnimationClass", [function () {
return {
compile: function (a, b) {
b.modalAnimation && a.addClass(b.modalAnimationClass)
}
}
}]).directive("modalTransclude", function () {
return {
link: function (a, b, c, d, e) {
e(a.$parent, function (a) {
b.empty(), b.append(a)
})
}
}
}).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) {
function g() {
for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c);
return a
}
function h(a) {
var b = c.find("body").eq(0), d = o.get(a).value;
o.remove(a), j(d.modalDomEl, d.modalScope, function () {
b.toggleClass(n, o.length() > 0), i()
})
}
function i() {
if (l && -1 == g()) {
var a = m;
j(l, m, function () {
a = null
}), l = void 0, m = void 0
}
}
function j(c, d, f) {
function g() {
g.done || (g.done = !0, c.remove(), d.$destroy(), f && f())
}
d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () {
e.$evalAsync(g)
}) : b(g)
}
function k(a, b, c) {
return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented
}
var l, m, n = "modal-open", o = f.createNew(), p = {};
return e.$watch(g, function (a) {
m && (m.index = a)
}), c.bind("keydown", function (a) {
var b;
27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () {
p.dismiss(b.key, "escape key press")
})))
}), p.open = function (a, b) {
var f = c[0].activeElement;
o.add(a, {
deferred: b.deferred,
renderDeferred: b.renderDeferred,
modalScope: b.scope,
backdrop: b.backdrop,
keyboard: b.keyboard
});
var h = c.find("body").eq(0), i = g();
if (i >= 0 && !l) {
m = e.$new(!0), m.index = i;
var j = angular.element('<div modal-backdrop="modal-backdrop"></div>');
j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l)
}
var k = angular.element('<div modal-window="modal-window"></div>');
k.attr({
"template-url": b.windowTemplateUrl,
"window-class": b.windowClass,
size: b.size,
index: o.length() - 1,
animate: "animate"
}).html(b.content), b.animation && k.attr("modal-animation", "true");
var p = d(k)(b.scope);
o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n)
}, p.close = function (a, b) {
var c = o.get(a);
return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c
}, p.dismiss = function (a, b) {
var c = o.get(a);
return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c
}, p.dismissAll = function (a) {
for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop()
}, p.getTop = function () {
return o.top()
}, p.modalRendered = function (a) {
var b = o.get(a);
b && b.value.renderDeferred.resolve()
}, p
}]).provider("$modal", function () {
var a = {
options: {animation: !0, backdrop: !0, keyboard: !0},
$get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) {
function h(a) {
return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl)
}
function i(a) {
var c = [];
return angular.forEach(a, function (a) {
(angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a)))
}), c
}
var j = {};
return j.open = function (b) {
var e = d.defer(), j = d.defer(), k = d.defer(), l = {
result: e.promise,
opened: j.promise,
rendered: k.promise,
close: function (a) {
return g.close(l, a)
},
dismiss: function (a) {
return g.dismiss(l, a)
}
};
if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required.");
var m = d.all([h(b)].concat(i(b.resolve)));
return m.then(function (a) {
var d = (b.scope || c).$new();
d.$close = l.close, d.$dismiss = l.dismiss;
var h, i = {}, j = 1;
b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) {
i[c] = a[j++]
}), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, {
scope: d,
deferred: e,
renderDeferred: k,
content: a[0],
animation: b.animation,
backdrop: b.backdrop,
keyboard: b.keyboard,
backdropClass: b.backdropClass,
windowClass: b.windowClass,
windowTemplateUrl: b.windowTemplateUrl,
size: b.size
})
}, function (a) {
e.reject(a)
}), m.then(function () {
j.resolve(!0)
}, function (a) {
j.reject(a)
}), l
}, j
}]
};
return a
}), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) {
var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop;
this.init = function (g, h) {
e = g, this.config = h, e.$render = function () {
d.render()
}, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) {
d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages()
}) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () {
a.totalPages = d.calculateTotalPages()
}), a.$watch("totalPages", function (b) {
f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render()
})
}, this.calculateTotalPages = function () {
var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage);
return Math.max(b || 0, 1)
}, this.render = function () {
a.page = parseInt(e.$viewValue, 10) || 1
}, a.selectPage = function (b, c) {
a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render())
}, a.getText = function (b) {
return a[b + "Text"] || d.config[b + "Text"]
}, a.noPrevious = function () {
return 1 === a.page
}, a.noNext = function () {
return a.page === a.totalPages
}
}]).constant("paginationConfig", {
itemsPerPage: 10,
boundaryLinks: !1,
directionLinks: !0,
firstText: "First",
previousText: "Previous",
nextText: "Next",
lastText: "Last",
rotate: !0
}).directive("pagination", ["$parse", "paginationConfig", function (a, b) {
return {
restrict: "EA",
scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"},
require: ["pagination", "?ngModel"],
controller: "PaginationController",
templateUrl: "template/pagination/pagination.html",
replace: !0,
link: function (c, d, e, f) {
function g(a, b, c) {
return {number: a, text: b, active: c}
}
function h(a, b) {
var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k;
f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b)));
for (var h = d; e >= h; h++) {
var i = g(h, h, h === a);
c.push(i)
}
if (f && !l) {
if (d > 1) {
var j = g(d - 1, "...", !1);
c.unshift(j)
}
if (b > e) {
var m = g(e + 1, "...", !1);
c.push(m)
}
}
return c
}
var i = f[0], j = f[1];
if (j) {
var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate;
c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) {
k = parseInt(a, 10), i.render()
});
var m = i.render;
i.render = function () {
m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages))
}
}
}
}
}]).constant("pagerConfig", {
itemsPerPage: 10,
previousText: "« Previous",
nextText: "Next »",
align: !0
}).directive("pager", ["pagerConfig", function (a) {
return {
restrict: "EA",
scope: {totalItems: "=", previousText: "@", nextText: "@"},
require: ["pager", "?ngModel"],
controller: "PaginationController",
templateUrl: "template/pagination/pager.html",
replace: !0,
link: function (b, c, d, e) {
var f = e[0], g = e[1];
g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a))
}
}
}]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () {
function a(a) {
var b = /[A-Z]/g, c = "-";
return a.replace(b, function (a, b) {
return (b ? c : "") + a.toLowerCase()
})
}
var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = {
mouseenter: "mouseleave",
click: "click",
focus: "blur"
}, d = {};
this.options = function (a) {
angular.extend(d, a)
}, this.setTriggers = function (a) {
angular.extend(c, a)
}, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) {
return function (e, k, l, m) {
function n(a) {
var b = a || m.trigger || l, d = c[b] || b;
return {show: b, hide: d}
}
m = angular.extend({}, b, d, m);
var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>';
return {
restrict: "EA", compile: function () {
var a = f(r);
return function (b, c, d) {
function f() {
E.isOpen ? l() : j()
}
function j() {
(!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) {
a()
})) : o()())
}
function l() {
b.$apply(function () {
p()
})
}
function o() {
return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({
top: 0,
left: 0,
display: "block"
}), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop
}
function p() {
E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r()
}
function q() {
x && r(), y = E.$new(), x = a(y, function (a) {
B ? h.find("body").append(a) : c.after(a)
}), y.$watch(function () {
g(F, 0, !1)
}), m.useContentExp && y.$watch("contentExp()", function (a) {
!a && E.isOpen && p()
})
}
function r() {
z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null)
}
function s() {
t(), u(), v()
}
function t() {
E.popupClass = d[k + "Class"]
}
function u() {
var a = d[k + "Placement"];
E.placement = angular.isDefined(a) ? a : m.placement
}
function v() {
var a = d[k + "PopupDelay"], b = parseInt(a, 10);
E.popupDelay = isNaN(b) ? m.popupDelay : b
}
function w() {
var a = d[k + "Trigger"];
G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l))
}
var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () {
if (x) {
var a = i.positionElements(c, x, E.placement, B);
a.top += "px", a.left += "px", x.css(a)
}
};
E.origScope = b, E.isOpen = !1, E.contentExp = function () {
return b.$eval(d[e])
}, m.useContentExp || d.$observe(e, function (a) {
E.content = a, !a && E.isOpen && p()
}), d.$observe("disabled", function (a) {
a && E.isOpen && p()
}), d.$observe(k + "Title", function (a) {
E.title = a
});
var G = function () {
c.unbind(C.show, j), c.unbind(C.hide, l)
};
w();
var H = b.$eval(d[k + "Animation"]);
E.animation = angular.isDefined(H) ? !!H : m.animation;
var I = b.$eval(d[k + "AppendToBody"]);
B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () {
E.isOpen && p()
}), b.$on("$destroy", function () {
g.cancel(z), g.cancel(A), G(), r(), E = null
})
}
}
}
}
}]
}).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) {
return {
link: function (e, f, g) {
var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () {
i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () {
i = null
}), i = j, j = null)
};
e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) {
var g = ++l;
b ? (d(b, !0).then(function (d) {
if (g === l) {
var e = k.$new(), i = d, n = c(i)(e, function (b) {
m(), a.enter(b, f)
});
h = e, j = n, h.$emit("$includeContentLoaded", b)
}
}, function () {
g === l && (m(), e.$emit("$includeContentError", b))
}), e.$emit("$includeContentRequested", b)) : m()
}), e.$on("$destroy", m)
}
}
}]).directive("tooltipClasses", function () {
return {
restrict: "A", link: function (a, b, c) {
a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass)
}
}
}).directive("tooltipPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-popup.html"
}
}).directive("tooltip", ["$tooltip", function (a) {
return a("tooltip", "tooltip", "mouseenter")
}]).directive("tooltipTemplatePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"},
templateUrl: "template/tooltip/tooltip-template-popup.html"
}
}).directive("tooltipTemplate", ["$tooltip", function (a) {
return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0})
}]).directive("tooltipHtmlPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-html-popup.html"
}
}).directive("tooltipHtml", ["$tooltip", function (a) {
return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0})
}]).directive("tooltipHtmlUnsafePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html"
}
}).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) {
return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter")
}]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {
title: "@",
contentExp: "&",
placement: "@",
popupClass: "@",
animation: "&",
isOpen: "&",
originScope: "&"
},
templateUrl: "template/popover/popover-template.html"
}
}).directive("popoverTemplate", ["$tooltip", function (a) {
return a("popoverTemplate", "popover", "click", {useContentExp: !0})
}]).directive("popoverPopup", function () {
return {
restrict: "EA",
replace: !0,
scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"},
templateUrl: "template/popover/popover.html"
}
}).directive("popover", ["$tooltip", function (a) {
return a("popover", "popover", "click")
}]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", {
animate: !0,
max: 100
}).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) {
var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate;
this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) {
e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) {
b.percent = +(100 * c / a.max).toFixed(2)
}), b.$on("$destroy", function () {
c = null, d.removeBar(b)
})
}, this.removeBar = function (a) {
this.bars.splice(this.bars.indexOf(a), 1)
}
}]).directive("progress", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
controller: "ProgressController",
require: "progress",
scope: {},
templateUrl: "template/progressbar/progress.html"
}
}).directive("bar", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
require: "^progress",
scope: {value: "=", max: "=?", type: "@"},
templateUrl: "template/progressbar/bar.html",
link: function (a, b, c, d) {
d.addBar(a, b)
}
}
}).directive("progressbar", function () {
return {
restrict: "EA",
replace: !0,
transclude: !0,
controller: "ProgressController",
scope: {value: "=", max: "=?", type: "@"},
templateUrl: "template/progressbar/progressbar.html",
link: function (a, b, c, d) {
d.addBar(a, angular.element(b.children()[0]))
}
}
}), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", {
max: 5,
stateOn: null,
stateOff: null
}).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) {
var d = {$setViewValue: angular.noop};
this.init = function (e) {
d = e, d.$render = this.render, d.$formatters.push(function (a) {
return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a
}), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff;
var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max);
a.range = this.buildTemplateObjects(f)
}, this.buildTemplateObjects = function (a) {
for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, {
stateOn: this.stateOn,
stateOff: this.stateOff
}, a[b]);
return a
}, a.rate = function (b) {
!a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render())
}, a.enter = function (b) {
a.readonly || (a.value = b), a.onHover({value: b})
}, a.reset = function () {
a.value = d.$viewValue, a.onLeave()
}, a.onKeydown = function (b) {
/(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1)))
}, this.render = function () {
a.value = d.$viewValue
}
}]).directive("rating", function () {
return {
restrict: "EA",
require: ["rating", "ngModel"],
scope: {readonly: "=?", onHover: "&", onLeave: "&"},
controller: "RatingController",
templateUrl: "template/rating/rating.html",
replace: !0,
link: function (a, b, c, d) {
var e = d[0], f = d[1];
e.init(f)
}
}
}), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) {
var b = this, c = b.tabs = a.tabs = [];
b.select = function (a) {
angular.forEach(c, function (b) {
b.active && b !== a && (b.active = !1, b.onDeselect())
}), a.active = !0, a.onSelect()
}, b.addTab = function (a) {
c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1
}, b.removeTab = function (a) {
var e = c.indexOf(a);
if (a.active && c.length > 1 && !d) {
var f = e == c.length - 1 ? e - 1 : e + 1;
b.select(c[f])
}
c.splice(e, 1)
};
var d;
a.$on("$destroy", function () {
d = !0
})
}]).directive("tabset", function () {
return {
restrict: "EA",
transclude: !0,
replace: !0,
scope: {type: "@"},
controller: "TabsetController",
templateUrl: "template/tabs/tabset.html",
link: function (a, b, c) {
a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1
}
}
}).directive("tab", ["$parse", "$log", function (a, b) {
return {
require: "^tabset",
restrict: "EA",
replace: !0,
templateUrl: "template/tabs/tab.html",
transclude: !0,
scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"},
controller: function () {
},
compile: function (c, d, e) {
return function (c, d, f, g) {
c.$watch("active", function (a) {
a && g.select(c)
}), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) {
c.disabled = !!a
}), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) {
c.disabled = !!a
})), c.select = function () {
c.disabled || (c.active = !0)
}, g.addTab(c), c.$on("$destroy", function () {
g.removeTab(c)
}), c.$transcludeFn = e
}
}
}
}]).directive("tabHeadingTransclude", [function () {
return {
restrict: "A", require: "^tab", link: function (a, b) {
a.$watch("headingElement", function (a) {
a && (b.html(""), b.append(a))
})
}
}
}]).directive("tabContentTransclude", function () {
function a(a) {
return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase())
}
return {
restrict: "A", require: "^tabset", link: function (b, c, d) {
var e = b.$eval(d.tabContentTransclude);
e.$transcludeFn(e.$parent, function (b) {
angular.forEach(b, function (b) {
a(b) ? e.headingElement = b : c.append(b)
})
})
}
}
}), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", {
hourStep: 1,
minuteStep: 1,
showMeridian: !0,
meridians: null,
readonlyInput: !1,
mousewheel: !0,
arrowkeys: !0
}).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) {
function g() {
var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b;
return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0
}
function h() {
var b = parseInt(a.minutes, 10);
return b >= 0 && 60 > b ? b : void 0
}
function i(a) {
return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString()
}
function j(a) {
k(), o.$setViewValue(new Date(n)), l(a)
}
function k() {
o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1
}
function l(b) {
var c = n.getHours(), d = n.getMinutes();
a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1]
}
function m(a) {
var b = new Date(n.getTime() + 6e4 * a);
n.setHours(b.getHours(), b.getMinutes()), j()
}
var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS;
this.init = function (c, d) {
o = c, o.$render = this.render, o.$formatters.unshift(function (a) {
return a ? new Date(a) : null
});
var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel;
h && this.setupMousewheelEvents(e, g);
var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys;
i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g)
};
var q = f.hourStep;
b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) {
q = parseInt(a, 10)
});
var r = f.minuteStep;
b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) {
r = parseInt(a, 10)
}), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) {
if (a.showMeridian = !!b, o.$error.time) {
var c = g(), d = h();
angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j())
} else l()
}), this.setupMousewheelEvents = function (b, c) {
var d = function (a) {
a.originalEvent && (a = a.originalEvent);
var b = a.wheelDelta ? a.wheelDelta : -a.deltaY;
return a.detail || b > 0
};
b.bind("mousewheel wheel", function (b) {
a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault()
}), c.bind("mousewheel wheel", function (b) {
a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault()
})
}, this.setupArrowkeyEvents = function (b, c) {
b.bind("keydown", function (b) {
38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply())
}), c.bind("keydown", function (b) {
38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply())
})
}, this.setupInputEvents = function (b, c) {
if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop);
var d = function (b, c) {
o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c)
};
a.updateHours = function () {
var a = g();
angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0)
}, b.bind("blur", function () {
!a.invalidHours && a.hours < 10 && a.$apply(function () {
a.hours = i(a.hours)
})
}), a.updateMinutes = function () {
var a = h();
angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0)
}, c.bind("blur", function () {
!a.invalidMinutes && a.minutes < 10 && a.$apply(function () {
a.minutes = i(a.minutes)
})
})
}, this.render = function () {
var a = o.$viewValue;
isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l())
}, a.incrementHours = function () {
m(60 * q)
}, a.decrementHours = function () {
m(60 * -q)
}, a.incrementMinutes = function () {
m(r)
}, a.decrementMinutes = function () {
m(-r)
}, a.toggleMeridian = function () {
m(720 * (n.getHours() < 12 ? 1 : -1))
}
}]).directive("timepicker", function () {
return {
restrict: "EA",
require: ["timepicker", "?^ngModel"],
controller: "TimepickerController",
replace: !0,
scope: {},
templateUrl: "template/timepicker/timepicker.html",
link: function (a, b, c, d) {
var e = d[0], f = d[1];
f && e.init(f, b.find("input"))
}
}
}), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) {
function f(a) {
for (var b in a)if (void 0 !== h.style[b])return a[b]
}
e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead.");
var g = function (d, e, f) {
f = f || {};
var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () {
c.$apply(function () {
d.unbind(i, j), h.resolve(d)
})
};
return i && d.bind(i, j), b(function () {
angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d)
}), h.promise.cancel = function () {
i && d.unbind(i, j), h.reject("Transition cancelled")
}, h.promise
}, h = document.createElement("trans"), i = {
WebkitTransition: "webkitTransitionEnd",
MozTransition: "transitionend",
OTransition: "oTransitionEnd",
transition: "transitionend"
}, j = {
WebkitTransition: "webkitAnimationEnd",
MozTransition: "animationend",
OTransition: "oAnimationEnd",
transition: "animationend"
};
return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g
}]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) {
var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
return {
parse: function (c) {
var d = c.match(b);
if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".');
return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])}
}
}
}]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) {
var h = [9, 13, 27, 38, 40];
return {
require: "ngModel", link: function (i, j, k, l) {
var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new();
i.$on("$destroy", function () {
x.$destroy()
});
var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random());
j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y});
var z = angular.element("<div typeahead-popup></div>");
z.attr({
id: y,
matches: "matches",
active: "activeIdx",
select: "select(activeIdx)",
query: "query",
position: "position"
}), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl);
var A = function () {
x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1)
}, B = function (a) {
return y + "-option-" + a
};
x.$watch("activeIdx", function (a) {
0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a))
});
var C = function (a) {
var b = {$viewValue: a};
q(i, !0), c.when(w.source(i, b)).then(function (c) {
var d = a === l.$viewValue;
if (d && m)if (c && c.length > 0) {
x.activeIdx = u ? 0 : -1, x.matches.length = 0;
for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({
id: B(e),
label: w.viewMapper(x, b),
model: c[e]
});
x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0)
} else A();
d && q(i, !1)
}, function () {
A(), q(i, !1)
})
};
A(), x.query = void 0;
var D, E = function (a) {
D = d(function () {
C(a)
}, o)
}, F = function () {
D && d.cancel(D)
};
l.$parsers.unshift(function (a) {
return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a)
}), l.$formatters.push(function (a) {
var b, c, d = {};
return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a)
}), x.select = function (a) {
var b, c, e = {};
e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, {
$item: c,
$model: b,
$label: w.viewMapper(i, e)
}), A(), d(function () {
j[0].focus()
}, 0, !1)
}, j.bind("keydown", function (a) {
0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () {
x.select(x.activeIdx)
}) : 27 === a.which && (a.stopPropagation(), A(), x.$digest()))
}), j.bind("blur", function () {
m = !1
});
var G = function (a) {
j[0] !== a.target && (A(), x.$digest())
};
e.bind("click", G), i.$on("$destroy", function () {
e.unbind("click", G), t && H.remove(), z.remove()
});
var H = a(z)(x);
t ? e.find("body").append(H) : j.after(H)
}
}
}]).directive("typeaheadPopup", function () {
return {
restrict: "EA",
scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"},
replace: !0,
templateUrl: "template/typeahead/typeahead-popup.html",
link: function (a, b, c) {
a.templateUrl = c.templateUrl, a.isOpen = function () {
return a.matches.length > 0
}, a.isActive = function (b) {
return a.active == b
}, a.selectActive = function (b) {
a.active = b
}, a.selectMatch = function (b) {
a.select({activeIdx: b})
}
}
}
}).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) {
return {
restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) {
var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html";
a(g).then(function (a) {
b(a.trim())(d, function (a) {
e.replaceWith(a)
})
})
}
}
}]).filter("typeaheadHighlight", function () {
function a(a) {
return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1")
}
return function (b, c) {
return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b
}
}), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) {
a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n')
}]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) {
a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>')
}]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) {
a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">×</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n')
}]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) {
a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')
}]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) {
a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n')
}]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')
}]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n')
}]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) {
a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) {
a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')
}]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) {
a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n')
}]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) {
a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>')
}]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) {
a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>')
}]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')
}]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) {
a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n')
}]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n')
}]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n')
}]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) {
a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n')
}]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n')
}]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>')
}]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) {
a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n')
}]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) {
a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>')
}]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) {
a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')
}]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) {
a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n')
}]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) {
a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td> </td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td> </td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n')
}]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) {
a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')
}]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) {
a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n')
}]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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.svg | <?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
<glyph horiz-adv-x="0" />
<glyph horiz-adv-x="400" />
<glyph unicode=" " />
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode=" " />
<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
<glyph unicode=" " horiz-adv-x="650" />
<glyph unicode=" " horiz-adv-x="1300" />
<glyph unicode=" " horiz-adv-x="650" />
<glyph unicode=" " horiz-adv-x="1300" />
<glyph unicode=" " horiz-adv-x="433" />
<glyph unicode=" " horiz-adv-x="325" />
<glyph unicode=" " horiz-adv-x="216" />
<glyph unicode=" " horiz-adv-x="216" />
<glyph unicode=" " horiz-adv-x="162" />
<glyph unicode=" " horiz-adv-x="260" />
<glyph unicode=" " horiz-adv-x="72" />
<glyph unicode=" " horiz-adv-x="260" />
<glyph unicode=" " horiz-adv-x="325" />
<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
</font>
</defs></svg> | <?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
<glyph horiz-adv-x="0" />
<glyph horiz-adv-x="400" />
<glyph unicode=" " />
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode=" " />
<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
<glyph unicode=" " horiz-adv-x="650" />
<glyph unicode=" " horiz-adv-x="1300" />
<glyph unicode=" " horiz-adv-x="650" />
<glyph unicode=" " horiz-adv-x="1300" />
<glyph unicode=" " horiz-adv-x="433" />
<glyph unicode=" " horiz-adv-x="325" />
<glyph unicode=" " horiz-adv-x="216" />
<glyph unicode=" " horiz-adv-x="216" />
<glyph unicode=" " horiz-adv-x="162" />
<glyph unicode=" " horiz-adv-x="260" />
<glyph unicode=" " horiz-adv-x="72" />
<glyph unicode=" " horiz-adv-x="260" />
<glyph unicode=" " horiz-adv-x="325" />
<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
</font>
</defs></svg> | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.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.repository.AppRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.HttpClientErrorException;
import static org.hamcrest.Matchers.containsString;
public class AppControllerTest extends AbstractControllerTest {
@Autowired
AppRepository appRepository;
private String getBaseAppUrl() {
return "http://localhost:" + port + "/apps/";
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCheckIfAppIdUnique() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO result = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertTrue(result.getId() > 0);
Boolean falseUnique =
restTemplate.getForObject(getBaseAppUrl() + dto.getAppId() + "/unique", Boolean.class);
Assert.assertFalse(falseUnique);
Boolean trueUnique = restTemplate
.getForObject(getBaseAppUrl() + dto.getAppId() + "true" + "/unique", Boolean.class);
Assert.assertTrue(trueUnique);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreate() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO result = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertTrue(result.getId() > 0);
App savedApp = appRepository.findById(result.getId()).orElse(null);
Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateTwice() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO first = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), first.getAppId());
Assert.assertTrue(first.getId() > 0);
App savedApp = appRepository.findById(first.getId()).orElse(null);
Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
}catch (HttpClientErrorException e){
Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode());
}
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFind() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
AppDTO result = restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class);
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertEquals(dto.getName(), result.getName());
}
@Test(expected = HttpClientErrorException.class)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFindNotExist() {
restTemplate.getForEntity(getBaseAppUrl() + "notExists", AppDTO.class);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testDelete() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
restTemplate.delete("http://localhost:{port}/apps/{appId}?operator={operator}", port, app.getAppId(), "test");
App deletedApp = appRepository.findById(app.getId()).orElse(null);
Assert.assertNull(deletedApp);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void shouldFailedWhenAppIdIsInvalid() {
AppDTO dto = generateSampleDTOData();
dto.setAppId("invalid app id");
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, String.class);
Assert.fail("Should throw");
} catch (HttpClientErrorException e) {
Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode());
Assert.assertThat(new String(e.getResponseBodyAsByteArray()), containsString(InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("someOwner@ctrip.com");
dto.setDataChangeCreatedBy("apollo");
dto.setDataChangeLastModifiedBy("apollo");
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.repository.AppRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.HttpClientErrorException;
import static org.hamcrest.Matchers.containsString;
public class AppControllerTest extends AbstractControllerTest {
@Autowired
AppRepository appRepository;
private String getBaseAppUrl() {
return "http://localhost:" + port + "/apps/";
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCheckIfAppIdUnique() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO result = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertTrue(result.getId() > 0);
Boolean falseUnique =
restTemplate.getForObject(getBaseAppUrl() + dto.getAppId() + "/unique", Boolean.class);
Assert.assertFalse(falseUnique);
Boolean trueUnique = restTemplate
.getForObject(getBaseAppUrl() + dto.getAppId() + "true" + "/unique", Boolean.class);
Assert.assertTrue(trueUnique);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreate() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO result = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertTrue(result.getId() > 0);
App savedApp = appRepository.findById(result.getId()).orElse(null);
Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateTwice() {
AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response =
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
AppDTO first = response.getBody();
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(dto.getAppId(), first.getAppId());
Assert.assertTrue(first.getId() > 0);
App savedApp = appRepository.findById(first.getId()).orElse(null);
Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
}catch (HttpClientErrorException e){
Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode());
}
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFind() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
AppDTO result = restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class);
Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertEquals(dto.getName(), result.getName());
}
@Test(expected = HttpClientErrorException.class)
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFindNotExist() {
restTemplate.getForEntity(getBaseAppUrl() + "notExists", AppDTO.class);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testDelete() {
AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transform(App.class, dto);
app = appRepository.save(app);
restTemplate.delete("http://localhost:{port}/apps/{appId}?operator={operator}", port, app.getAppId(), "test");
App deletedApp = appRepository.findById(app.getId()).orElse(null);
Assert.assertNull(deletedApp);
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void shouldFailedWhenAppIdIsInvalid() {
AppDTO dto = generateSampleDTOData();
dto.setAppId("invalid app id");
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, String.class);
Assert.fail("Should throw");
} catch (HttpClientErrorException e) {
Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode());
Assert.assertThat(new String(e.getResponseBodyAsByteArray()), containsString(InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("someOwner@ctrip.com");
dto.setDataChangeCreatedBy("apollo");
dto.setDataChangeLastModifiedBy("apollo");
return dto;
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/apollo/tracer/internals/cat/CatTransaction.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.tracer.internals.cat;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import java.lang.reflect.Method;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class CatTransaction implements Transaction {
private static Class CAT_TRANSACTION_CLASS;
private static Method SET_STATUS_WITH_STRING;
private static Method SET_STATUS_WITH_THROWABLE;
private static Method ADD_DATA_WITH_KEY_AND_VALUE;
private static Method COMPLETE;
private Object catTransaction;
static {
try {
CAT_TRANSACTION_CLASS = Class.forName(CatNames.CAT_TRANSACTION_CLASS);
SET_STATUS_WITH_STRING = CAT_TRANSACTION_CLASS.getMethod(CatNames.SET_STATUS_METHOD, String.class);
SET_STATUS_WITH_THROWABLE = CAT_TRANSACTION_CLASS.getMethod(CatNames.SET_STATUS_METHOD,
Throwable.class);
ADD_DATA_WITH_KEY_AND_VALUE = CAT_TRANSACTION_CLASS.getMethod(CatNames.ADD_DATA_METHOD,
String.class, Object.class);
COMPLETE = CAT_TRANSACTION_CLASS.getMethod(CatNames.COMPLETE_METHOD);
} catch (Throwable ex) {
throw new IllegalStateException("Initialize Cat transaction failed", ex);
}
}
static void init() {
//do nothing, just to initialize the static variables
}
public CatTransaction(Object catTransaction) {
this.catTransaction = catTransaction;
}
@Override
public void setStatus(String status) {
try {
SET_STATUS_WITH_STRING.invoke(catTransaction, status);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void setStatus(Throwable status) {
try {
SET_STATUS_WITH_THROWABLE.invoke(catTransaction, status);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void addData(String key, Object value) {
try {
ADD_DATA_WITH_KEY_AND_VALUE.invoke(catTransaction, key, value);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void complete() {
try {
COMPLETE.invoke(catTransaction);
} catch (Throwable ex) {
throw new IllegalStateException(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.tracer.internals.cat;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import java.lang.reflect.Method;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class CatTransaction implements Transaction {
private static Class CAT_TRANSACTION_CLASS;
private static Method SET_STATUS_WITH_STRING;
private static Method SET_STATUS_WITH_THROWABLE;
private static Method ADD_DATA_WITH_KEY_AND_VALUE;
private static Method COMPLETE;
private Object catTransaction;
static {
try {
CAT_TRANSACTION_CLASS = Class.forName(CatNames.CAT_TRANSACTION_CLASS);
SET_STATUS_WITH_STRING = CAT_TRANSACTION_CLASS.getMethod(CatNames.SET_STATUS_METHOD, String.class);
SET_STATUS_WITH_THROWABLE = CAT_TRANSACTION_CLASS.getMethod(CatNames.SET_STATUS_METHOD,
Throwable.class);
ADD_DATA_WITH_KEY_AND_VALUE = CAT_TRANSACTION_CLASS.getMethod(CatNames.ADD_DATA_METHOD,
String.class, Object.class);
COMPLETE = CAT_TRANSACTION_CLASS.getMethod(CatNames.COMPLETE_METHOD);
} catch (Throwable ex) {
throw new IllegalStateException("Initialize Cat transaction failed", ex);
}
}
static void init() {
//do nothing, just to initialize the static variables
}
public CatTransaction(Object catTransaction) {
this.catTransaction = catTransaction;
}
@Override
public void setStatus(String status) {
try {
SET_STATUS_WITH_STRING.invoke(catTransaction, status);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void setStatus(Throwable status) {
try {
SET_STATUS_WITH_THROWABLE.invoke(catTransaction, status);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void addData(String key, Object value) {
try {
ADD_DATA_WITH_KEY_AND_VALUE.invoke(catTransaction, key, value);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
@Override
public void complete() {
try {
COMPLETE.invoke(catTransaction);
} catch (Throwable ex) {
throw new IllegalStateException(ex);
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/openapi/repository/ConsumerRoleRepository.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.ConsumerRole;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRoleRepository extends PagingAndSortingRepository<ConsumerRole, Long> {
/**
* find consumer roles by userId
*
* @param consumerId consumer id
*/
List<ConsumerRole> findByConsumerId(long consumerId);
/**
* find consumer roles by roleId
*/
List<ConsumerRole> findByRoleId(long roleId);
ConsumerRole findByConsumerIdAndRoleId(long consumerId, long roleId);
@Modifying
@Query("UPDATE ConsumerRole SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE RoleId in ?1")
Integer batchDeleteByRoleIds(List<Long> roleIds, 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.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRoleRepository extends PagingAndSortingRepository<ConsumerRole, Long> {
/**
* find consumer roles by userId
*
* @param consumerId consumer id
*/
List<ConsumerRole> findByConsumerId(long consumerId);
/**
* find consumer roles by roleId
*/
List<ConsumerRole> findByRoleId(long roleId);
ConsumerRole findByConsumerIdAndRoleId(long consumerId, long roleId);
@Modifying
@Query("UPDATE ConsumerRole SET IsDeleted=1, DataChange_LastModifiedBy = ?2 WHERE RoleId in ?1")
Integer batchDeleteByRoleIds(List<Long> roleIds, String operator);
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/repository/NamespaceLockRepository.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.NamespaceLock;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface NamespaceLockRepository extends PagingAndSortingRepository<NamespaceLock, Long> {
NamespaceLock findByNamespaceId(Long namespaceId);
Long deleteByNamespaceId(Long namespaceId);
}
| /*
* 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.NamespaceLock;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface NamespaceLockRepository extends PagingAndSortingRepository<NamespaceLock, Long> {
NamespaceLock findByNamespaceId(Long namespaceId);
Long deleteByNamespaceId(Long namespaceId);
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/publish-items.png | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`?:VϘ U=qİK.J_Y}_(UUylX]ve۱)S!=[~ E0 FYf##B B B```VW5}ΗR8C.C[Oմq!!p>@{>'X#Љ 1Fؿ_(ą@@!P >kul
f%N0V 80d !bh/@@ǩ #mmwO\@@@@8~`5!k!!!\:+gee ;+g}w'gN ۻUC 6'h7gl9@w>_8:.JYw}!W\]uUKoǯTZRN]t]!!!!!Sx3ٝR)g@@L'Ps9I\gwj:i,RG ~m+o;WS8>ot47T q (GY aotPFr`= (Fa0p
#J*6qC B B B B` j2v#*B B B` yimJ^UAKva(w gyfd
_ FCuo+}8s=5\B/ =zt8.~
8yK'X _^|譼}6P_ #B B B B B B B B B H2@`
VMvxX%֖sRw *41ΕfhDRV^/ϯ6aSSa|yK7͕~V}nV4XuUW^~⦛nڑF)ه@@@@@@@@@@@,je(Y{ ܮ.[2R|+)##ՆpՖO~\qj7+ciSk|'$ q66 W<i߿'| dFs~"ُUO~/߃<^z%<U>Um5s\@@@@@@@@@@@ lQQ^~adk`b$cai
__Ty(/# D[o߾/?ȑ#;Ｓg)#6Wk =DוW^yљҪWFK/tXeˏSvfuEOiN~iq֫j{nxy1vP҃!R+7x駟 ÿt[ٳd S c:VgKX@@@@@@@@@@@$fqرcfl`av۱"Zոmyצ9 Ρ>L VSA[o 1aWYQ>q,~0^W~+); tM';gl$:ɰW>``3o|:epkjRj }|P8xXY%ꫯa%t!!!!!!!!!!!= s曩VΟ.feбrv֪G0}˸C`yl'c]9~s\jiN،%ZIZ[S ><pF璧]WynVN?C凙$I˘~M'U~HFZ2 cU 3.B B B B B B B B B B`j⣚5kO-+gmC8W'l!.Z>9lTcbȚf@06GW 9uu~}ao
xf$jV\z̫_+c|ۗWٌo#\f]Y0:^jOO峍͒CߣG.=]Soat1_ Vu\@@@@"0 d|H|^kcC7Q[ksGE>HћwG 6i-|ZΕ<3lT>˕wÕ-7xc X,mvΧP5iFFbex+.֭UX^^ܒ4](}aX à J?o0VEKW_=WeySUbcXrΒR#rɒ /Pу S\3Zˈg+iᅋZyg !!!!!9 yI˶+yژj)f_(1ymytRyxMC3ޜH o+__|u]7'|An-L&9s\ɫ8.}Wr qJ{̓MՏUni~v۶-VuC x7.L1/_jjB'æ3ɳ ]g?%Oy<e`Mںr6nttotU 8qgƬ+ '
^<c[B9B9sK'-#8\=Zcrܰg @:IxfRr~xk_;t1ae'[o5|?N]w2!0B B B B B 6 }ߗrV s87&UZq8{cvrjfֹ];[~Ui[9߸+x=lVxQuQ<iX?Z][YoEicn mIz9yxjX?|GVL&a=->[Cmi]^B:鼌'/
?/UFٗ~W|+bזy͏W!6<eOW_ omWmPZu7jdn n MQQu3e|BŪM7h}n՛kpD<g`" v3q6*ʗ\y$Vi2˟T~^Ɓnq^&OQ _#{n0$zj3ŌnXjG[;&7q7OeA1'6mƺ` 7x7yMY1o;h7hipC}%u3K@@@@@,qáĤ~;?}}a0ag 9"\c\i_ yj*?z'-9\1)y W'ɦ+_ۉ[yϘjc -9mZzKC B B`^sƳ̳|-WjNל82U 퀡Prs(t
?x)OСCC?\~ֿ`kI/L!=4)~/F>ɩ#96@˰jm"M)L#u&oE|7
w 9<
ܼMs bn
YW.~54q&j&
*r,3L|Mvg冠Nsk2I.c"A\z9u|'oum+q.{M[7a1Cu n YdN!tҞqў-r\OoNHp$1O!!!!!8!Tӌ
^ 03 ǘ _kNZcv:쭕Am<bNnm^% C OX[J#iR0yr ?堃1qvb;Io3W@gCV;Whtr !!0樟pP/1y6 3n
O xnk~ ]
5j.݂ Eݨ{]FzK WqȴhK_O]gYWBsӧIͷ;dMK
n?B_lVY8a}1j5
't<rSv#vspvsӐfѐl -4I
_|7/ơ
L7U~3DX\amE +AV<Z]K*w9ܸ+ҮfOF
a K?7{aAVVݸYΉĖ'\i 9˥-}*/y҉n%ݗq/6) :PĄB=+/3rk5?I:/B B B B B`o̸`"Ǐ,j26,V\~5Rv /%˜cd;PyHo,نϏ,aR $Gst0mGpG~;*\1Wag;v<@[y+?#1ҷ&X+\y8qs !!xnxF>ݯ~%#nixɳsɳ!sb|&?Z gsS8p/TXi+M]0~+_2ֲ?W'W <.[< z4wmz_| 9;1/̭Wi&cmb+,7o!r2+"'#Eeh\ @eq%h5H3(jRA7 LN[2cl 0oL9h0y7 gxn`n]t5 - Փ?>_"\Y9C~t.g^Z
2q
ܶ-mC,{yҷ$Ϭtp'wu]Wz{~&jrCK>Q2<ߍ kc_I1J'l;vȰ78T>31`UH0hLi|ERƏ&/+^`ϘHzpVp,?*O8k*$GV/M+_sa%U2meϙT2ָͿulN@ʣX9qY_ׇ>gz{'㠟JsuI\gWo' a;} }5F_a_bӗViK ۈ~Z$9Wl3U}
' r z
c &My*AASǬx?k p^ԩt#v!^-s_l_}Tʛld ɴU{<yjUA.:xUFk\m ߸A.}9J¹0ԵqH$
Go7ǥ0q4h7U)g [QaӇAQ^t-\tQ X8]E:Lq{^z@ K <1 WΖUMI\2j f n~9K Q:hu}rI mCU;ƻ Ä@@@@f&`c>qCMOrԤbjƨT c:z* c6z{YEMjy ߖ% AWX͍LU2%:'Xu^䌳|rKu`CZaz0s̟dU/B B <S<3}\Տ7[oux||tZ(ae8%dz<<;;oy]T8͓(n'io"~p
MU#ԍtWN|}C:vf('/ ?%w'qSUXW Q;'>S*c//`}OK8h y]6}TyL˼Zu5к]fP 7oBi@tnMg05$.NV}ȍ05zHaԪފ'?aZ>8W6q=LXiXh' 4W{_ΟEo >QцX^8ӫm zۤj?N;n۸t(G7 MJ+iW ͩ+l+zQt6@wN*{řg/va \ڣss2!!!![>}k?oԘӄ8&%[W}J߆cs&ǵ9&O+E(q5}5f&mzR&Lj*9W 3*V%^ cѕ E֍52.2:6I9= ʯL`g\@@9r \?<<e={ŭggO$?3 繿կs+m; eOK 稯b8oԇza3O S<9}v6OY:7FWuUdwa H0̱ϐ] X
s I?2J*cun0w]b.u)aM7a[?d~C5S?yp|r'_?-*<^yG";JZd`4[qTx;*EO0R㍋[rS&J|fïkD!ñʡAY@!XY4V8xvtǷn|-P7)*g9\МIK-L{̵ \9avZ W^'ҵMJ7Ozds&
'~ũ~9Eyڶ 8Mɛ_tkچvTie8B B B B B,K~\j,AcrMu]^t\N?đqiVy$ g|nONe-y~|<> 34'x8ccmqڹ
t&LVZaѷƚƿ߸\Ţ2gܭ1?+85kRK^5brTYS=V8ą@@l?sJ깴yzN{x+g'A# } ={6yyz~=óg$i7q]ui_ F߅}Ϩf?v ][8䥍3 61vԗEȠѯr8w\Dz9澕] U ˣ V}VM{s S=ᩞ\JfuW1s}Ց d߲nlȘK~ O Jѓ};-`d~YNtru:_j
@.z s1sȝtmegj(tɪ|&47m &mZ] 0]\mlWƊqҍ>.:o
]-q] kqJk nɕMu+ uo8%ݻ9j/n+qR>oi?kqdaF1?qkvk?)kH[tʒ^FhӴr ]\2+\J`?!!!!!K~*2.kۼ`ihk3 0.5^ i+ZWryYx&ȬIY?3 ݏC /nDQNy*l*]_(&jkle9J%bo+=M;.eZ)וXڤ\Zd !! mQ6l5Ǟ! (C029C~z#{w@kozV2*vyθ ׳tyUv}3| ;r>:bdXɨ~"?e!C跔Q 'vr0Ť:S_5\>QLN qҚׇ 3䚇
w,_/2qPpYR,UFm}CyسMR gJ'CTm7~] i,*`WaUFq*l0 f56akAH]9ɮV\2Soiᥧ<aRj|*pl
c\=dk]$'W<U_\ XXF/>r]:amLӯtppX.29r k[iyKݴ<0UGMW[eYzNv8.ҹ\ϮeQ7}Xج,R
M@X¦nh<mrOݸXO?X¹qtm5;*9&+x?.MwܞW\~d8؛*x5I*YGٜa~Gq۱gGcr>5kyUڗ_ɒt37|eN[Wu8B B`kki?~nZ%We%"7u: O 3c0.8Ye / /(@[zRq{~t5n8 WX
W5:8`Aef}N W /.*'~U2*V+ 6f^ھ2XZ*~Kuö.̳8ԥ'%˱ؒ-8sqԅO% J]rd*S]dg%y|ߑlm*, .ZpYUi 3U؉q:'O&GG
־ҭKCi:ПlqZGL .+] AW=mXvci 5.q#P\{C&`'?N8-i#r eoV4ԿZlqjK}MZ9m g,'!!!!! T~N]_me&m&uLW86X<c
Z3֘<9>Ƭѥ_þM
+?*c-LDj[qoA2 *9DU_2lcc:mtS'ŵW9mqNm4q!![@=J=d?N9G`$qYD7As۞G^Ϸl/Pakq~_NͳZ Ĝ)>Nu\[n^]K zҧ| \}҇+I\9aϢ,ʤ ضV媲Wc1;c^ DX aVzq}C*ڏhҙ|i~ I
] ،lI& 8ܿPS\=}o}$hgA9ICqs*
0Fŭ0`
&lTXFGTx8r8Ϳ4wV+غ!xx:wcY6FΗS/VΫLu8M7-ެ62Mi<JvcqQ| 7JF0 r4=MD8&!a2 W|ci`,mdg28ݘ?\s{57I'ZgF~G iv"=ʯcxR!aG<FΚ|1)[Ms&L d+#&Jΐ?Øȩ2c>\+)/& Y&GۉJS8Mzn f !!uj]~oVs\ ~ =<|Fﵗ{yCYTaaɬp
_uOO!C1c{Щ[% , :R֊v o}# }Vz2k3dSVZ%U>Wm.Z,m]_O>W,C8Cb%#{lOSl,6q :tmgo[U呞Lei+\}gJU.mĵ^}YrYfF=}Seft 7*d{
WNCsQV'O~c*i2AO ߖ7.S Pε他T`Lvv!r>Jۖ'&XWZ&iԎN0qݶma*0zZXVc n XNC B B B B 'Pc. øưǑ_}yFL~
&M7ǿ !@<a&Jo{0䘴5Trtu^==LZ+c>P6~@*?<Se3ޕN1W\,:3Ί;օli9q1ae4)욈2VteWT ] !!+!`3Gs<0Vz{ٜN\zVz~ɒ}^2Vr+o-qǺzhYpkV͋*4XZu(_}_OˠWOױHcNݱ>
sZז*Uneč
d\GUq]3?[sǮ \p _o2hrM;/Ղ9O5Z^ AKO~sע>JI|L @/}KCY
זIg\ķGZziWtx#c[-n O$~ 0+0yrn *u*ōKxWo_c+8ȞO=ͯd/
qZ2P =198snO6V&<[u^u=o:$8n!pYxڕmL r/.Q)W,u^͔pOp/ ~C , >ød !!!!!0@k?;|=e#qqpA&U+lhƣgZ &5yH#qkv]\c[v\B*
4t1~1AWO2;)t&013Ftאñ:I9G6^]Y"q2?e752֡dV6]C B 6 jɯz`c(R8<֩ggh[sg0#8 m-ؐyke5iV碋Yx韴a0`NVSDA" گS}}&SꜿǤ7O\}JOj/C! sʥ|"\<j#3kQS_?:\VSuLSʢNE8I?\bG%ڢ6Aҟh]lqt7O
4Bg#
G|ڼ d&NՀ
W M+s7 #d,ɷmcՐ뭆iyYS<.cřgO-B[~L^[/Njuxe2>:/ :{q6oN;SVߟ'zK!K\d#?u-v/4Nrwő^^F2' t*<IfB B B B B >ÄٜI4c|M;O#Iظ\XF7 |B6No6OV:BA'c" #SX73nȘPYY R6# d* 1^^:9_aWݷc9K&yg+nWه@@l~u_oo{;B<HwzyZO RU|}23ɟQȳY
V)9Ted8ơ~NY?q+ _U0鯔:8
;D}#ǥ~chcx,Ւ◁l)V#Gش c/uFuƞNC5珑tLIyO~'3j# ƺ^ ꇑNM2Pq* m^VNmb^G6OO7'ymTUj``Qf+B$ 3͉V;TrrTBRa4WnhmpcqSq1hD%^ C_{C**
j`Nk]t q\ hm*tQPzU oVfsse<c8+6Ʃ x[ҥX8~nɹZY7mds
R~dT cWV ezUOƅ@@@@@@ｲ_/εVo喥ossm [QOl[2QlWN< 3Y:+98iocc*3c:y cx8xބUWe*s?D,N ˿ + s !!qVA1γJL9!zv,e3J_jxfy>{6R,E<۬{~@h" }} s#rŦ80wGHx~ Sz6lsޕ^ꃕ]E? ttw9,yʻR v7VbQ >VoN uxm+y裖㯾kל>7]dKִ<k+VW:+͋tg5[YuVr*We4͉.
FUi24,ci Yz7w7FŹp+M@a!
P4N{nYn.&@,z ,2pG+>tn9Y_# wr&6?۲9)i z䁥GVSmhZ~cy[oYֿҸ^:mLDCiߜvDmwt'f%Wz\]%? c {953 5V/DXy&b7!$^]ĭ㚨11*s2t. ķN|:ONEU(Q¦vdtx qS 8Y
W~uRs$Wq!![{y='='*ܳsq I<0ǠE'|rxn{Сa AgG }tiZUdѽq^Eկhh/g #L?A\ :ƙ ,f }sڕ c?뮻WSJomEzGyl:)6# zؚG/N-"}ֺE}82] l?9s i; -Zf|<Sn33& \@We
c24i&r[
W<4:8ݰ< 9
}zk,PiS7Ye.٫EfH'aUΒsev* 2 -_q(ٓfSy 2{̭-2Tz 巜 mtri[yy|Ksi@N6<[yIÐ<7b" K :$]wJ'm"CaRX/Oyx}lc<GՏ7֎،=M76m 3o,alVyn7/| 7&1&6&QC\c~_L:;w<UA/ GI\q|
.dׄfӒÏ\!Cҫּͧ4g\@$P~}ssfQ9@gNs=g=h}
q\{ ={V'/ۺU} <rU kw'cMK >A-j_P~ zʳlJҖ
M'fwV:^^{ C6:Ǧ?m8a` _ d,G'Xk9a,-lZ746U
daӜpn";v6 J&xˣsM5v~;c% ٖDZW
Ҍe˃ ƶ^N104nu'=k漌b sob&Jv5N BN9{+< cZ7o^cF=qevctSspڋ+`T~@[!YפzLOK횪'`zȓ=M欲$,B B B B v25}:c }y{cZc [ӷd1O+.q|mÔ+{kܸckצ!o F76&RgS&(< m,fdkZKWθK]S^m m<0֦dr !!9 {ksOo5٬R{)z8V+57X~d{0yWY0EġC[ͳ믹bfXMgR~Tu8MiN~d颾;+MQ?MfW E'~Z 3-m믮Pe{Q/^nPO^m)S#\ 7>t}0-n
-L_mW%36h|%K(Ti%ҋ?n tFAJhhѹ1ATziZtmuV Өebtiu\ɥ7 aQN[s=PrXʶ|q8N:䔓3v&]iUcW"▌ڷu&Nk&݇ z?LhVS|K*'@@@@@v"PcYexl@@@YsfVVM'ۅ/o~Pkw6nϱq^ߕ$"N+s</>IfSs[ݩsv:+y{?X1,;ؘE[㰝vJa d@u&[c<pfJv-guGvL> } :4|c`<[/'M߭:+~U
g˶ b!w4%W]dv|Jjmt {Yus>p|d1J{Xڕ8[_j_Ίx/~ꯆHVV>.N[ =B B B B B "ǶbE:VYmCf,?pdXMNڛov<ޗ_)kQ:E ;0IJi7`:"y|Vf"*Q\]Vk S*ul%ol쥕ƒx7&AW^!3Um"Cm5<I$[Y}r 8uc
7,Ri&0F/˃Q
UGdҷ8/)Se*!iS=K* m ŠO2]lO;. +9>58/^$7fcUo7Pߓd/B B B B B B B B B B`0 .gg<˿ @jv^=9RY 6 }ch, N`!Zpt{dsʐ0Z_<
/׀kt lndVJ2^ds,M:ҙn\ u_ҊXgP]IW]ZJ oPp- z ˒ԓ=9d[lI?#mg+[w=qmڞճ7˿ c>!!!!!!!!!!;?? {fa @ IDATѺ<sғ[999ƶS-B ʥyp}㕋R\eʤSM|#]Pi5ooYA<͉x:pǿeiՅZ<.4y<+ ISY\gܸ(-dw=+gyҾde !,γ/c<q7C2m.nDr-S
|͡|À =zt/åÌdpoIyУ6)\ }:0 i<:W cY9X?@~"yLaAՍ*8s7^HF
YV}ַ dC̒-Ã'?**Ny cc.VE@[h 02ڎ 92/go|sͻdq+?!!b8h)n>1_ ¦94νc,W;g _7r_~w׆Evl֓OGDž@@@@@@@@@@4via9fsˌ5\i lɋ l-Ö
Wi08cYP9NZr7V qC B B B B B B B B B v&_/c,ιoڪ!b@,6ԫOܖcW7>6#zuӎevϠ=-XFC B B B B B B B B B v.sɵHl''*"$~l+E#X[7?Fᓯ>[F+{ٝtsYh "ж]ǵ_f;bB B B B B B B B B B`(㬽mN9hl-!hR[2ζ4GK#Ǜ^=4Pۦه@@@@@@@@@@4LZ㬹2JW6&+!#e
n u}lF+1q8ko2FC_/dY`6O}FE`*NJ@ ; xs,څ@@@@@@@@@@l5\u^sе/}k/v<#-%0~<.B B B B B B B B B B #`v =&s|\> X hW-B`!ڇx㰜@@@@@@@@@@y嚃n㱌@-%RC` C hjWVk C B B B B B B B B B
cyf%[C o*=+ݮ5rmj+yէ'VfS>ʅ@@@@@@@@@@;s5\1NsF&!x1.i$\aW{s JhLcW[Ex/C ֗@ 7C`&zMz(N )0!!!!!!!!!!!vIW6<!K !D`5<$ B B B B B B B B B B`j~yt>w &킁F\,@l%?rB B B B B B B B B B v2Ҧ! @( AvUz!!!!!!!!! &0iy<<)Ո)b&!j!:@@@@@@@@@%y[w|vmJԛK[H!!!!!!!!!!E dNzV\6b6Ule` C B B B B B B B B B ֗YaU@ 3!!!!!!!!!!!!!!魳gW2I7 m$g/pxΞoofw_ڵkP?N<]vek_^z_8D0 w{.袙@̟~ݾ}3#/ sיk5g[yJܙ]C4\g{O:ڴX79v}`? Ob=? =Nw'N秝'p~ h#ѣ+߿w=\tw/裏AfwM7u\pR |??u5\ I!!!!!!!!!0t{ݑ#G˃N5Қs |_?,~a]/wԙ䩓\zoMÂ]u肽ߙb<`
Ycwuvn{`NZ/M#7v ·lG%Jq? yٹ!?no?co>yw]w
otyË^AO# aov~;t&je~7{zv$.B B B B B B B B B`Zd XPݻw`| =qD˄6sW8f_#V6sgzgW_y;ݛ_w322"qB ILo ^z{뭷l{Ӌߵ^;t8$+:+\_t?ڻ{WGdcO<}'3-X΅^JC B B B B B B B B F|9T_4nXZI+E/6_N{:B_( ybyuLV݄;ＳD:
: ~U ?_~cr=|įR]-3 FbxJW^yeH>keWx!!!!!!!!!!VFL RH3(oϪ8[s☵![@ [m;àsc-cǎ
Y2
Q'?`d[n鮺1 {aKm2:02u
yIGa!VΖ5\3|5{~RYbE'a! <\}^'8t 8+[}~'u ݽ2,#UVZ [] [kkc>-֕k*Mkr !!!!!!!!!"PFZikҼ9W_#4:E9![@ [elO?tϏ2ZXU:e-3z{K. }ѡq}
Z?W/rG?` f!
yV2,'2ϊX sBs̅rPiҠyӬ-Bه%0ʱs!# X3_rOq{ ~x)l|P +݁nWLF_Xo}[VxG ?l .!!!!!!!!!畀j*4 ;sRn /!;@ ;SX W^Yʵc;3Oalbg &UdZ| go~ z{ '}oo oM5K@@@@@@@@@z--yʋ_me !s @s>%/Z:V?`X}Fx%/h;O<D_bM[6 do ;vlH#3 {u:8
- @@@@@@@@@7hlgk_[?%' <9-@ -PIQ16 /<t0t*ns#˪ٱ!a~Ý<сyì?뭘ا_X _|뭷G.5i1 waw}w75&
-H -XiQ96OC~WVGbcPe,?? 2>ݿ 2 9rdR#.nEVGȧ}@@@@@@@@@s2hQrTxWWwVUOoWB v&hwf!07XD8Wu8Ƃt.>noBfm cߔO~ҽê]qUW]5|
r }Q / o߳j[rꭴJ}@@@@@@@@@c9Js_q͛4; 7|s !@*)*"Pgu4 <x{ >Es!3<3|':YG ?{c V+u?9`Yco}{ :Թ!7 !!!!!!!!!MBvNV^wuKWUF-.,rpą@<1:OC`nV>CGaVg/Xc+]u0!o߾/{u=gnя~4&_vm ё.L8 .oɚ3e@kkYbEx3k%||Z C S$6oY
kƃ>8re7fo%Cհ; gC~{_jꫯ}m'7(!!!!!!!!!= ILk6,Vg 'VrQ _~僌}"Ϊ6&S w^zq?i `xg
.&<0Udc8g@V0C B B B B B B B B B<`=p0Bi VЊ !s @s>%> >S7b/aUl}ا ? Q7|' /ζH"iFV@@@@@@@@<KNIii hB !_{ꩧ:9K_ҏV?{ѣV :t}^>iB B B B B B B B B B B B`vP
$ j5OY(}ìLm6-Ro<yʗQX^}^9.B B B B B B B B B B B 63h7sD@~c?q[o
4[~֧7E?W^~_
qDoO81|G ~gtq ͊/OY4oƠ1Sdz%,B B B B B B B B B B B||@M@JT^~G~oX)+ >ecu<`ex[~ݱcdžߡ=ryg};oKߤe%~ Ljk
fɕO)yd$N@@@@@@@@@@@l4,!U P qӟtlE]=ݷO?~ +C,#ձ <xp0O>9jypP{7kfg~m}&y!/ ~떑֊Yjo
8@@@@@@@@@@@gbMS V{jUO۷o02w}
zwF{g0̾ ۧz=۫jIc܇ zh MG MW%Q(6_<<e$ˆVZI{a>%,$7`'x{AwRi~ V
i !!!!!!!!!!!@ _l,?X}&sǏ >GwWzNH1n$[O1 8pWV1I !!!!!!!!!!!A B R)f@@@@@@@@@@@@'.8&Μ !AO~7n]{3NN۟vԩx 9I!!!!!!!!!!]]kn vt{!ytY
L5{N6 ].UhNbX:kdAi5dۆ ,P[[0lO??e;q?uNt 1؞N8O!!!!!!!!!!!02wOo
H{ ΅hs^ o&sxox0j J'F%^0(VL }9ދ w|
{ . [ C g
epV7Hd`
TZ 3O J]J ۋ@dTulo-cmfa袋d*9ه@@@@@@@@@@@@l<~ jr_˴7$YWKB ήš u<Wx/^\@@@@@@@@@@@%pЮkrYFy[vX$kl@@@@@@@@@@@@@@K`!Z"OKY@@@@@@@@@@@@#F~kdUMJ!!!!!!!!!!!!!Yʷ]
*! 9,@;Gn!!!!!!!!!!!!!;@ ;S%Nn!!!!!!!!!!!!!;@ ;S%wcKn!!!!!!!!!!!!3g]v:DX蟸 ]L~!1Ю H
'pĉɓ';{'O:5a{ ۷[)
_tR<N٫u<OZM.gb=w@@@@@@@@@@@, '| ;v{kkb,l16nF-E]۷SYFO?th = h^xaw/.7٭|kC B B B B B B B B B B B &hYLF+f_2+63~Y m饗e# <aC9ŏ%=03_r%s> %nu>~>*=y@@@@@@@@@@@l_V2F2J2 Qi7cc}20NsǏ X2ζ囖.[@ ggݬnhϜ>ugNw|W ݝξ!Y+$z@@@@@@@@@@@ZN3P
*'
c\0fU6Z{C檼LimY/'e+imF >Q}~w3 9jv.3.ߤ`>6_DW5&7
scȷZopt G Jҍ4B B B B B B B B B B B`({rd q7fC`SS]۴ j'Mmbҝ~p;ݙzgzvw']nϕݗܝ5Uά0WT_ˇowc綾^~^z7>vckR~8|5 o+S^{m0tMk䙸!!!!!!!!!!!ۛ${.qJUl N };ֳwgFJY{ w݉O }{ݞ뺋v |}QwǚW\q9+QQ^o{uCwku^UZJ7>z9qЍn6JaO?w}rtȑ#ÒkvqY⒗}@@@@@@@@@@@@lf[@{㷺7>ݝ9Yֻ/vgF3>7O'_Uo{Ӄ]H{V fe@m
W^y`,tRaRqny!
#hk_{Wlŕ/0+n[yw]v`dϷ1k>}7C/j|۸m0PO 'xW:7>q!!!!!!!!!!!!!U li`d}7ξ`|Tnץ
1u7 ^x0b? {;]Fqwxo<hwfw]1u縂4YV-& C W]uհ5PJ/oqXuZg[~6PYo}!:YJ e>_|qHs72z(#/ YC4'=>oR m\VߖUGϝlŀ1~gd !!!!!!!!!!E|z\%0ݺyu>٩݉O+g鍳O{K+b(^ߛh{K`|xGw7vGN _u{;}Ծxݙ we 1 <8jDFm
><ShKF#on@ʸJ; <:;VMjZ \#:Isɮ
OҳeI,<̐ﭷ%K~8Irk7 xD.)s@@@@@@@@@%[HS?ؼ;o>ѯWg~g
鍷1koo(ev'յg^O _]{;y7ݞo^y6ߧܬZΜ32$2tN2c7tj[2}B1^ &ߊʓLwy{7 ׆ 3 #~Scǎ
ci]Z=[~'/ǎ3c13]'9eNuUwVH[
!!!!!!!!!!i6I!vWok{b~랫%㬰Su ~v_v.k/LS.m۵ n7;>kt:9j/ cO26ZY )1 9rþ UUVJX[UmeɠX:W2ܜKoLt>:2nȭ<d3ξKؑ ._xA߱\2 flFD<Pn֯˟
cm,aq@ߤ:\ m_iz؏'5kޫn8ۇٓ;ǃ_kH{io=;/M{Go
߮7)ju3r~RC߅usdo?Lչnd 0ڷyNS YVJǿ ={a4nzӆRG&cձG6-Viq !!!!!!!!!!;9w,b7J[, cS|6_lUW*rrnE9m-RxrXWV֬Q͊ ¶/ʞ
~[bϾ{5ݮz`too?ߝ:w:r|anw|1edO&mvwCz}}!ѣQ̧5J
W_ nb dZ*M]`Ӝ`-#hӃ
JU9a~V9_$>CMK! zc.= B B B B B B B B B B B N0 Xg}ԜW> <x{衇QG 瞥j8l𪫮ZI#l+)[J ~]K9eÇ[_K٫CIkUֱ]MH|mM̾flkj-TԶq[|hvbkw`Hv~5=Clׇ|G=~gvw=ro9Qu{c{}K,o`-o uc1j=c*-']h {Ĺzsmd[V|^ya!ˣ ^'UowAHGKfKRaxV3SM ͼ;;wy{' vFZA׳ X%\Zƾ {l0I?o}ko
x5\F=Κ<D nơ +EyO=`(g#wNUHg}v0Ou_v )i-T,],ZА<6 {n8fHfbgўB) ~3ɳI&n7l gv:9
L 7\17m?;<v_7
Ecٻ7=<g $ը8X-$ =?s%$ǒM˪XD[s~xw ^3̩<i9gjֈk<P KA)-cԌD(c.s]{Π<CMX4*\y >C<-quͿ)]^Ϝ=gI m&~gn&@A @A @A 0>oL 0N @" O}Sø^giz{饗gb0nsBG}39q' 4`ztZ[v}LGn쮺<x0?Ļ<?dQ ^spwZ*
/˃.l,,{a=SKc
57txr3g^>';е"@n|G^; + 6a;CmPx dm_5^[%մQ4XVU?3JJ
jU-2
_|+њ]bҟH/_Ң `]"'41iR <Z" ^rsA @A @A 9ڍg?H5c R֊L}R.ؾz[@Yu[8s=8#- blD /]mNtJE N ;|=#un [%jm1{p8yqAx¯x
SUpG%Ip$A?wr]Ĭ< Jքe{[ [ξ N^0|;vf3smOsmmmi9p͞~͞|zJַ<n7.$oצ6s-vbCիկ
Z^JH\lm7|ٻ*(=4 HR{HO)
X)~3t9-q<S@[V
+tU0aVaPa@A @A @A ;#`|݁p3UYil W
׀EX=͘?醠xcܺ7M p'lH+}+յvđvpvX'x]rkr_]{ۑNnG`cU퉽I)[I'? lq,zqFV:N?G Z]|g>>˵=s=Cwq|ۅm_Mp }]|3/V[F9t zoçշ] :fX ؾvR~w|; v~l4uP ,BV!`JcQ4 J*NqQh?t *` *ZiR36F+"]pA*m] !n3$
{$?FHp"A @A @A Cq[Z˰6䭀EځpEҺg>!ó xC>5ޏwxg,/|yrZsBKn O< :ea|mx*khJhKo]L#h
VD* ;s]罌E" ', ]q s5~O
N
ob} nH> +DAg }%C}uO
Ovu͜x ߂][m ҵ^^OW;Wq { .Q"JXdPEVN=76pRY
])r){ X*l 1H'h¯0l?iBZF[9H㺶n'θ A @A @A 6G / @![xU^z4*GU s5K5w 6ݽ"o,_7Cz?ܙv/ޯ//ǎ:^}v?p'"^MVVnY'|H['__ N{ϰFz'&X;EW~q7/RYL%oHc~qϵtYH/w9m_WΝD[voo Wk}Ne}+Y wkKmm6t%fN}Ok!)(M)xN
!KJ_! b֊\/
/J>bW8V\6QT烇;nq38 Seܕͼ3d!C$ @A @A @pS0FoE+<C(w??$l?.NDxVY5.NcˍkZ#܅틟}:q|m3dO>h{ 헯X^jO?X;05!_|qX -v>=\{gg3!E"j
=bow|:E
V|^Sc&J ~Ivh}E>f/woU-h?--Kqi'_|lԟٹg6?{,G8RRĢH)`VR; HP|q،S|%`Q*J*2m'lV?2y3 (`8 sΌV-
~&ӻYܹ @A @A @A LG<CX Vc\
|P3No j ?au/<řةS?j\vZ _gk'V/^N ? CJZ 6Eկl+K퉾v;E涉vޗ[`'1
L Tp?ZQ q)nS03Ix"qy3 .pq[>n|//zHwpCewJ|]o};Ŷ|6sSoWj_~(v^<V*FL,/%NxVX[3Bī0m' !ϭ.(BHNd+aVH?F1)fZ LwaXB
R[uZ /r?\_A @A @A 0>O~2l o!Ƭ1}c1GS qAzfu&![;f6p G"3g rnWH* = Z[ ؔ=Rr0cxXwh'g7r0w@#{+' ;A" u)BRYD^=}y+MJ)
o^{ ^-ڇm|v/۲'g{-ʶWv*~7ٷ3;?|sW N6JWPD
U8SXn>(܄cBv\ C֖\ܮ-a{fHTJP㙂R~*<08CNU%HjX
3'@$+Lac)#m @A @A @A#`<ؾ1wc:c_җn}_{0f̳듟@ ?wb--9Z+˿pJZsQ쫆W*ؾSLxJ;Wn-ȡO>N: }DZlSJ"ӈ.7pV~2ޥV{*wI{Ỹ24:yE_F7?ũM> k D'j|-_l?2ֿծU'r7nn3 i lJࢤQ1q0rcB
Jy+lʊDZ`(M3ⶔ
D^ԭ 3FyftUsV#ZX텷HV aV+ܜ@A @A @A !`8nqv s?ϵ+EV>he WA(..8 xvϴwϝo?ًP'M{v b"=?0vhyN[= | ,ӟ<M @ IDATO!\ )?r Ɏ44
pd`*]$;>g[&[k0R%f$xRyw])l_Йv:_y* 8<3'N+5
I'ݏsS0?y-l(Ha
09ÊPp@|*</-HҚfY/e~KV
l w^d.CuOZYk^3g= @A @A @G 1 ta, 1d[c~#p E6t Wۤc;)CX=k #_2GZ xyGSt6wη??=ΛzS(MȻC>sC:aY~_ xɰ"~@鯴x\i[i- > ?4)_:w L{ |[[Vǵj}t}kپßj3 Gb7(פ2nǯ f0d2lZJNQ0CN~/(^X B+n0m-# ܛw2+ jbiQ`<+bҟ
jDC:=-LHZ,Y#A @A @A tֆ1k
t'EMvS00n_+)[=ks\ ӶRW^i/; ~ݱ0se=|tgζW~z[YX% \[loN;uX;|}XPϊOX ]=SXN/gyfX:
{T:og<a'i3]yZWdDcǿVn\n_dP㏷'f<#|b#4nq>KFFa'Zg²HTn0jYd8ƿwgt֊k?,8Бv"
͍_rsA @A @A ]~ؽk:-BW6=CYeL,1"ЊYC>t+_J;{@}_ oZ_ c ރᩓ:Ю~v؉'6Mֵ띜=,~- |q Ȥ ϝ;wsw=9aeЈY<E}HPaY
SnTx7^+qV<ccit;d)
7nτimvg/\
63vkkKW L̑Sm/tB>EU8n'R]8
9Mʏ0jo3 wMg|!_
˹乞+X3F~ @A @A @/1cǎNqv/@!泈 F쾉C!\r_V_ׇg+C^:3grV܈7i}ol'nQ lC O<~O_|}bNҞj:v(啵vڻv> $|L
;{ 0 +Bb:\w s+XL u܌]WkmysD¢yF_žS+ 8"+vtˏ"zM
'Y:GAˏ_0 m`s=Vq bHN,}smg;a턱 7[[naN /@A @A @A EjudLm au)f%]8nE!jpVq"GӟZUYkdUgN<3O_y7.<]JgjnXV~O?WnAʧw +$f#AzgRi~s7â;ҭ~ W\V8
YnറR3anz1RiC^Cn6sd;ʍ=IWvsC/;߫/:
A @A @A _V"ju?뺐*ЪI䜕3&H"EU}97NŻևOw N~Rؙd#O :3eVpjw? sv^^+P̟ww[:QτxpifeoTW=O|-/]k^ mt6_n@ =>uIAA @A @J9Ty+BHq0Hz^a ~O< g;7N ?ֿC{tX1{_k@>0S;c\& Qq s0'OƵ=G;{6xI|m{/u7I Go>V$
v;H +n@A vP ǽ@3aoR?oB"Ϭ F`f}nݿ=rP;zHэ ?.wrwAl060=V }vvo2͞D[x?@A>"xݍH o<%A u|kiqqqHA~"ݶH wJvl
A}D:O> {c1[gA fYBf_$ AwygJmsg_q@rڵ? F$(wN>< oAGL{뭷.@w%h$:1;w3HA $f/,,OtA`KKK-ʽ 5䬲'@_(k껁)o ^!PcU 'kpQMxA @`=!fA 0P A`g PX睑"@ʝ @.T ^E`vf,
A @A @A @A 4B7 @A @A @A gAg_m2@A @A @A -,gN<A @A @A @DcvvkknnnpvOM ; z$Z1N
@A @A @A 6A`*⪈{ $~{yynXXX߸qcSwy7@ ^s74 @A @A @A |0ɥ:2uiuM\)[V 8 >e$CpW"PzA:!h HA @A @A @GXEE"%E);&i苤NǑ#GTG mW^ H]8"{K wҋA. @A @A @A l"_m@TY[lEz| ~F+ck;:ߢb
atݩcIuA @A @A "`_ZIWNeENUAv=Ńp~A T@@\L@A @A @`Uu\ddY)w{nOo#6
A zΟ?~[o
ߙ; z# 3Īauҥ6[z]F2@A @A @A`"pO Z3Xq7V'IA#Mbgqͣ\Y]~loȤnC K/^x
28qD'>Ѿ/G }t+}{myy}ӟn?l{ @A A`uujڷ> +{yqq]reOL6כSO=Վ ;v+J}_WN>}^H;Ν;7L6&RMX]laO~rn܍xG {_7zhُ}cK]3' vE+GW^ ;ȑ#k
`¾JyeGg'$ ^f u3% <lZ]k3ȧ)r+7elb gRwJzŽ Y]YmkeK++նݭkFo&7/پ 7n }
/7xnN<.\^~塓zԩab@
A 0cV 9 @"g+A!Ϳ7ѣq*K!B mEo
$8@;_eԧ>վo܊SLZ/ L:-$QO/~wwoSÅ0ofHp^h7 9 p !1/ｖU8c=,Ѥ ~ - 5я~Ծ~Cáp草%X653M`~i"_cS:mAoy [ FƨؔpoC<?OOeggo @؍3V3}6Q/pj`v#:Is'l,!g
[I>aF_}6 laD S@Ʊղ< >ly##|̙q\]5u$5
8m΅:UTXt_IʋIXʽ:NiV8)
VGt6
3|K ;Թzs Pduz U!={vz0c`GÞjUzIerS_7~r7mu¤+i
NUu_69 ؛ fJ&cX
ګk>(UU[ #nI];X8i~7xer@ Q"/[+Bi2
t[~sP߃rv E.i*q/~1/ #A6yƎvZ}`P~+I wU8!pKWaigX A8-i~rok-݁[m+е Ժ_:(lG =c5#\}IPoa#-} W: YʇIwc63w%ZXC ծ. ŃTuL|˝PBiWgx/{>))7>I @
39; Zވy<#ly7v0voY!}Z#f{muy~rt}e~1yj븚ed2 N>;VfFv>3̭ƴƺƻtan0ӑ04vuD/6+u5uDE ' n+-AJN%-:m@\u"*
ҜA)}_&2 ?#Eбۿ п}s
mQ%AC CPΗ=+"PwߪV__9_r7u
s>̥21ggC5vLQk%?mp, ڀ>ڢl&tKm 6DnѶ5Q.ݮ''"h h Ļ?&ǣ~O
Wg{N{LՏ]9q:6"ĆIѶzO >䕕*pؠCƽU&x3}1
ۖ?? C)la_}J~+ד[iz R;nC j")=w£?꠫O?S51_/!D1Qsy{D8W ^Aqi, y.."^v,d_8V_0 Ía!j+p*z A VA[ ئܕv}W m
A[&ſ2N2m4|z#Nn|yIݫ!u"cGm]kFFƳF7"W#V'`, 2k+ Z W|V#Z<ͺX:!pЩ-? i\h9tD4[ g~W2 KNE(s_ |;"~qUDtr L+!D Ju rV!gϞ tjo&N>=N
#=
&2]]?WAI?pEag?sCr2n="
UG܉ p`U [x-vr)E.)'Y~d`kG* [] :nD]yF
b
ZYsLΖ[ cgC}h'HÏdO^xa o]&MҨcqp6߰NyيFٌ4 +wF;紶wYB$suN o뱰og|?K={fq_uKߵ'V/;J glԦEt? Qgi
d>N6m./Jo O} A %)A2xRۋV +zd/A %!17rcloTzukh;I۴3l/F 9B@GBXkFuF-g<Ө xmvCnt 4mu\tt&u.u|}|ar,\::^Z9>
rữ! 9Ӏ::3V8(h ['[b g@K ɫ3Qw`:txIVS D{{uGzst̥gc0[y$
ؔX@؎A% ;5` ;5;=1c&r[KPO2JH[SHoҫR x4A9A`<"=O<:^Z\\#A F@>؎C[WL
A=nؙ;66QRmUæu_4iվՎ /+OڱD@T**O'L"met18ES9L"cStp?v6ئ X9^" z N&{C{ }y
if7y%
Õ%5QD iJ .=#Pe~'Qywd2Mi UBӘM F]`{WԄB+YMb\~#l?{&Av(m;z%MIoPkK:dpR~
})d:XdPskB,OBR 0_{{F*:⻋} _ܺ{9}/nH5 n74}v}~ O+[ 4kfn
!҈A=P:Vj4kdkkX;h[ͪӈp!\Gvqxw|π4<7t&tx7\ :5Ӡϸc65T! V6}_ O:t~*bp(\raAXcoBۢΔ<P[js@:gϞ )%:#a/0::7:] #&E^ D `lUc6 * J-oɪLTbw61uzG K6pE[V ת^d,3%_cBg< G%*) * l~X?\nG]ٛ6:]9sfHE}]m^~ܯɒ ګl:[W>E١ OMNaڽ*5g( +W^?U$8.^mp͝w" ALN&OWp2s(3tUNM!n&l;x,OWĥߋPr0z-LS(Ү]&cBuVu2Voۢ\Z3/BlAa7ilzS?8n7UzMP{X
w5闾Vkg'e(Ss$iL2V7Wz* &7:*}c/mtMM8UmmL~pqGA3Tbz&0ԃuX<[? A AtmiV{! ljޭh@m3hw4.\v
c
g @i1ut6 P;:E:[Ytr</y A0T
|QљF
O@G@W[缷7 t 1/0;V ,sg' \jk,H'wA`{X2H'43EfuF qur ɺ[ĥ~Q$#V+&n5q˓_7a`s-Vye lA(| J䱈$$f~BM*7!lN[I,[]0gڭܱSj?a#hюe*Qv7F? keU.h+͕Y?iEJfewUdPZyTi&X
$>i)bC4o`_ P"6՟ D;db[^>:.- ?v]qk/6 QlVؕ6~ܯճve69A] !m[س{' svVn VQH{dspDy(/sC0כlgyڡq˥˄Qpp]Cw^/M&H/#ک 6]&%H?zH=5sMa8?^i^,ĪɟTZII&[0@{h>Dfz}}g9! 6EB
jOz`aݸ[zqϯN1?v;LZz :
%5HfGǴ iVG', T
|ԁ)f8a&]
=0 J7muoE|[:tTތc-f/#x+LD
N& Cuz cЅ)tZa7 `cXط I٢{RgΜlYS
1[b0MP.Hˀ4 ip1ʉC:3u18ƽ5zN "mcs`Gh"@\e rR-)w.2}jwYer",m٧Akme47!CDl[H2CdIbg\8&4GA_"f[A< ΛX#h?L zJEW>XIgNݧ @,lD8< qxcwĎؽv=XY
1偰2JJωxCވ}[ .Ҹ NG_Lfv^PN)3wBJƘ5w6AN=o~=Pro Nٹ);MeϔŞ 5_[ZLQ(wM^:[+ _|l,<(5.3N7⠫O N0Oȗ++[h?qiK+3qA A+kkޏ
0$A ݉ GYUWQ@M5b555u
s90͝45u15ἕl؟8 w© H!]pƾU::=Sc 3VXt$ى{_٥Mٺ <RC::V"j e+:&lhѵg0`؞șKج2}|3 E^[f)b](}c;0'ܨC K}aJ k@6*=6Gc` IkPL ed+^Q\G&([G/7!h Ŝ@Am+}2v{Q^T@9M`HO~Legΐ5mLkrp1aP~lV+گZ$UFů4e2{mQV{T2kiѷ(l|<w;` A;
y=C2u)Tg bCȝ1Rkzaܪ_Ƶdw{}rW.G;ȏx*sLP wQʖ"?%ȽtHC[Y ܔoѻ~gtPYL#(ܙ]ǟ0w]v =OzEou,7> ]:t=JgrCwwgvJ{YR[m#Li#R[]-| A V)A[AH@
W1CLg 6t
\h pvg"
yR
JK' Q
U:ĵ8 tw"
ɿn N0"{ FGwNf:(#%@Atƹcl
GuPD pvXGo?~5 a)*152 6VǘăB]97ELSOs qW[<9Ýp)MJ;j#A 7bl'?Wok/j'\eIٮ^ȿUG OH
`נvg+QmlNhH 9d^[<ƕe8[u7ϔ7JVDv|sgg8E [ҏ4
RDMlk{&z5)fN]tF"l7N4)&~vln,dlOܸ.bMzE*}rm{P$)CEH5|N"0f+f!l{ ;ߞ_ًF(jOq$n)# 4h Te(azl]P'\8>zBrV ݑ>mQzSRmՒ"haBzK/"<hM:.A: ;z,pu۷w^F@QH i uJKdv͛"A tY|TB~5 "VCld7GvjY H ^:En' Wch'L䬸ƽ(϶+xבVV:I|po/"L^uZtt.~`<9ת_HUxV{&F_
A߬^3"Lq tf$Jm}FGuf A6oz7ojvgIϤg0X4taq~vD:L(Ea L ʂ*Ge @vQK2G2~Wޤ{w
NFlR~܆eKl 360,E*'Q٣vos J!^xa(Ӥנl (>GNJ3FCz
7 C 7u%]Vwk:M]"Yw BoJ~]:O
H9k;npO0GyvMT [;C:v ]~YY(le.-]~a xm~|LsN(`Ko/~,~1 w^Y< ~A:Kz0)]%~C%! X&'
*Ml6bcqyڝ"i݈O)_MqokzSى67NjVv"} 5{G@/Eݘ1A1LA FA& Y) ƻYN
ߍƬ::
u8u64u>o :1xfPHcoIn :-il K:9zzuH5.9(y2@ UsOIG 3kZgTbئt:tkAHMR\f
szIZqzr6G 06h ̮5ZحAGgvٱi6ZoamWͬv_ >8+ P ( )F+gqOyzW9_ k #)}&2N٠AsDk=gkUx7 5PT Sh|+I& jK6-{WBy'" _ZEF*K[,rT"΅rr 8\_J'+bgէ?h ߞ#x2kxN>sPOsSZ{C<~&Ni flO<l]JgW:W9 e2<ؓl&k}[q#
ڤ-e6e wx` :tlT[zß;:M wd[~[.> 4:m8ȏ0.֤79*<hwE䬱(lf
OkYȇE7č h'wNg.>l?͐ x A 4
29#tհ6 A7!t\r_Z'Sͯ: ::)g8XԠNl5{::CHV
6iUXOX^ ᙎ \ .7:B~mkU&O
{3{aԚ͏W[H<WH\&KKE@x/&b|RV+ԏ~.asIwu/e_ )|o
h-rDWF}F @=V vX.R~ [CB>s5Njww<Vq+
#|R(S } 7y$.ev5, gzAev2G١.>GφNS{VBYf\ȟvҬ=鷾Ml6r6qZaSm $ 'kcmA` }WtlZ;l ik"<}_v@U_ª3cGڴٗ:ڪY0[`=s_8u'U>CH2lYY#/)77MomcS7} ;-z\\̻F^WH9NȏrXt.t٘xJx_=v.lDit9J:>enh+ r'D~qڷQ"l+| =W?=ΕNI El?϶F֮罼>ܠ+M=*
k] 6b;++IZ vfkXpPס4VbAd
^
j@!65LZ@=S1
s
~Mu2e Y i^NNgV"EX:K:jLHΓ9I1ؔ;&:]:v G6l8h16A?E:: zdBA'&;:p蛁Y6];&?_P )M`k l'}3ˮ-{v60{68 0PzSUi.nG+o
M_D [oDKVʨӕI&q`SG@ /b۲3KrJ9ew'2D,C(2ABbpRci?@CٷO<u35Q{{:6*τ]}ohժ"E'[9W*L42&O:w./
P]JՑtL?6~"1) ~&#܊YlX],^6&
dH[D|"q >66-8M!c!`a{_ՇW5~wQrd60+egΜޟ1proǽr^3C~Eu1aCaӽSQ/RzZڕ&;iT?'dN[MGg¤l-ƘQ~Kv(nu#~G><w&(͟9
J\ vtFNb
h6:-έ<OaL
h-iƺD:4MYiLｃNO `LntHu*~on DA'ـN<=_0)fW: rwPMNG] t#崲 F@d` (4 f Op / uٸ,F9@G9W=C WZ+=
mظU/ʿD{RfHU2VIJ){"A lkmGL2hȄCm v
`-;+C϶ٴ8vxƆ & qh)la*?)AZǽJr@4)ln`^^ a D!<yV1Θ@OWHvhO{d$czOE;& J龸\IAY"6^WLf<qNL<O6 :v
Wq'^{&rlQ W|&9\gbĉHS~I2c3L|wk"N@ͭ -Qz3mDzGLVfn;'78ц+ڠiՆ gVʒ;̝V>1}CcC5_4=bq><6rχ@c7S iw A 5B7 FC'AC^Nƻ
t K nt64'IUnGseANx4`RJN Fu$
"A L
zk`șygwh҉$v3DA` &0fpIY eju:`@$h@{ F6lp!
Ԗ!N$xQ7o ?ʋ Toʩ10(c-ln^"l+M<\}S97Yl 6cv'S. "F
fTF-AhS# [ۥkO ;ޮhs(;]ҥ< D9 1!_[DVe3 ԅoy{#N؈HM:H$;[hg7:i".rZ^_BwH]*cc+oG;u9Q#ؕٶ zNZ? @ IDATQ:4J l! uln"˕ V/ 2m>w3`4n'{эr̈́ G#r5*1^kW읚[
g;lRKV7<Va*g# SgE]LUl w&<#ڐe'mƎ A0 ݮ&Jڧlt; `cҭ{/ޛTytA ݊{5IwA ht:}S@NƷU
PHlq3=0tu(ulu"9P#J c
"yβ{ 2SWA $% "Gg:!1 2@GGo fO9Z` HevD<҆%pP|g N>3D)G4ܨ^Si&MEԪq} X&bDe?Qՠ vnj<Mkc #m݈!SI8 7[ܓ ~V)'[+/E(A٦a+W<s~GtMG@!vmO7D:Iozo/.đ Cr?¡t! mI-Wa5kŮ{ bP Q3?n؊"l֮&?h"H&F 3yѧjy wO?G gm; `e0Hx2klA\y t:(jG'3>vO`0A,e-
:,ӄGcp',~S=cʿ&lB[>[WyO 3
A`7"n|kIsA`!ã3oƷFh "A"3Z%q&F)a%W,ot#
"MvHOA FU(^ w\O
;~XC6i퇱C[Qw mi"A
XiI M`7wZU lWli):[# uʵIfǃ~Ɏ"AN˙N:&Tq4-n8F&:7G~_1[ l8FdiK5}?[6MB@R"v Hȗ;q[mxaiwUd=ϬEҍIUnUYZ[*J\4)l`E&^0K [.3L~uĕg=R' '|ҽ 0I2pꞲn m;MճVr_~L>ϐFm>ﻈo5e7=tSzMJn1*/{iַ5 q/ I;C蛸=xƝ< f8J )7aY%~Wl w ^> B @uVc^FC\uJ :[u ͨ˿ˡ3#iPI?ܥAR&>HFT6MXqtI'ѧ|wE}7oe$`QH;;K?oc~EX-A0rAFF8M5C E@
DX*ߖVK"Qe+Jk\OtS } ϥX#Mg
_a!
q54.A*g
'z
GAaּ~sCwIcF[xovo J;tJV;+_y?HX+ C<=d1aLCXcFzGG 0<_s/
ܛxm/[}?A @ڝ >B@ u(+nW @A zH dXQȦ7^ݍ챲N>M'rc2 adVVV>~կ0AEn#LCv ܛ|7|jZVBwM 9mWmQ72- KVBow+[IhvE ;z].݆!h%;iWec{f~fz @A !df5ٷy>` %Y A @wD`x =AD1 . D`H5C iw>z[/+7 fowV`Hޕѽ v@A =jfTG@A @A @}v g[{B;uo;跦\Yno_ZN~<q <0.-/hחֆհ "Zavw뜃@A ݆ B6n{kIoA @A @-*O<|}~5ȿxzpu-[$~Ǐ# 3ն\^ >>1vv /];=ktu4 @A @A @A 'h( i]YZm}ir}ye PmI|}B;~h@ :箮 zjDtvu}y]z@Z['"9@A @A @A E`_^ge6ūo^:"N-;zБ
پmak<^}F[n^zgCZD O i':{e+r'hs-*}QFA @A @A 8qYﺿw,Ws!Iэ-7- f{~ON, tlc'sjWʞ> Nڞ
rxmyxZUzxZgtb'Dt[<
A @A @A !`څiRޏǹ6; LBJe ߮p|;wBNd 7W.\뻣.Ew; Fb ;~<zq_i}Ez
;> #}c9,-7X:A .ho_ю<>_\{āf 0ֻ?X+/(n߮9 @A @A @A#`w: b7ff;/2;7?_5 ځEh$5nr =O"=?9C]~sեncxyvxܓ'ӏ sIEv<rp$6uyщ['Xx7.t?{oo|c{8ե-~ x@A @A @A c9!}fo ^*#IVXfwuk++miZ[xh;Wn&o,~_j+]қy]br?; }z;UAWηg z
{<L;wkSe/m {c- 9~<2No^|vM;Uג @A @A @A#@W<c(VDg[$} (fJk+7ک6>?9-n7/ly#_.{o 0VNxP_p9?gݾ"h7{3ϊ^*]dZ|{^@k&`ya~a}va]7@A @A @A xژ;l?6I)ʷ<T߷/ <oTzsl[^[$b:
!;K A{?}jԍq>emk8؎ uoiǎ ^w"wcJ9Y* @A @A @{ y7: Aމ 9UVZ˶ԉtf*Akf\XbQȱ}l7vma3
>hU8ߗϯt @A @A @A |to_{`wܻ}^W>#h7fS[}_}u}&a [ڋo]kK7C6d_5'ݍ>cXu;*A @A @A @A i;v;1~B;`껋W^ -''N l Н Vf> @A @A @A ֊پ&vgf7ɃЁvr{r[fggoɍ;'ډsÙ~{{v3+A _P ,--/W `˽ͶEpG: A`7#27W\i9+I{ m ;]pa6I Տׯ_P$; 5] >|J;./-']kWWo7./}cn]/xt ~_<@ מ P XK.&YA E @ A ouBoD A ; ;
%}A`w" ZXW;!˷kڍvuiecGיNo 嶴~ז /wbvuui+@Z{?<@ $0$A`G!z IL9 ;9;U$!w@ z8y %QǷ9-Em^Yjk}Bt~xR}+hom\p㦻mliu~9 /sss< -Ԏ =-w{IR^FN]k mHA~"1AT ;N~ID?SpV۰ 9Hkz溤t7Ӝz.%gzg>>J<p㳛]_pq^B sW rD ˭qn)[ GJ F7復fݩ+<)FA Y4ɓ'ذڳ $cA`!cWǎ @z/IJܸ?s@hD@ aQAj;q&{6 'a& p?P$ݎ i'憅dâ>F9s3\bp` @8o2< n%"f~DvJ9^zps{I ȱةK09wೝ}W$ÑCsv/Z:}Gہ|RygSI0z ol|&9nWֻa}Cn]A {7Du /
ƶ8>A q=ۧ`3 ,s/NG`RWS?7G?w N- hO >fϵmѹ~̶ {
f[ummc kf:669ɷ"SG X< RߕkKCyn nHrX;||k;}`{ڹ}guO@n">ul'O=|`;qd]\\j/t-vu}S k?Ql'>ګ^iG j_ۅo cN rfa'f l<bu;b> zЁOtb67[n-lSI
f/C< @A @A @A& ;މt؛k;zo3~lO J VuV"Woܚ%E4ז~<2 94IjW:sC~~J{VގbnD壝<cz'//l+`=/t`@?Nt t"vyt_IWvsZ;Nկ ֖|}{<vpÝb'op d#'bhOj Wڣ'>u|x5ty7 7mi]#h sO ןϋZ+Y~ >uJ_Ri|ĞvOd. @A @A @o V:vfV +,;ox@]dKWn;O ?Է]갪
W\'lC3Xm ?z` e S!i;on'+<Po/@"鿹E:fjA3 ;Ԯ\_mW;%huP=1 fr':z7V++D~tvڍn'Bt2xAz+>o>vcz;W؞[ |'w]W/7_ 9~p~{G=?+rK?6"Dw8zv}eNvz;Ws +u A ?ԉ=h~µpGTf!hM@A @A @A } stH0DXh흥vmjΠvn3m=R?m]g|zs}Bx?Ƃ to0;{{ba:=d",f@fEfr'@3J㇯^+L' 9Ҟk0}bڳm߷(z}iXqj[c/6ބuXCGr_|Z_6E^N<y@\n:y;+t7: Vǽx*}}fu YjlɃAq&Jթɧx+\MRm9!eG5Y%8 1i.n
n$ƚz|WcU-y"- 3.i 2r`G!\f2wlh0 eFJ@$ H@$ H@$sbd裣!
8VNČ́P[(v`l$kirLI YގW~V_8Q"㣨q}6f2XFv*aĹ?p.9B%Czc'1{ə`5 L {:ߣE4E^
, <2x ;LXƃcƫ!2p*~dYb2kՙj"f.T&2h,cR,?AfVlXyWu9 E"coXzǶa,sP(XΘr;^L=-̹n5
ݚK$ H@$ H@$ %]Lz,BH`
o`F˷L:
`bf$x,87'O*RѰsl"ߍo O=>Hy,ˬr1km뫦C@en { L QC;lRf~ ;GvDzM
Xs*LJ0cYs,#K,ٽ<Wb-f:o{5?hW؋=D\7f\ _pLyo""GTr0wC;bfR 01qfReu S>Hpo'ho*@Uib$ H@$ H@$ H@6KDzr쥘8 "Cfc 6ؿ\Mh6 \X* خD(3dWg"-ǟ|{u`3#GcdqC12Qjf*Ĺk! څrfBdg4}t_v
Vg]Fm&-{b8U<9 ߔ .NW9}:߮71Rf P̨-yCLۡXz|d%_{<bps:߾ 3uB ٯlWq^luwp[r8P:,3E5>aΦp2A#EVEHK$B2zqz#ƭm7i$ H@$ H@$ Hg
֘86 Z!1ru>k]+~
DoF[7@$./f6y/ =PfS·G|FmteLy7gZ9f6MwZԛ*נŵUj
V\A< ѽcG!22+!` aj[|C! _>W}K%?[9{:w\+
TG2#7yBd/_%v!Nlٚ!x,V'KAB?z{4XD2z)kRH {;3g_( |+9i{7xPm7i$ H@$ H@$ H' p_|61o)4f` am,χ"I ˪dONϭrE\!*-1k%9 nh;s
!@GpuG"̈́Ȳ#$: 3L'bX۱W/qDEDeaTDڕ0b}ԕkbpXuJ7fY"CDdGoGlU?a(S؛ D>!Ά+f"_٭ċsWW݄_oT(n9LRn$F %ܙH' k7n]& H@$ H@$ H@@O@B$E3: Y!}:K 8VTb2a ǵf"D68XŊV,YK Qk "B,lfP ͭ;O_5 (3oS$}Q)#ݓ{WZ7A3aclX.:`O<g:ߡ]
lXgb Bz9? vKD-aq%쐇/LU;đsuSDD?>?lnãb1+w%8߅ B- 33g>\T$ !?\r K!q݄j%j{h'/M$ H@$ H@$ H@=N !n6C SfŞoNŬL9WLqRbZżǁ8eGBD9T ?aC}MyZ&DHLYvs i3>Jo ɏ䏛?8;U=~`"f~w@|㕥ɥj:f>4moƦ .q 8 Ď wc43T/\ 5@1s/G~'ϙbp̂=q
k>qI>j);82j,V[j8HU|tk)攚6 H@$ H@$ H@$&b6'%c8م`,;4 "ľtt|$fpecܥ)Pl:Z]62Cq!,7ƒfSo# -*ތ-#fn Ƌ^
X~uògB}"Z& _@{}n j,T 3P"cDf(fn
z4e
%7_3
?ZWKc>ߚYfV4]}9-RnXO K>WoZ?PL|3xÄ{5]@uYj$ H@$ H@$ H@U`|Ct6> z1ĽFcR'fS|Yrȡ
DPYC0{3.HȜ!Ex ;b#[)hkqW;lT@=6_=ux{heX8ι(C<M90q|,|1[绰G㱴k!.e6@廴',Wf/
?/̇X!9m .3b< YՈX
"ޮ吆KY#÷)ituijZ `̬ĵ1& 7Q5s)n,4$ H@$ H@$ HV !<P,o\ ^kg)".UCٌ7 :Y| u5>CZV[MwX o
E&NS&Ì<pAHdmK!vf6nH'o, OLZ P^ٮۮTC] KA 1[y9ȕl>ɍ|L!
5Vb]<8Y1tv=(&Ǣl6~gf ̀e|?8Vp ^Nr1Lq/
ri˶
]&G$ K`5[ H`(ZʞeDarUa?_MJ@M eFZvv<zIbکcVvL?Twf[ìS[nl?WiKv͒{/eEqbR O,p81_v,Ya#c(j-H~|s6to|of Bp?a
Ǐ%x÷n>-f,Gdž㻶!F-WbfVw)[ڵHv0hns57! 9Z ۳ 3-B|T,3<\MYΑe¼e?87]Č+X3>\2/֯&>2aͰqc4e 3>4:5}c13f_UmGD,}qj!x^ ! `B.
7-! wrd$2K=;h# M$ H@ @
ܩXXNMMUofg}j۶mv;F:D`qq:{luʕrs <xڽ{ws .jΝվ}J O?e=c HwP\t:w\#vB=\_o]p|r7ǫW#5uڵRر;?9uK@J6ڙ3g-xll:tmu,}7jϟ/vGFbhڅP+nŋK={ȑ
7;K N{8܈/JZh >|Wa]z{9Av ]aH[)vKz{)<8}'Mچo 0yIs
;ٟo_Ľ1}혒=14Xn-K^ !toC!l&VnPm\[fBý 36w Djbv1KQx""3p"[]9"0/B+Xx3 Vj
536G}K :[ B]N]ƹ'gk1ުX̘]bk쐻,ը;36_" 5bw K!.4K9P: ט){pTG#>3Ûu{=-UMJՌqr2Č?ei`u4Nv,WMh$ p2Z;O4:-8[HC\Kq>?q$0 0OtPŇF.7?| /~q}6im<G:w+/| =٩}y`؝%@fĉe"KOX "o꣏>*Ww'/A ~믿^<y!$ =3Φ\$ I EC}C{Uwz#nc|<G xrH,30_e9HȀ=\i]H@6q qk"#u)/ ?~g?[wأ˴O^hQi=m2z>6__+
b)u:qqKyi&ã?+>""8!EhHxNLNNٳH7ͶG4ַJ5o`K˗/ };iC^// \vwI'nFLӅ?քu?GkݼVs5f1^r}fC|t)fe^ u.fSR/GO\[fy6c2f=
Tgb+!MJ3ܳ !1 Rփ} 2+ ՙaS]fB|]DbBBpZ+1;1;IJKչM{1fr
:?5[Mݢ3 %Cx-"mC }rxO /cO] K-lf6uwq{/f oF]č"h҇`3]^.:'Ց|pp- H@T8҉su'6s>*vqv8> KQr~9>?뻏?x H@ xFS7۵ݶo+{g:tT. _me:ً u:LȨ is[ٻݺ}eЩ[ lEg(ܻ JLf= 2c QeoY
}^z" 0SN?9g H`3T Q7\OZ4Bk^ᅩoeW_} DSgR ru?P~I\qP~+?ֳ~M?I
C<V6G=_K-B{z *}|i?QO#"rѰn8GL qe̪%Ǐםݶl;SK2A;* s*'}]n vx.>? Lەg
1 CN tÓv5aviB?%/ ~h:8_0vឆkYyc㔧P㻲#" ڥ34OķJYx*D `o"ދ[%{m%">]<ȸȗXx٫#';;BK|bK\_ 7
(pzo~|Wu!A٘;P#Sk ].zW㰚ϳlh!WTSbsC#>"|^ qʹ?mZD͊em$P:5٨u1K(RYBd/WyveK,$ N ђ_.ADGe&&&JG:|JH( BX:}اcLg`';U_7'|Ooo e':l% \#NtH
vc/I7LX-'a §;bttRa(&L#\pߘF7~~!x`,#\.9$I#F2|җT~ 1,Q 6f(p GDa7gy۟Aol7Ad\W[ m_eb^|3<+0?b'A\3?hP1hZ,Hp69EMM6}w}=+i"<N{/OU{\ %v7d↟ącY2ݔ _O<qvB'3c 7cǎzQ'?_(
yJCǏ /q|ភmXUY* {NR y Pyy < ?Oh e /X,)DFLx3Cz@hm'D8G^WZʼJ|iwONN87i8G|9? 0qm%Ίp`(Y7KJ5 ,"X><ƩyV] ߸Ysz=D [
er9~0L,c!+rxeo΄Pz=k&~/F^哉<^M9b<asc&.3sK XRL&v3f"& kZ;#F azA[j5DjV+j'+4r/-kqLcٱNjq H`KCXy#F畎1<HEo0Ȗz 7xt3y^x|h?2BA:\)2I'N 2B$q=#>1y:~.r/@! zκ!{t^ 3H` pR8t
vpGXƐ7 q& F:+B|H sNLX!"%˴I~:Nc_
Rt S#D{͏:e0U 1u^ 9}O ݜq uI I}O yn%nU{;<?ftc߱G{:Hh7`xVA=E Ì- e @6 FD gxy2(699Y#X<ibp|3)=!#f_8G?Eܓ܃GH:q Ba#d]$YO6KzL[ P҇E?+he[~v~ fcV('pQv(WOa()z0%inG'Xč>wViegeykL#Î|nsӏ>.mVOHmMI;g >0c9?p
?lYw }g]]^z-.8]w~ A 囩-[(? nr잺R p"W-goqtL%ԒdtdF
džbe l9or~SFL'7b @4 Mn% . @=DG7V41@,S=Kr 7)@D L: C-Yf@à~0+* 3ޥxBgAI
Z:t#\2f@z9cH'ّoU9:{A$5438@ ÉЉZOr@#: w:1 XAzLQqxY'? 3t t + ?'|r-m:~AH`+~eL?(gU~s_g; Qn^>e0g 10`uF-
A `~'IP@8ɛ3Cxv K!.7UpO}Ev2^LŁd; ,@{6c-UhS#\qO7)viW#\ޠ]sYhO'z^@9 *{?.h?G; ^gp?/ff NҎ` <?Z]G} Kq2z9m5l#}ifIWԻȞm@ڇAC @ IDATߍ2āxNݔFC'~ăd)qC9$'"eYYApK>v3q_6}G J;'/&&\=^h ?i'c=ܧq.$Wa rB<6r_6X@\|T:GzzG~B ) H@(9BLd t@`%63!2)d`B|`FƄx5~0 C|SLO:tLc 2{$1, '{=t$N abrKz߿ۿ43OǞ `rY.CĦCI pr t@Yz3' HR M>9o T`.i%F~ 뿖-ӹV#@yg 7(8 *tCH``n >^ .TG *s4@o. A0xLf@sIg.:u])lo ;E.~d=ṕV%@YyJ ;3EZO;!/ vqO2"oG?y
yq9//8"K8O[vF q?@ n8}J>/*fh!'u"u,gÖ)В vKaf)nw7e?D+6OLnA ?
?y _2JGO!+?҄ wY~[
qoM?62
"7232#2l= ,q!}yaL蓓:yAܷ
~g^P_d;x t@
NB@[rtH@#:w 2#Za*A-BH!ҹ}饗J M:H*e0B Yt:Zt9mh:vt&laB vt!_~6J:yp q=a53C'pb *' d c
F8Fcr8NXc ̠ gI>1/IX#F2 \ğ{ Sι@[+
~|.%D$л+m3YP`/
91i'ح?ӳ]] 6-B<i?M}a$\^
ef"/:bhϗ4v?/Hpq/"FJ7ik@PËH 4!~;u݄Mn ;g^.JahQnY&_}o4GYHqEEԤ,Kɲ~FIXFnN}K:n^t`~icxu;h }nqǖ0S^3GxM! s}A_;))<,! \'n }?6>F^H@Ln}*m H@6
:yEq6;@t|Z[l(Ӊ}{,GnqKxt:1tX r0tAcЅ}dx4Jfr\vzu?L} 'dFK n@s?3DLs
s iE+LI 8Jq7 uqu% P~a ^n d̼:);np.
ܦ=K?r[$ $PC\y_.G=@ A>k mzޥ
L C;k9L{{=<s + a1~8K7؉~ObF'L$S~A4VfΒSQBD xYcDfyZ -vpC8 @ڏڕ(a|*\) o
-˺Y>[/^_wK ~#m]p$/ q"p˿3/ӎfz f`8/ŋޔ{ˈ!~54
(+% ̈qvn% O
~K@ *Ed /(0ssEPgK'wcR@a`e gd,[tT4ӑfЅAfҡt$gXy̶#i/r
Ni=Z?NDŽV&}K
,vŋ 1Vs :^r&VsR}KYG} uFr?SP ,vvsvgu-O؊-0pCg13N`{e6#0# WO>qJ ?nSd_}$>KcJH~"R2ՋvXV) !"~2!pz iarA 1H0M^$-H<f١ݨ! iIe2DŽˋS,lZ~FD%}ДLW)"f?s
Fo)hcu}q1!{#8S$ B@v$ lr !:?tz 3H"mi~
u Rr
H3Lyk*[ytx7u@v\=^3y^ˏ&3 d |s.Š staOǙ]ݤs7k6;0J~ R1``
uYo#إN `R`z3fd$ Og4u3b 㼔E*N@G | Q#@Y#ZR5=}P m<ϱx/Y;8{<1N[CJxa7(x)yH&?y0"")3D/V]Wi'wm7CG^z2 §YsO{nAڛ<+Xr
1[HH?QCEc7v鯶w=;` <\$-jhmu{kܐK>em<3n% tm'i$ H LѡtBRZPѩd;99Yᖷc;:Kaw>xS7aAC\N#,ob褲/trE7: ^aGZ|6s=N{f&XQ0df*gRĥu Z43M{f<'JK=_/w(C })! ePs3EymZGZ: Ĥ|Ĺs0vdg` qq" 4<h}K6< 6>] /cJB/ov RqRܧ}ݎi{>8E ,͚}$38=Kw6yuapF<@~ncpO@pMd^j4gc^VHb$f&Zk`9`DŽGދ?f2Ø~=}l?opk80F@J@ ~;)G?-uW@ϟu:6_QG VQ(=$ H`u<|ㆎ +3S"oӹM% Ybv1L `SŒH?\#|:[FdR'N vx;% 1
8Pa #.LߤǽvN7V:؈G ڐ&:āo4'\'yf#ѩE,'θawr`ᗿeɏz<rd lEW+ 3иo b:9V{;A}099Y5fp/28H{ jqqRwi$ 4L@ ?#f _i{1M E:E,N];8إ-@7@./RQi s_mO2+f"-mzմy4C6qA$x8я߂F r&HڍFoB?*yQ=CmMfR$/[9G:ݶe 4_&福)/WC9A{z2ÌaA(G<'Hg݆ ;"
E)o fcHY0a|@|f y!u
Zy=@M;KO
v8rEDy _+å[@xѺ|sh\2$ K ~tiBD`@O:Ktytr/b:at^9G
v ӡ
$/BL ,5:tĿ/$" G?*a mt'
̚%Pv-96 0XBgY5OgOC8 ɵV5BaŬdQf9':ĕ;B !a* '
t_~ʠqW&Rg:J` >bzsu1B p3ý=`EC̾E垢.~=Bs{5@oils*GΡZ 5,<y i(9z;GLV!C>`x"M0 D+^bF/\<yE9_#l} ^Ң_A> m 97[I$E)S)w7!?`N P.(vv5i0kiӑ_p}F u?K^4^` K٢JK6DŽ]d?
#,SS }B̋ Ww[m3<z/Dߜ% Aߒ&ܰӌ[ݯϰ5W<ȟ'jǽM_q(< Ym8vܓğ3~Rj zךKUb~wupl,kڵzkB_b1Eq|̭ >8
A7D@S`ť+_=c t)l4m oR2Hޥ8L <40 '] pN]ڥcǀ^c
o !tX`@ ,vx3AԙI' ,""Xbwi ?1x` i!mC qC\ؑ&NGN3` ' 08Ogay8ikFaI# UlS,f0`@U1%?8g>k:tjI#2| xO>^ҸӰo2@u x :{{r=Ž){/7G 8 >u!?M:Oӛ( <gh'LMcO?rà;/}RP/'mk=
3CNua)<o)7ѹOyGϸGٯ70 Gp<m }G6m?wц ^&ާ͑;~v i֍< qKo
yKSQVny<o~
u& m4إ@>S'
̿OF6 f I{( MvKڥwcڸA9'oΏt&3Mă{Sgy}~~c~=;5g^*~g"ĕ<& Q#y60I{ 4l3;'NV#'_|%W}Jc`u[lWƹؔ9ΦE;]h5NR
VQ/_pDVb_1X<uudT!wP/P.
188tk]y}}Ulnѳs3` TV- l}ـ %ϖ=[c" ;,OHw&" 7fᗝz:xө9hH:
{tif#OOe??%{l19B8O # :a\9 (a08߬_p"' pPG: i {/%L^vfNAY ~<Ip_?_{>p/q# ufy1mg: nGZ{!]/
j8gyef#A[-Ʒ92xEZrqpqoqO`/)K/l7l0L|tsM[k<y>Nh,5#أNsm>3噏[. vӍ&@l7v9h(۴ay6N+ɴi ן#i{{ùls?f e; L Ŭ/u>V0mI u>ag{\?MF F:v-ܒYǙ>,~cpC }H6zm5P0Gy!45:7#M<SS6(#]Np#Va?➣s6>\gIX3
u%Vvc` Ɇ'/Q>Cش`[\:?o_v gB@M_lɇb[|9L~;yxslj8ޗ3<T=c?Ss zt&(wVO ] /G|; ԋCn}{UwRA5 H@? ҁb)"t0ؑh Q8;@l 0 c:qbpY:q:Yc`1= I bnKõd }Kt1N}lv n3̘q08d\D<q Fy fd?7pM#H;,ܫ# q.=E ǵfޝ$xg;(z9m H*u 8Sed=uwK`+m|s4wI#ߚ=[3Wb|%Xo٭s,D^'bT}Ȝ8>Ϫi)^c?}/ 'ǬYN¸<f7i?Q=dQn0ccܦ˵fO}5u?n(gl3wL<[rw7C,~vcC1"0ic!~՟ s7q-O03K +>"mhkSd~ȟ7Wn"0m}vY"}G/>yzr1iT6J FG^ols(K@$U;C9 Ag*
v|=Χ i?Syk/ZOX &97vq<qiv>ùSqad/N`e9ZvO^mvmvFOX/c
ff#v"f왛~jf/f,=a[fKmSNO(K拨sGVā_=龗Y6 d;
?
LU=r|;e3 o'<=Pv7SXLδ6_iĵ1z̬##աsG0oaZݒl*̮`~wj{09~pu%HX@Vz. 5$ H@]KNR;&e'orrNLn mn a]H݇vÕ$0zNo滩nG on8(?sϕ"z i`/E Ӝ|mUյqAtp?br S{-l5@g (vI@$&:M `m0gi_;RmӚ$ H@$ 7o?wAeIV>`˹2͘i$ H@]H@ 3$I@
: N8@UrxJ@$ Hwd?UޡcJ% H@
wCM7$ t CG$ H@}$`>k Hh8c^mcy$J{ڬ\w';Y5ˀyV$ H@$ H@$ -4ŕji9ؾj/6Tڃq/ήėhTqܿTZU 0} ق?(n^}ހ@ VB*v ke? ](nu= H@$ H@$ H@$ 2I[frk !ֆ~mWa/lwqoz2M hB/\P]r|'bϞ=I?|uڵjbbBm333ST{-[˗/W.]*"paRNrX$ H@$ H@$ H Cׁ0c qr0~̎E菙q "l8Yέn?@XWܮRޫ=ɓ'VvjKD3gtΝ quj( .-qO?-".Lj̴MS{wGGG#;[ H@$ H@$ H@z|P4Xt)&SO,.nGUE Sm/@%z!ݦqcX<q,S\V s!;^Z^۷0>Tm۶"ȦHK \$ H@$ H@$ H ̈́f%v k{4^v9a 堋X{%]%i+Ǝ2ro0{F͜v'hcYfbX/^XDYnVEF`;) =z̸-OVvyV$ H@$ H@z BN>]ƔsСCerzTpX4n -+:u;fX~GdO}[ ˘(J G3hW-٥@rOsP&8"-߿:{l---7--y\9ol(h$ H@$ H@$ 6f!-c,m||:vX /T h9X竗^z
&/bO ?.a >|<Ė"y̖AEhf8 ^1h6pB~2Ҿ6WK[=
7&-[H|%QY-kF K@$ H@$ H@@w`ʕ+"" ?~:rH0_կ~U&2qgf,Bm^_-f/_\;իZ:u3z葉1_9d gm^"i|HZ;]&A}fMcǎ"mpԊ$ H@$ H@$ $@ovg)ٻ[fže&""""-LqOV_WքVaoϞ= n{CY%)ތ{$p (ށ0sΕ7eYV%!I2Ljmyk$ H@$ H@$ H@@hO*O=TWs M1?{""eeYbVzd|e}˪,k'3%l wfH$ <X
Az̞L'N'?#в1ߢmuzI$ H@$ H@
ƒRgf,zbbr 2Y4v9F`eYbt5cof o"ܹ\?_! 3iF ,ho$,"-y`psi H@$ H@$ H@0`LVO?3siƣgy~~̈̂E}뭷*f2nͲ̠=}t|ڷo_u~l5$ @GYĖ ; ziypdy 7,a|@え:o*,[B7o$ H@$ H@$ fP <Xƫ-KL1b,b3gʸ5-bw]N!kǎ } ߰}wmrYq mxyN/hyl߾7eyH˛B"-o%pðCM.o!҅ ʃTX}$ H@$ H@$M ?^} _~U/2̆eIBe3c9cַʘc=VٳaGɲ̲Eo$ <\=#F <Ge+j>a9 k4=\!r p Ϟ=[ɒ H@$ H@$ H@2#K 9rzX3̏?xu""Ȳ rWƫ/}]#r{]?2#F H@ zB5bѣG˃A!-$fv*1ob-,x1ۖk.]*ݻwMM$ Mj$ H@$ H@$ H@-#8mf?ʌWf2Ɲ3js"nju3 |/
v.F6h͛H1LWf2;3ceaH˃ 4%#ن ;.(C" H@$ H@$ H@ covӟ]]b97d^fblƶ/_\ƬnO8Q] 3$"Ʒ 3W# H@@O,U˛E<xPq myĖ~1˸
q%cG# H@$ H@$ H@`<AEL~V=3eiW^yɲ#~dYn<P3l(3?s5$9@y @imکkJmu $ H@$ H@$ "4g>7߬eߕO!2+_rqLMMU'O,ڜ{G_|կ~UkG }T>#~__.C H@xzR#n%/ H@$ H@$ H@ Xz//cǎUN e 9RVFp{7Sfy=M{իW\;zh0R406 _۷o/kvJ@@g @Y& H@$ H@$ H@h B7bYxii FGG˯vW>>@"ر}'7gq ۶m+bo3 _~%q_qӕ$ H@$ H@$ Hc-adVSL GM[sʯVU_% H@$ H@$ H@mXOHmvϵW % H;띾I@$ H@$ H@$ H@@+
x^$ H@$ H@$ H@@ (vI@$ H@$ H@$ H@hE@K@$ H@$ H@$ H@0; H@$ H@$ H@$ H@(ж"y H@$ H@$ H@$ H@ &@az' H@$ H@$ H@$ HVd</ H@$ H@$ H@$ Hh; T$ H@$ H@$ H@$ "@ۊ% H@$ H@$ H@$ tm$ H@$ H@$ H@$ Vh[$ H@$ H@$ H@$ P0P$ H@$ H@$ H@$Њm+2$ H@$ H@$ H@$aťeZ#-N`yflW%orb9f1}\b1]}<,5C#x6 ?$еguM}km$ MAfSdhA^>ٯ pi <4χހ%:&R@E*z
m .lXFǜ){Az\F؊h|n4g t G^~,,,TKKKݒ4! lR;0;6ˮ$ t@sPvo=@ .|4Y4n&@@4W
Ưo``UYPJ $,Yr,s:PK̔/ ɖ3 p7
c rw#.]T1$p իWm o/ '@'_@f&|>n\2n$I h3R<XPJR"qBTAٳKw89Fͷ_5$o߾ط` gsW&DI@&$.%@}ӥee< HA@`x$ L`lll3GϸI@$ H@$ ܁@ sk^$6ڶQiQ$q67L$ H@$ H@m7i$ H@$ H@$ H@
,[?
{mOd$ H@$ H@$ H@ իW"n۶itŧjvzSLr
]&O$ H@$ H@$ &<f>.\P
V=X# {OΜ9Sٳ:vXH{3smf'q~̝nP= H@$ H@$ H@$ugϖpp aaR|p9 9f^~h'T'Nfgg&q&m#{?˗WѣGKr lM9{K<yCʹfn=w+[yx$ H@$ H@$ H@ b((CCCd ~X---4Źz
, ;v4vq_կP8K\GuѝwGvZ<11Q 9rNS|!?}"Gܹse4b̈\ڵǯFZ/nh{1M$ H@$ H@$ H@=A э"}E`cΝ;K.Uk*@RdELcl7X_g\Yqym "g?55UZ ,KOcf,3) :y]#oۙM~2kQOI̯Zpzm/i$ H@$ H@$ Hg !!!!"]xڽ{w [ [q{}"#'r7L&ݧ&of1GsG,!/?K #R0㏋PKxux{2~h{9M$ H@$ H@$ H@]E q - B+bܣ>Zf""!!!q B "n
|?h˖0YvYý<$V oYÇs┍sNr~\, D[f2|"(?,mL^b(o rSe KJB H@$ H@$ H@ ?1~\-jzDLKQ#!~+_fQ1lAyM "&oS{#緀 `| ]\ ={\G>"lzjThopO$ H@$ H@$ lijauy̕+Wn͘" "K!#i&DP{B@e+'(B+3iRSef3y t{j߾},Owfϝ;W`Y[Y Ǽ mc֤Xzwv}$ H@$ H@$ H@xX]xlID\3D8m jP B;yˌWTf*#ڞ:u,]`K:ߥMy %qY.w
[pOYB~~, |I~Wh{5M$ H@$ H@$ H@=G AG vUD356tASE<!&Tfb'&&?9="=Nj ;_!"G~6#a1۽{w@Ch{(M$ H@$ H@$ H@M 1o)1fk 1; ,i,XfҒrEe65/gr ;<q!,XW #CнvZ}3 ,5Mi7Y' H@$ H@$ H@ B3 1 LˮNx%~\_5grq;/"l6-"NjrǸn
,3j 9RXF= M3-N
nqFwGo|s+ H@$ H@$ H@IJC%m |WQh'|4=Y;+߈ef?^Xfb]38F\lgӰT1dsmgH;<<|KY[=#R( ӺCYYP(cQ qGAk,\x
.~0 -j9 H@$ H@$ H@$)hh|h(gϞP?fe
9<Xc=V {Β;v;}{-+f*'|R\,\gޤ-Oc=F5k( <XZ
Gea*o 7ME #Ȟ<yG"r-`#$ H@$ H@$ H~@ ih'h!+;XNk
e۶mkBH~$ǎ +yLWÞ={ʄF&bƏb{~Y؛!ܣ o[ߍs C$E42`kA!|-^'''K-nrk?
*
~駟."->mB%Gx̴% L- I6RF$ H@$ H@$ l "bku-p~=GqGEC{ kw&@ޡg6]p`E\h^̘E+C{m̺eRc sMs@D{
أ>ZfRYC=uTaTof"fDa
4EC!tRy ;O;vqM
=,qf*?ej7=0J@$ H@$ H@$ N@[h)MAAݤ.ض
ѣEE' D!vj7N QLRĐ/D; @ IDAT)3s hU`|f5Z/sσkkt8D= ^6@H KaD0 ,< iHLۦBI_{뭷JME,Zj$ H@$ H@$ H@ (+)q7q{p.f ;XY apntt3GUOt/ |-"*?,m߭EhSS)h3p(YݰON7iBK 3q 2yh)y, H@$ H@$ H@k h4 ~8VeR hwu?ʅ !13X=쳲h3fx_|n162\Ѷg||MaZηIZ
oqpga
ڼ-(2kEA̓|;1mBKE8 ]⠑$ H@$ H@$ H@" Z3!9Rk
wh LD[ R\Vnó>[V2
`^^.fr y Y+gR>'2O ?^q.۲Y3{;)J2k5 (odDW
3 Jen8ʛ
)H~% o F# H@$ H@$ H@:M O1E'n@^N@IM5qx06M+y#Ѭ0)X]} e731*yݜQj5 kZ) Y*KFA a[7\ ~Кn|<- H@$ H@$ H@6L 9L*kG@K"vvZH)ʶy-r̯Qz^km:%̖͌ÇGN Rٱ \{À\gYg+3e?Z W}=&L$ H@$ H@$ H@xr v
_[@O dӬٳzf^
lQYg=k)0==]]zu̾Epem! f^tE% +FR K@$ H@$ H@$ HPGlVٛ3c 9ٰ;v(Sŋ˒ &ݳd2߶0Y$ H@$ H@$ H@$znm's.@lׯWgΜ)" 8pb&-Yڵk |P0{S dK$ H@$ H@$ H@\zBe`~6̠E\EEѣE'O,K|e'''+)v:wO$ H@$ H@$ H@@O9ӕٮwʎ?8x;&_DUY-Z;ʵO?|A)Ç+f*)'. H@$ H@$ H@$ p %<Ho߾jhhdBDWDVDTDf"-/#bX8
K ;vڻwo1;;;[.D~XgG# H@$ H@$ H@$ t?hF
(+3 ݻwW;vX9ˌY
$ H@$ H@$ H@@dYך;d$ H@$ H@$ H@$ ;迓K@$ H@$ H@$ H@@g(vH@$ H@$ H@$ H@#;"҂$ H@$ H@$ H@$ P G}$ H@$ H@$ H@$pG
wD H@$ H@$ H@$ H@!0oE$ H@$ H@$ H`3XYY꿌S U{-{dK/4n KmH$ H@$ H@$ H@jff(?V^0"l85n7AkR}
K%@k$ H@$ H@$ H@]B bTR1",&Wۜ gz8?ɬj "ڇߠ% H@$ H@$ H@
7V).ہpY8~'qncUՅo2ڴ#P+#who$ H@$ H@$ H@زUjd 64 Gjq)m,r\ε&nY mF|qi%FGX: bۦ{u7J5ӡկh: H@$ H@$ H@z:8WفPZC
q~·Xq_|K B˥ a ]
mgWDg
F~ H@$ H@$ H@$ H@xh eÐ$ H@$ H@$ H@$h-$ H@$ H@$ H@ `$ H@$ H@$ H@$ (Z$ H@$ H@$ H@$ <
H@$ H@$ H@$ H@4N{'GB sͶk{纶^Rwj,n!
$p!)ҜBS{ν@>R!79ES$@ !MHhBȍlKd˒K3<-ْF\k1sM q" " " " " " " " " " " " ڼ<e[Z^%7J.G`U"jYl̺t:|NtzŖҾ>mKmiWiO]}6Ĩ%&hGy<yd_&˪\ʲ囥]ĚW|ayߣe*/RAAED@D@D@D@D@D@D@D@D@D@D@v3M@HW~>ɭL ne *ȷ%:s'y)ԲIX*?-#G+JD@D@D@D@D@D@D@D@D@D@D@v5M Q""!,2_̏x _|R :; ID@D@D@D@D@D@D@D@D@D@D _` 7iLh&5fD@D@D@D@D@D@D@D@D@D@D@D@D@vi칸<fbv P6=v!x.^sEzE 9;X[a͍V\.G@v}TKD@D@D@D@D@D@D@D@D@D@D@D@@zi9Lx? ܷ7d3L}L]fK+_^l3s 6 ~$>VcvPW" " " " " " " " " " " ".^cmz8r&(3|x]I_qkjRS<9 a"e v|ppCXXH[A~ | p ,mُȕ}yv
r"4 7'mzz6H¢"ڪ
+*.{7>_\7B.Bv}蘍O+,VUYi+.&m~nv'\W bn1f3v`UU:q,|vcܞ}R#
(S8
wAJ Eu9뗅YMk<Pc
dzW]:IǡzKv) xy `Ņށ ({$D@D@D@D@D@D@D@D@D@D@D@D XJmͱ<hƱ6Q_cmMVV]t v}
ɗ \DVV[ |?7`ƍ)zJþ5]mtt2d_ "8g抿.t Ԍxr|PM߆jt% rkCFgHXx U \Zgk >O\ fwg.ža%NJ _돀D8` {$nAؿ{c\ ͼԖl#e㓞.wjkk*\λuA;|}ԣ-
<-%ϗ%R1%bڦ\|.<lhvARVAЖeO^fCF%aKAoȥ 1p[QQf]ƒAlffEՄ(Z[V9% c&wݕkq~ð*{aO \x )9)LSv犝|ڢ}<JvlG5Zz++uIIRf/K.gg<*z_#˳6_g$-i^<wΥ^~lܹ{!ݱ_*" " " " " " " " " " " " 7g=0՞pK .CK9ޜJXAyhT zD(E q[DLb<\ o{ښPA;0xî%
Х 9vY\X夏sEoCVRLDdNysyOKy]jE.fl^L 3|&'ylu[`Uγ]-vJ\sZ=0!ЛPh%Z9r%z&JwHl~Υ0¹ݏ-Ϧ<Yu9C;7?o|l4'~ ]~5|H@t.W
_
Bv# K\biȑf\EC,S9fvBO|] b䪛^^
x+6Oe 9lC(Q>Wj cwz.|z.R7# } .12o 7 V\f.ڙs.g\i
S\ʦю i
270^ )}溽:8I9H|ܭ i_t| kOs9;uKRS5 sl7iٌvW" " " " " " " " " " " ",,(
l?+"TiBf}ò YO#;ie%]4s|_E!GZ4
}"? <64%ץBfڣ ә<uWz9 4j=M3sƬﱣЊM[ϹKa >S;bs%xxd6\7 -MkB\sW9_=%<ݱo8\k8 _NwS=쭃
3b?kϛGIn=c " " " " " " " " " " " N{TlmMG7-"/.jCZu JyUy]e:
0?_3v}~[76x:993VV.rW\OzzZ sZh#-.l!:Lt-2xy,zDcSvA;T !
إi% >s4ƞBܥk!m9X/wy*+=bz ,=q.iԘ`E] B9vQ;|c^UCzj w|ƣg g|ܽ%g<]ED@D@D@D@D@D@D@D@D@D@D@D`@\.MI9Lzknz=Iq|\yt P"j}['e=umY6t&&߮yzҐ"c\\R5##'=0~
.<
ByqI<}
X'-t!TI}ٞ>,<8r? mc >jUI' I-I $u$-߯ /]'=җAΖZw{>މhkDEK-'d*s1[_t J:|;AE"ʖ.fܵ.J2=[T墴
_6rc]4[~'Ƨ,
DMz#25[}UUUx_)O{_.ϝb3.ǃ
?ϣ]Ξq9KZcOE JR*' 㝇̅''\ey)6ӫ4یi''gV"OklǻZ&_xjND@D@D@D@D@D@D@D@D@D@D@ )m\̵xjROs<"c+=̮92VsT*mxd:]po5v
z? }[hW BSh.ӟW6ʽ ~<pI[j37|tǙ=99ϵ.^i_,gXΏ ;l]m
\ G<2Mbd.=:gR e=bzӳ!zfzc3W#>c>lE[5mlWvkLDχhŦ*k<XQV Kvh-*ru pyy bc 葴5Vf ^'7߁ym==2Vk^mMO $.(hXBg|XsVnYðGLM| e'25`_x U*p()G[S('mĬRE.n=z+GUۍ>ʡ-: 5Vn CGmw"g;CZp! z#A} MEɍRED@D@D@D@D@D@D@D@D@D@D` u7{jk<@+.ņ2D23?<u!ȳ"L<ejvmj Q;6>cSS.
<֣[g+։mA"kfBcC]]1)"_>7Q6`W\s鐏57eشRJzdR)6t3DfY>9{9p9O /lº`-ɾb>1Y89g4٣.ˋÏ~׃= 7V&
DaL)dՖdX s{\VZZl7Ǧlxx
=6,k)vI:R!76[sc؍voSҦ烝kࢯqdHim^w60t軤ZHs Źѓ M]6tmʘ+w1hUa,aҺ* o/X3ClWy:vHuxƂe _Qg˜B9WBe%Lj|eeo
O)ߎ\.+sEŅ.?ׯ{NwJcc|Gŏ( 47}E;tvm"6d/ r1,a #" " " " " " " " " " & ef\|V\ i=5펠 QK2'&kqaut "&^N\˾o6YIq?OM q{=O%Eֆ- r,{diqq<.֖ 髷wuL6몭Byޜ~ȴs_y畫 5){#d ;㩎| +]>~պHkR>7
LpyGM usVm
z/AHoA?QOSp***WeA|+ncccv%%t555>wͺXO?Z"t5ƈ~G <xp5zw=m@n</M
hI
ѬV3dt+[S>l-, ~(ͣ]- [esȴKc_YQ#FSv@ltd"̉JR4u5UAƑ{ۣ]=v -j&\ʖ \ξ+XIa 9rǖ c?{ea3/^ k :d'|V< =}V28MVD,'v
b¥vwg y 9\7CLI!ō_.^Dĺl^v ѷLjw6 s 9o]ڥߘ^9RD@D@D@D@D@D@D@D@D@D@D#*j]\+QEc.oxTܘ cKKJlɣYa~pB+*pvkg$kjC ٲ E.~Cؑ/Ic{|lvS>ʲ}s)t0_jb6wq
|ܴmՂGKMw晋9j2Dm~~{tw; y>W\fg.ܖ5y> "ڍ:lkk/5wqn|$g-{DDv2w`}먻6oE-_haYq75*\R}PB{l,.nKr%mq -E@D@D@D@D@D@D@D@D@D@D@ щ.e SV=/% { |c| 'vIZPNM'nQ㠰=π
52o}тC(
'S6>9.|9cۢc> t>O9VZ킐-8dg/y3^ hv5oEv%{#] sa-@f:WvHna;DILUA[egGRJt*: a{ʕPavOOhV>_y}n[ˏyNUA/qcM[ǜHZo1㓤!C[X{`/˵v^v Ej%zd>siwxt#Q3u Hqsהyx0>s6A9F ] )+K-]s{etII;| {-{KJo#µwUj2+YO9 &u/^겍HVD(I3deX"l)ɰu/#|OD#GB͛7ƍAFAK{VQ{웱̄v﨤" " " " " " " " " " " " x²Mxl]UZ۷S< q"Ksyz9Ԭْ"nkr$TN mL?4j)̻{}tVιu__l$)ѨOHSD,QHd!ʖQT)RaB=<|rG
U+RjkkCOݑc_/>wKD > rzZ~&q!zَ;bE!18D 9{ u9;K"gG<%s!_R4H>GrSCu+6vi2= xX֖z_{#Vv]D"E\E"7\A#aE"MIW|Cq,>/ht,lEVTTG۬Cƹco2.)g۲^'r;WE@D@D@D@D@D@D@D@D@D@D@D`?ҝJYI<>k~Fcg=rvY ?=˭B-DtÁ{,svufpR룓\O+kk9s'@d7K>K#0,++ Ea?"icd+K-۠n|iaˋȤ#,QfD@D@D@D@D@D@D@D@D@D@D@D`7Hy[avMelssK6zsʦ<6Y_YRRh]
HaZX瑴U5+$-nk)pش57Y~D0v[ |HQ*ѲQ.(3D4l0ol|i9>yC }H\J }le1=HWD@D@D@D@D@D@D@D@D@D@D@v3,e#F[Xkn&{XU疳(i G5 ɬoʷzJ
82r DiS tqNd*] 6%ٗ8-ii4ĤZ>wjvڮ" " " " " " " " " " " " 6˽y|*mnUr(Zm?wUUevGκ]v
<sӁjm
\Ц쑣VWk cjWuӒ=Kb ԄHS$LxQB-/Rlll
zP2g*팍 9bmmm 抍s&犥>(4f,7RbGuE@D@D@D@D@D@D@D@D@D@D@D`yvcܷh#z8vjGxʲR+).x( l*++-reV[]g,*A\"?Ik\SSS644htj-BK])u!Mr]v-D-ʕm̥%]+WExOݑ D}Vh}dҘu*" " " " " " " " " " " " Z*H~op&6Q6 i JwO[3k% ZT_alv
=qmuq;X04#AO"tHW$E !Jt+iYO}RJd,:ڍ6M˺jhy<A$.7$*˗;HY-/-Q!2m& }IL kmmNN ut
uv}֮NIKCUuvJK> ~A=hnxг2 <-w*Ѿ K%K
GQ"FKKKC}-"uHR"lѰ---AKZeS|Eƒ.B:d"dYO$,c` rDV Bq(*" " " " " " " " " " " " EJc1;nQ_UVZ~ֺ<lkk_UWW$+dEEn"?)uʂ̍E"5H}GDe=풺=_K-}ERuW"Zq:Wggg #gY/B8ǪuQ>SVd9@-g$hCiA"]y!4)˸. Zy%5^\ l7G}LdlԏuY>mfڢ~^v }N !v[zQoi'j|]$hׅigU4n3n'. dF\&[>K" " " " " " " " " " " "HycIݻjl ͠6D@D@D@D@D@D@D@D@D@D@D@D@D@D` $hIUD@D@D@D@D@D@D@D@D@D@D@D@D@D`3HnE!" " " " " " " " " " " " " AH"" " " " " " " " " " " " " A`3Q" " " &l ᵲr TCD@D@D@@^^ZqqR]} ." " " " " "$h v!k%iuulmQQZCCUTTlE7jSD@D@D@D@D@D> H'8&" " %099iAVVVZMMww
G`611a/_fP," " " " " "u$hZΘt:mMMM!`AA٢"" " " [A A[^^ ^ 288ޓXED@D@D@D@D@D` Hn9D@D@01yPJ,sIᓮCm& 8 IA{p D@D@D` Z9Hm\XXhD"hUD@D@D@D`+ 0=s1 <$hqR-0"Wfgg0> " " " D7 5*" " " " " "A4Ֆd@SgmG21kt:eaPx/lID@D@D 7y@]D@D@D@D@D@6&Us" " " " " " " " " " " " " " ڵhl2 MD@D@D@D@D@D@D@D@D@D@D@D@D@D`-km+++k}""` =adɷS'K|f&6Meӂ 4tF U_ۦ˖K9ͻe[>zaO}6!&hqP)+W*? [ ǣ>E`|'VB4+ԲxKM[_.m
my)mydK[ZBN~"" " " " " " " " " " " "{ l Vd"-90ѳ7e9z 3SԽ%bS9Je]H3fKf:$k I xħT*en ,HGS|
<|\Pp? ,7*B`ffFGGJKK><=`jjV'r`TD@D@D@D@D@D@D@D@D`}jb}M }
a|f=zWI;88hmnnnMi겗%VRR"coիW\¯{묭ͽ:ن}.]dj{ꩧƍ//6== ?VYY
U"FFFZ[[!OΝ;g o~Y? znC _?='x"aC&evG '"; \vǬ쿞12{/y^h4jE2NNN& .ؘZ"gϟ? h_ء]f===4Ω^WF!q611-Ry %&pԩ c[Q~ m= +p.ѵHV7G
?zuuwv]D@D@D@D@D@D@D@D@D`9B#+}f?mА٤/2 7__ofeME)KTkmmj^Oo_e G ydNv[>G92Uo7~ H\ij73)c\={ֈGG ÇH ax
Mn@ 9rLR'?;yQA#QDIuz">f!-(HǏG9}MT|UUUSHf0<qjtlr'0~ ~{_5'>a R} D\?hr`wʕp q$s^;::=-ܮ" " " " " " " " " ;</@.30G͔G=g^Ys933$-oyKNT$u/fE m ;-f`` D
---Alu79B/ݼy3iNAtK_dOww"KDq\hf\ mĺ C2e)K\q m: ll) }"H4 T版 /s}Cl~;"z96a 3϶d;k NY~!4:
}13LH˵H]xk^c+b9̙3FT8ac _B8lg, ~rwE˿ D9O&5?x|g8 >p !kØi[d17ɞt <566~uqp - V Ї//yBBoj9O~AS?\c ^\?ѼXw9>YD`\w+fiڸ2ݵE ~u U!,D!Cl"2 #P!H A[?}; Ia8k%k_ZD
↺F.?Ab!ʤ . x!@7q?xKⒺ /c`nY"">%y%łlF0iVAj?sΑ)a,%z!M=q t h<.~Gzd22p0
) [.vaa089~d%'<d~T+_J^ʵ II86H# _C.%WA~S
L\O~A~s c/Bۜ߫FDsL\פ:я~S~o$>9'}f"[96u{{{n u A"r/߷X`ϵŵ cqs!lg~&Zc"Yr^7,DlNN6-E@D@D@D@D@D@D@D@D@v6 ڝ}~4:$g_ͺOzKٷ'k>
JAd+r"H@ B)ncA"RV$erBA/}"iٟ:$\{6BP#1D1*? E 1.JLe[<vd
D|
:bܹ
X ǃtc|FPGά%F/c}_
W~ :o~WIѹ[
b|ePÌLD*Q'y - @^&BN5_5 @ IDAT.kKk GZ"9w:<.E5N{AۈTƝK.Fn~;vF}gSL:f> 76RyO+ {y˘y9ks\[|W,{wyKqv [V8ZMΏ3 *?x{~@A>l$%Xq1ƶ$hwD@ 2\54կ5{]E H!"HA hLG$CB"
)/}KC"
قt
H F CVC"Ef2F""NB!jx/Q.EТ.+^H7"H{ED HEF%mxI 8vƀ e!q# Z(Y8qܰ=Q%Ѿz# }WФ%f1Xe/{YXO~睾䘹noxBdi!9'k=Dpr&yMi+rIy /~w¼֘ɴÏ(:mq~TÜ#"8^*g1 Cl ۸(1wLWʾ/ics2f(+Po j$aB}V"k5ۿ
__
:i# HH(WKG@v3X7OjSOg\qIm w $ q=K e=bidT#!8-b"}AHW$
mHRҝ"
n\E&! )#K$0D~C */be܌cA~"$z~&؎ L$'}(Y8^ ُqYǒD2N
ǏG.lҤ \36RrqSN>x M$ ]q N\2Nd+"Hu &y<tO[D"?pmsN;W{ĵ@\\o< IXhx '?> z7Wr?.Ïg;{e.pߚ0&pm(h\W!uþg|D ST|*~1>я{>}1]Qڢ=cO" " " " " " " " <iϼ<㸽mIo?XP";zf@F6fPT" saĊɂA R(AE o_ ̿D$9 %FhRl= ҅H>"nNQf6؏~VL0%}>H1|G~ه 2>i7ZvxE!{D6c HR"v?r9 ÑwH'z$bԉ} ~>ӟt̾+
#K?ҏuG qOJ^5[,ÙRp p|i
"6ʽxB*tϑ.g-pqDrMp=SANd Xsx8w\& cd_&r7zى8nD s\jv+YDGP
:1?u=&4mq<}c>ÖB*iǓm'Ǚ" " " " " " " &$I<8#gK\$? xf,2r%#<e uCY^8y?Ko? q2:+ߣy*}f , C(^:D-cx bC
H SXM$̟I (Xؗ?\E
!hcQA>Lډa%UYC A<~B:nxg# Kr|q]\RW<N/s"o>#zwcJ|86 :a@=X? 7CM,m%\ӈMAR~#o29d{cLng=%}{eT3<'߿x sf<
}3\ ?;B ?wx묵 (ת" " " " " " " V̟ypƴ?IЃ0Eޝ+$S\7z!*3ϕs@f0XC1n f "vD@v< 7da8W+I(>$U+(RQf(h؏y%zvQ%z M{HQ#HUK.BIa HY{A1,R}zuhcsGGG#~sRc!r~}ꩧ#Z3L]k c^Oxz$-}'Q]{#Ǿqlu Y,D3_?=yOuj8NYyy1?|@~>Ant,:!c=sm^ 8/G<2k(`'c"b.̣K+w=.D2sv7mϧ>)} E-O$V~k^z7zǡ" " " " " " " {@f~~?o<K{+܃ϩT 2C&v}\<7,-z'<ٌ"AՆ!@|?0z 뉔C|!(D !kL۠$ E萖M,$HORW,D "H L*F.!xw3a '?C!?BE*\bDXkI-cM& mQ?Tp@"haM%=#HYLM0yv%oypna;.x=og $??wppxӛd{Bl3/sֹw?I(rرcbƈz$&\)>ZklqiD"^U
BVY=;whߏ|dcçO?\?c <
Zq7}M]E@D@D@D@D@D@D@Lgf>K\j++Z~|1*ER툀C">P퉐D1O$&FfG`>r#M^9H]A"whHYP/}KA</(6dq X)a1 -?IC>D"}6т'N±Gl9rI˘ub, /!<#cD #ɐ^Q!O:x"6,n)gR֘c#jo}k;%k}{#z)a9k(ٗk(o!F
cx¹M|^i;9no|2Q?(dHq̍K*q"a? R|[
9~IW >TED@D@D@D@D@D@D@v"s8Srܛo?}<1K>(A/"+ 0 B^نD F!H)H1+_5c_Gc"VYGA,!H$#2 !< ۈCF1~gHz"q|_-?AuB.#ɐQ U_U!q961)sLḩD.cϾ<<H(k?Y"S0n>O<g QH10 xIKgÊhqm?q[ ?^`$jI-9&bk-
sr#}`G}#m#1F11BB2 ;c }7,}mp Jt,>i+>Cxqr&9 b -E@D@D@D@D@D@D@D@D@. ڽ{nud" OHL!GzX C"{1JZT bqD R(Xֱ:}HSDB$jo!ØB6(G@;DGH;
tx.4 #2F$$y-Bc dѥD\d5F #H'eQa9b sLg
b\ox9w< #>R9~9WHZvx0ɱcLx;u9'=3WWZ.Dw"I7 1W("BHq |qN(DK#>|2|;Ar}P+kxF=\DqEJ4;s(7b 7pFzd={ x.TJ'Ft'V-m<^Ϊ(" " " " " " " " "$hh " [M P O tQx |A "Q #.XvqEyG$dd<LH>"}! ;dDbd\c ޣ-9)O a G_q,m!xKrG")pmIᘑD?xN
u {zz^4j1 99G~!e6 \ED>SEe? fT'Q+_JQyH{W" ߙ3gBa2Òm#yopA
ٯ}k!11X5
w2RZ.q9gD3]z% Apy?po<M "grR w$5FƐk 韶[/9H'.{m}}k>RtB?D努%bg=cfƖk|kvsmd=mg'.4-KY X G
"}'>d6"$noxξs~hݤ&/bIM{s#W!u3s9QFPI_ 4)x;BO2SHL pƇ ? \}s2.~8ADْh_ H\ 1O߹
6i?Q8DfvND@D@D@D@D@D@D@D@D`g1F DQ.D9!4Q6[.uV "(wvCf"xxM<u[qm(+PJU)k"t%
ڏ~.i;</y/HI/ %̉Ї>$*{59K3Ѻq }0T߇d ƈ %ٳgCt*/}i~ @0IVMH-Qe
c,}ӟL-" |шYxd7ǂwkooB'O0 7)ݨÿمsJ ~ÿ C?ǖ>L; s`2e2HZ A8kGGGCg fpzɇ< 2YC8cDkädN\;HtWL1~<5) i#q 2 6g?]擌rR"UD@D`?@V^{i LG>HTM ^ߒ^oܓ/>|-mbZwvגA [O(9bw,X?3ғq'ĿW});ZmB^8xb:㗼%<!sI'χ}HÝL ِvo}k7<y1.Z$nRD@D@D@D@D@D@D@D@D`ݹ掑]zz{{0jyLzH()&y;RP $LJٗDݸq#\ Ee-12.B//9ь㴝LW6GFFش"" RF SܷS Kf%}Ŷ72n{P)GG![nQHZRU
6[FÍ̿\4\L}~:_16!3}+mdɃbt<$FH%ҕh<>p_x< q|!K$.)1*Y%BX P#pI I;\(#mia L4&B K4N `i?؏{ Vnm#T|uX2o/FX\'6m߲ngR5g z," " " " " " " " "{pw Ǟ -ѥY$xDЗA,0iK-P1 ly( "zY3 ]]]!&ERֈWX XH|?x*?kG"HC@k(D.A// Jd->qxXo'{e/YJ{5<< I}pE1B#!vh!7FEK-uC(qQ!CNZ@nX%
2k R3J[=[,l#ّ9EC.BHJ==\` 3KHXme.]朥 rim]Ƭ"" " " " " " " " " " " "~ؕe1 W7>w[ uDl}JD)R|M-W)3)2JE": r6F&X0Q,!Pa"sAlOllB9/m /_i%qnOE@D@D@D@D@D@D@D@D@D@D@D`c1k-]Wljf. Ç08{
[B@vKnn|!BׯU"PDEn@^Q\%J J*dA"_){d.K^N\%.c >Ƙc}.2u"" " " " " " " " " " " {g=Ev9?V2,c=WV،;c VR\"kk}^j{fַgpP\xF#taa!Jjah%a%5υD=qD BgϞB+ Hi288R
q~ i Kq *f+Y%3gB.ْ^YED@D@D@D@D@D@D@D@D@D@D`ٯt }s'>^ ?NrU/ӗ Kvupؽ͘-m<mqKAki:95!
\3cS^+,(V+}7 -1x:儛qOZxg Fi%hw.Qf8k%i{ܹe'_/ ۑJlC:| xO /y.Y m%m3.R'Sb㸝%ǔ>D yn3y u={ž3|h >>Z@&5h#qFFN
d %Yov а695e#wRZ\dVw^p'/J;z՞;qsANN n͍>}fe
Wr;<R<o*fZ|5-eZ EvE|%2\qQnT Yk=6 9r$U}!KҽqFIrcd<Qe,_c{L̍2|I]#@3
K :;;x S
ի9 E0ٓO>;| pر^\"x+CG*B[Û j)8JVNmeُcMLjkj
u.kݲ3.`Ϝle} 9an_셞 65<Ź>sG Y_굸C㺙^ ϳ=I+A+a
7S~/)1fDiMpG7n+)cnl"JA"[ʁM_\xю ? nq ,٧_ġlq{l;.7~RD@v3utogQcK ߐh4rY?K544gO&/#3sz F
RM>*++ Y~-adՌ%ۣǁo {']tRZUUe/_ 0# F2ψvs'/M/,y<k:Pg Lي:}Y;y?O>r,HG{.H#mdX|#g?u.
¢Y 6%"
9{%}!:ϥ/Ҳ H" 'm* 7"ӧ/ER"V7)ܜr7
0{nU$?7Gniflmmm9S >B{ R T{u " " " OAxE
:A qE) gQ
3~*AXP 0 hJ-c>>g_J]L{DRp ؏\,%'NGDp 82^ vttXKK&unD-"mıeLͱG l ? .gv/Ѭn; ,]Dl^h(er 琴~8 -cἯUg<6)T_cI/=v
ovhHqW"܈DW"`͌$78)LI
pMvrrc}nfqCoܬCHZR-#i R!nV./ rG6/UD@D@D@Da/qg*" " " " y3K Ѧ 3|D(Y3 > |AaQB.Y%)o<#<c 3τ im&B "j HggE<xc) vG"H3G= GhG-{* A8q*+<R\] imS8?wUmϝg픏+6s1!V;y J>/%$qRY7Jnbx/M1rs.ܴ1<y2=uه,}g/M};::' c(&7\mG;eQN?'{&lxߍ< k-0Ƣ>D@D@D@D@ >θC#y ,A_6!<Ϝ9s|? \!EFYJ.m ߪ<3#gP! x Dν>{i995 k=.zۇfbUkn9n=5v~y9sc
]ךc I{!E[=r.<rGΞAκl0] nNtY<` m> J$7%.VntSf7I~KF:>#Yc'mR?RArd}rq|q\pUWD@D`7IRa<w1h" " " jD9D 쮣hE@D@D@D@ g<{;[}<Xs+ۨXjwfvϡܴ<KѣGC;qPqD87D}!x~_ '㥍<bY{.zGUuZMUeHA|{#={ca,}OϜ=c%r!د+bg} r#g{ `wW=vˈ+rmiTeXXr]'Zg&=:k=w6MD@@cę/%0V X<8!VV" " " "s *ys(.$%yB q?)l|
I4E+G*>ُb?$T l#Ќ([h\_x1cו+WB[+ ³bh Ԟ<[=hA$mC]=y%[վAOw|bn:Z[lίsv%9[qOi|X_{L>3mnI@D`?~ a~ *" " " "ۃU큨6
jSD@D@D@v.&B4Efa "Qy`eD< !b|&1")-KR#Ye م>b?mK~
Z[[E:r䈝;w.A fYGd/.☒}Ji&r@>>UVYOLjd0pn z$m^*ψ]J/ْG^1jS>_ 9{٦"F+/+q9n ;be.gR Qv}#u<" " ; 0Ic 9P
JD@D@D`]r @D@D@D@D`C;OLDd".HEߋ%6JyR"hB-yE,}'H:%vI-HZc]3"wll,lXf,F..0ǧp)#ăL 4r^Qloɤ^^ Ѫyy>MfqI.7-#i86ߧeRe{$KpzZ9[阏uىV摳dW<g:(]L P4t H I,yС 2' @gUE7s1e)4֑_Vbސ.D"c .ʣs oَYgެDfًm~qEie.;bE 4>o)O?R5շ{x$]rIG) Cx5fr%3ѳ垚yـ[v+:-" " " " " " " " " " " 5 YMQC9]c7isipBld% dϲ
zgYeYVV3O.|
/qc2̭qQEBԴ
]Ő:8y*?eG=
D V\oKW}t5d~3+>'_+IkLsJޜD$#A" " " " " " " " " " " " }E"B Fd"WQdR0wl[[[H-L˗/vh
iA"H)HRk-h˾N
r+~)|Ͱg-XD0㥰tDqU&
{?2,<epV{ QDf ?e;Eu8S?wˌ>T:\oe%V"k׳w"+|;*{pD@D@D@D@D@D@D@D@D@D@D@/()s΅S$ D& s"HblCQzDΒ^ ѭ b =A cKޗi<xψZ/)s%xGZwG=vӽ슝>{fo.."g]2`}CǓ,~mjzz.^q[b55NK%hԱkM U"[HL*ѳ1%D"M+**%bG
Q[!uNzdU)K}ں$EƘZɓ'_ml!
1!9.^{,=-
R 9sv[~^={'H'<rx7;Ke\bg.Pi)?L?GnON-V7D CI JZ&X^HZ&%FR7J[:HQD,r6l?cIDRh#Wa=zú9> ՍM^{}:NNs-v+="k<9ם5c?c>}Ku"gM
6h}]ʦZsI;|Ӟ]%ty ڽvFu<" " " " " " " " " " " @Q`"hfk(b >q}-W{>q?$1nmmrz.idu`Gs}v"rv&Y.Ң q<;`y+,Rv#iGFÂB;ҐcVv'~4&IK~^]O٪;qL[uKv͑8Ep/X]Mު]$G˞~gV^VOx:把r(Kۓ'|gwȖKA^ ?pw/9Z l!u {攧vZ
O?]Y^l^Dyggg=ͬY6+*} c7)O\__m8b+n x$;DҎٳzþmHL
-К}hՑ@M\M?{ dWR iFF(gm$ K &8`
ʔcgvp)S6lbXQ9g(MQ ]ݑf; O9O9pIdYVWUu-U jZsvˮq߾,#: 'EBq<S&M+, aiٖ( ihϬCM3kڀih 7$ H@$ H@$ H@ 5¹({iه}m<{.s6q xxmX`nXrq6v !Cuu w`hmi
-ÚO<)\hjg5is$ H@$ H@$ H@$ D T>xx\8zd,aB^;,,ͮZ %Ri'O 7XfOڍ2f&S±'H h$ H@$ H@$ H@h:~x055we k<rpګ&5iS'E* uSÆE+
-`% H@$ H@$ H@$N {V=uJjq!C;¨Q#%"&q%aÖуxHi٢0~Jbho(~$ H@$ H@$ H@KHgΆCiDZC8p"jz6\2MƎ F F5t}yiEO#G-a#C۷$ H@$ H@$ H@$pV
I !]{Ç^dB m Ξ? &N Fua{*L0Ǐn!wm,+eb-~kkkhni CZx -|/H ?vMS?-G9G675)}9o]Y{# H@$ H@$ H@>CT9{xbF 'ץ`˗Ln)WNeFUY+h;EVM%u qGlDu+F0$ H@$ H@$ H`` ƌ -杏\=$Eax o<jHo7CZ# :*~lk Ķ
/3B#ĸ--UaHuKhZ ɏUCCUt&AUtnڀ$ H@$ H@$ H@DK- Q>=lzpWL-fwn%0 dq/ ߓ|5 g!3A. H@$ H@$ H@uҨ*$ H@$ H@$ H@$ M@vp_G/ H@$ H@$ H@$ "^mS$ H@$ H@$ H@&@;$ H@$ H@$ H@zm/¶) H@$ H@$ H@$ H`pP K@$ H@$ H@$ H@H@a۔$ H@$ H@$ H@$0 (% H@$ H@$ H@$ ^$@ۋmJ$ H@$ H@$ H@hw$ H@$ H@$ H@@/PE6% H@$ H@$ H@$ nՃ{^$ H@$ H@$ ,ϟgΜ gϞ
UUU& 2$WWWwsyĹZ[[0vܹ0dMmmmݬy|$ H@$ H@$ H@@Yr||8W<Oukcԃ]# H@$ H@$ H@ ÇO <`-C͞Km(Kѝ~Q9y 6,ɂu輝MMM+A[ ڐ$ H@$ H@$ H@@^sWq`] s%ڮs$ H@$ H@$ H@$ "`;S˹_L>O+\\|X>+Ϲ$ H@$ H@$ H@@&@O &x8q" ;v,?>Ł 1bD?~|=zt͖+z#GLKƔ=jԨ..vM%q5'^=}멋sΥ444qQ17.Зn ¹m$ H@$ H@$ H@h) Q
a۶mСC9y0w$rwѰ~tnI$-
6lHv,YBI ݽ{wػwoQ,XfϞ],Rvii68kd11bF yX6`$ H@$ H@$ H@)~p5o ۗz;v$j" 9r$߿?x"z"_.ԔPYϞ=Vp uʔ)aŢe)O=`8ٓlϺ_!>:u* <x0y.]43}3% H@$ H@$ H@$ (IbDXD3ftxx艀I(M'OLB*}@h=~xKnx"22/YX<gIxRvkjj۔% H@N @ IDAT$ H@$ H@$' 7ɮ٩L OTBq=XMIx"Rכqd1F8e}&W.
S(cB3>h;}tL[OnS$ H@$ H@$ H@@%@g/ #d1^y٢xr0aK*R\TkiӦS}#vG |wԨQim֬<bsZiԞ$ H@$ H@$ H@K qܗF N+x5ZǏ XLP'NϢ+>9)/
!9B*#θqR}쐇p'o^[nK9q65.-O#mX$ H@$ H@$ H@}m_5_,XvN8NZjED$ Iѣ/(kKEA|P<ts(c<r6 >$|+$ H@$ H@$ H@:++e}0x<y2}Ο? 444$ڥKv9F|EX9sf-7bk1!bvJd>vg9֒b0yEE{}ZVוWy H@$ H@$ H@$0 < f}c
}:\x)ˇ쑊PV+^cƌGhcZbB%1blN|9ie˖o,Ԟ9s&yf omEWoi i2sk$ H@$ H@$ H@^q)w|S1|X
zPq2ݻShaVB #dvLjiӦAZ9C<NQ<%O1q DxR>,,".^ZfmZDẺT_l Smsȧ|dz2a$ H@$ H@$ H@"C{ƶ{©Ƴaʤaa0v̥}g_ m_:o| )h*&[PAHĖ
uYtɒ%c7۠;w&]cTYRQ 1؊/kfO_ʲ.v
Ƌ6w+ H@$ H@$ H@@d-mwS[Z/.-nK\^ʕWVr|{t1EaXmM^?vdxc57G53g ø ikS);eh{u^
cǎMܔǎ K"i%|-b6[LhoڴiI`œ!/\1*W =I1cF aÆ0o$bxݻ7C t g$ H@$ H@$ H{gwZYR; }-De9=lT-t>$16/D?wG4j+-slHCI^ :X
mу܅ eRFxaaѝ|ég #G ץc=3hk
cGLswї*soӧOOޥ7oNb,J>^PM4)2D~X] jE0,Ξ=;Co91)# Xn ~Ǔ$6bĈ2G$ H@$ H@$ .`>?GdIA.;3FG&g,KMd= Ų! ݡYCCC)G /zH38} 0rT };Å0MrWJu}rR n1a᩵[B-m
G$^vwϡ
;x$lٶ;.96,[4EZ}ODzOK1(vw =]^ _}~H"]Pˏ (3q$ - <~4Q E$." ڳK + xM^ا<2?G~<)uvvT$ H@$ H@$ H@ ,yyD GEଯO)sީ,Y~PL#2wyRyZ 2 !O_Ν;7ّvs86gѢEb~KKz1z7Yuj(SG
}ٍ[aaղEa3분FE6j<LiwhXq{8xhq!<+uÓ6uh6ki~Uq-ޠ\6LaaW~d)o]+o' ~里 ď%o馎2-ru
v
o>!͏'}utmyKP/q< #I,8p+ H@$ H@$ H@@y̱#=NV8weZF= 3;[1gOKs ǫ\s'#Qހ&mQ&EE,H L6'B'_hh
AP&vh7zT>cRȨ;zk> }QBoK8}A[)k"t Nge
O
[vzr 6`^hn<i#
'38a5ays ՝++T ?x`Ó_8> 8~r*W bT>9ùR~,F>O1 abS.J@$ H@$ H@$P s٣+Mg~ΝIe Mx"~q<@KٜEy9W+!i-Sюf 6gΜ$c6;zE!'} Y_}KTN<lyss_ӖcK kmE4z*s0 ZH;6:E9fDJQ##\녴(nڶ+!,Y.Җ/vkOg7m
{ l\߸U6njݛ6[~vR֕ԕ/pWʔk\ZNiޕ@˵Ujc H@$ H@$ H@#<;.Ɯ<"'[WZ#⁊'ٳ;8#X{]{Mfh5(M6.]mًMqs9hcʑȧ߹y\c ' 6' =hGq6z:'I47ҜOo](L:Gp=F0ˣ,b-;xƳaC\~.[<7ϥׇ#
'},c015i0PjK@߯ } ӡI@$ H@$ H@*N ڳ-
#r"|%!"8>vRY{DPB
xavHc}Yld.b+e˘>supkCxzm8ۂ=3gυ 13(V Q#(Ҷm;H Bz̍k&!
⚳^ =W.vBݽfho(~$ H@$ H@$ H@'ȊW,"!"fa#ʲ,&*.\i/ueAX\1:{آ8hѢC.e "+ݻ:#qI:^dQni Q %lHFIƅ{al6= #Ge C Dsxƾ59wqMڡaA}]Dɸv aC0~LX>̛=p<g3{L$ >H q}vI$ H@$ H@:L% 9r$ 'NH , )I85kV@o߾$!+"ƒD F,E>}zL&ehz9q<>$`Y /cDfz ۷oO"-/ul;mc73XxMל-zζlNn]8̘:9r :V, j+Ϟ|Tc\cvGbDOs^{fcϾ,aU<alX|a=#<g{Պmo H@ m;<<̙3'=n$ H@$ H@$0 T⹚WL㓅[0zf|!Y;|89Q#"愀zС$آ8˕n߳g&qyM\6xR<ƅw-4 ay' 8!#1,kN:)^0۪̌(zkL\H[Gω!cI{6m1tqcc{g7vӅl/54>z..Tx_gZwߥJzn;w a]܍bŊ( .'C
C˗/ f0G$ H@$ H`0@LE< 5jTSGīcB9;[DXCDe
q˞/-' ii\EXO{Iل3xbH/^$8P[nM9r@oq jO E,&O7GiS& Ξc(aM7#dtO^ /"mp F q\زsO_8;t01a^>̞5=q9[Yn uօ G o[ T>c)[zsM HXf̘.\@箒 $ H@$ H@ Ô0ĈIhEleތyFZbbG#v",!yy[EOUN&L$qI ^T^'ųƓrúx2&DdbbX OFكFȧdӣ({уvbdwS°(zzy<iXpswDפԆlF, ١UaRgW.[̜z -L /~!-ܒ ? ^< mܸ1))%1၄xPC oPo`u̙OHeD #acގ>6 wBYٲ X$b6)G{<,Ht<6$ H@$ H@$ @:ڲG+ެ̥!2WF9(d^<G >>sDleܜ u\\9,e8-}"1'-`q"2F֨e;ke 8b0uJ]Cm?F/ڦ xv=jDX<v/pMzipvkk.3ж
: Hx{;ė/|aj7ömRz* < >)/"-uVZn5kքM6%NАBÃ٭ޚ ֮] 8 |xXZzu 2C;?xzX⡉^!#ڜ4iR# 8ϛvϢ2u#H<J$b!>c x1 Fc:8a90 x@dɒ IcYrezK$ H@$ H@9sn8I03; $>Yn
b>B:aGcvO;טc^;{ <ە<ω,s2? }mslhmk &Z xfS8vDk 1,fLiQE-Md.-#t5gϜ
-%1皢|pBS9b8|U+W~H@ oy!p [;<I;H<4Ƀk"S|ᡆxۓ 1b0uZi{ͲC$5桇oQa ]ޤ7ڲm^hlEgk8 ; oxRDg}6=j9oۈψ˄D ytnѢE)C=[Z :y3I@$ H@$ H`NC漘ˎ1gΜ4w|\JG #cΌ$ݨObp`N:9qRn/ŖO^捹bK."-7ΓϼyR
5Emª ¬CxMZT)q勢Hלk)v~g\7U9_Ӳ}0&,7;^o_J@[)ڑ$p x@H$`CQEѐ}<@YO2< F"'yx!$ HCoy{'?IJ.>-S˛g$6(<|~Qvy;
63[uw/e<! #/<]aYO>`>a7 {<&AH> rX ބ~F M$ H@$ H@H6mZr 8{0cEN2׆CEgN9=;>sh!. ء nT+C$_n q5 czsO_ä_vg?]zHC{UKnԨqǟjքV.Ha;ӿ1# =v2۴-w(cYs6êkbִ-c9k7l¢OځzMhoh.!CÃF
\>9!nٲswygzK
nZat)t u͛f}_?l9Uywb>v+ ӟ4y2 7%?a
L<<-]tix^ %$1*ôZwuW; r/~/})w] `$X J0g\
ýEv$ H@$ H@@0$"dY 9DUR>G e;>ǥS(PzcSW8c07Ifq0 8۶Lm 7]{G-z. uӧq6yġω
'Ú(.75Ź 1p6Iqs }}ư.-.]47Ko\ht,@& rxW%f~5bf>ᆷ- &B+N- ᐷ%;^< k0,yB$ /a Lu}B&beM h Y`>#+v61b09t>G3 ut/ H@$ H@$N9">#?s^+הq3yٖ-YL[7Qmy6"펽D=iW.^q]t9*ƭa(!C¤rP_73z^a%CXeG8ZτMėE1#|m&KK@< B(" =DH>qlFb1*sŔ yRzry|PŹ\0r/o,Yq˳_qg&wV>"#fVە6$ H@$ H@`
)4ןEp/DQpXM|`ahij ynqߥOgo
sa'V,Msq^zHX=i[Z-¹)t#_ѓvTٗE
!1C@@Lk? Xn۶--tOzO=T@ wqG((Y%nB_|8ry/g/W<l%>fqY.Q>)w"T*z<|'^EԎ$ H@$ H@q gei|۵Y4r0q0i0"F 6}9&Z^
[⚹G禰svqayaaXMun 7jdX2nAÆ;R8E3Immi ˗ԇQ{ɜ@H
*: H`@7o^Xvm И i}XD=},,%1V^ ;X2uuuӝ;wٺ7 $W6"c Z֔DʱmNdiA4'Dlua0L=;c$s^HScӮ$ H@$ H@hAeCsU|3IFQ;,,a~k9*cg;W?GNǰG:abǏ הsfK pǎ- {ًϜ
{d$N_RC";$ \e˖5k$3]dIvӦMIE<`̙3'yh"=C,bO<[A6Rk^G7+R~GL
f=Ye|ɰy$".Xbf4L`EuvwĒwaܹn /"00]g9 H@$ H@$лWüN8EQ`kSvR(ro^>}H{sa羃m`
Ə
7/_ל w+ߖv|L]l~ 7-"-ۣ͖bق0Sj WL+%xie$ [5yMZ'6 Q9|p!Ύ*/x ¾} ;[}<HCunP C"P,9 D?ry.D^oi7e[wbS1a6zk?~|hhh(7gym@ [Vxի^q Y<iLs{W:aO`gDZJ֞$ H@$ H@,0מ$J
xTWǥJpBc(rQ߭+ |FEO۪vc$ʎ9<A hG6Gwc&xW-wk' HNӟ4<IDB x̾%/ K.x@${
>`HwQn +bK!)KÓ0|r< r>9?IX7:?Ɗ}\`qtM/P+j,|K=_ < ޜ s D_ݓ>nn'Ҷ$ H@$ H@@er1Iĩ8Xz%dt\ S|q}hik
vc$ȕK緋q~KߥQ#k&ms\Ƅv^d~X0wVKz}ӵ9*-)ح͗x
]]J` c"a11[g}Ώ|#7EƀxݻSiqƅ3g&!b ^?&LD u'@@J;#bu[s>!rء,#mS:&3^ѕH~P9W xg.穏x>B1lDy$.ϋ!xz-mJ@$ H@$ T :gϞ
[nMJ3ÖW_2L |sfl0
8fΊ.9np'r͙d{7҅83+
V+> :~x/
r0e*bk8q2l۵?LϙϿ3gυ'EgǕ.9Hߥ ߓdì
Uă6k
!M3{|qx,6 D!1 "->b_lzMI&'v 4? udv8CC]]]Z5w4,/C Y~gm<VJ1FRQ[[& H@$ H@$ H@7@V%ᣡj}ңWQy8jN vW;,
e+!}| kzT u|ek1ᒗ-O^I#|v(E(.5'ZYG@QlaIYy!=9+ պ:RQ۷= H@$ H@$ H@Mz0!
gcѓQmwH_]ǒc c:=*v$5 דp 0} =Q2-=kWh&. !:'wzbڔ@o?m~[a{9:
oBm?^Uk ̖a8,n;$ H@$ H@$ tN`hf>9GBh3Wܺi1ZaFtJE+iFzDE ]Q;dَ^ I? m{ |?қ#0ah[[YڡPm _ $ H@$ H@$ T ڰ`0wJ-o' K)ܕ{hS.#E㘑.q.-5 vfۢ Y<CkwH[E1jh Ų|hڥ?$ H@$ H@$ @6":7 _gm{;*/UZt. sn%0
HBmډS٪ty!jq(VU?J7I@$ H@$ H@$0(kوvv| Htv{=% Hhjj
[l
7ͷχӧOWιs3ghĉaݺuL
gϞ-krǎ a]1}KN<y]رca۶m&1qsaSnc$ H@$ H@z.I@DO|{
wyg:th&$N4)\_Ȕ {,o{[!$
.&g?ٰ~ַ5կNf\p!]>&fȑaԨQo߾| ̘1#<<?τ#F
'O~BbE>'üyooge ;vlXre_oVx ^p&c?~¸qʎÆ
8ϵ~sȑOM6w a G?Q{^^tt H@$ H@$ tB@0fK@:D@,
_?? Heuuukp''I [nD$ԩSNE?;w^J5k$Gb%g7|s:U1 u[[[^>_s
˖- /p[Ϋ(گZRL{
kM,s)__Ku̙駟N 6IC{ꩧ³>WAyʽ/No]+V?_ҵpM76 [0'w8fJgwԩgϞ
A{̘1#3^zux_}w4͛C}}}C?|p=/$ H@$ H@(tvp] H@ :GH?x#RĨ
6$1nKeC,
a<L GBx|nNZ<Bx>I)|ի^<@(8Jm'8o| h#/bˢ]-D9' [.qᵯ}%ެKƄPO}*Uް0{ӛ` _Xrg͚x N_-
O5b$,Ho~×(ɋ1vgҗC-5Ã!0E/J(-OXb<SaIx #sf~0ĸ =qRkN|O" cxEFڥ -:߱:V$ H@$ H@$@[Iڒ$ 0]%?D%V֢EBE^CB߾oL"wZl ovXxq>' ݣGvXyxix"P ѣlV&$2FD^9Y:DRƅ :nOw; <H Wʝ?e~[ց%2c rѢEɫx%#}Ke}0˂k^;G8ēs\9x x6vh ;8qb*9-^xZ ppS*t z(VO6C/g#|S`4կ~5ڙ
.-oyK@߄ƫKUg VExEC P>|x^|+_ K,I- >'~pHc$ H@$ H@$Pi:U$ H@=H>zjⱉIZti8Xhh|$!z!f!+w
!B#n!."d!^Q lɛۈ[.^zG$$qqڶ ǒgO<o=Ky^MH^▵I7nܘ;DY;Hk"Fn-%]wݕ[<- 2}͢jns0'uv:cG 팷)N6 u{]*yl#"$ð4QOڻi)">5}S.}MڜY^@PEԬx_rNxq̵G=uyI 1{$ƃO}Êz:|{?,{>@-'=̙Sii<$ H@$ H@@w(ve% H@7 a=ITxS\2fP|epFy_a9gdç-M>Ј ؖOO՜_%!B(B%'} 9!!P#D&G<5,!P~Oxc"W& 9S:&\;Ύq|Cpx#jE$/<nG(gFE<~Y 닠]` cW$"v:7*} o}[4?`IG(˿Lc<]Mmmo{[Z ׃\ 2;K5+\CAh~Lc'nofknۭ$ H@$ H@*A@! H@%NI^uSP#Hrh#x"PCF8k~ma/elCCE|-MyYfMrېq=9(k*$`ǧ%"/
Δ%y%#zeLcHR$M:5 WKؤ\3!vwfD۴M'"В(1أxL M<v} N ^<˱fe,\?
F EЅ?ۄ>"T3˿t*6l{qqG4ۙk#Z# \ޭ$ H@$ H@P$ H@lqΝI << Єg%%B. E Es IfԡZCM"r6 }$q1 Z ć\&oinS9<kĽRBcq3`IcDGt;>=/ xɄeܬ8E=5Hh]<? !v]KõuiA.ɇ'!|$q.֣ e8Ή5uO4ÿN~aʔ)Slq3&U^ g=ۢ 61fx"2ce/{YW\_|Fq ~0L7!k(®4>~ ]
+c$ H@$ H@@\>+U)ڑ$ H8H@Ѕ'b}|el% )ϥaCbKbE˯|+i}CI h*(-% ~6 /[*f]bLKסѰJX`<z iӦKsa0ECF{GR(i} Mܩzfͯ}kI\)F`FP-<gnjx 4!"lb 0҄MP(7 x"3b͙3g&1 !|,_
ܧ0!p u2b[E6O*, a_lp/ZlK }1I@$ H@$ Hh+IS[$ $pw#4-b'?$}KBƍQ%"ı(^x|~N"b x;?Hkt%ǫoDڡ<@ZSLЙ@5PJPvul}7 ʾoLxG|_$2fطgϞt ӵS>v'ݕɌP\#kHjc|q? K|>; s|6CkwQnS> 1^Dc<F6^w_ϵ9ų5/3p$ H@$ H@ [4Kor6 [xy@ >|t5h/gb$ H@l"*ޏ뿞D0 Y[Dd8)˹0B+ަzk@'VZF<=Ss KkJ*y˳&}DC>$x)ތx,v& J茧\R6$"=I ! Ncx'?I6-B"^΅s>wޙgl\}0E'B"Oݢl?H be\űN^wq^
r=Dc-dØup\Kb##ۣ<ו#܋0B0\f,.by H@$ H@@oW742!0_>$m?忕x!$r*]P-G< H@@ &'a\x(@@cÜ7%w6aϳT{oZ\^(_)a+Y&ޏӟtw
݄ GZMmR2{쎱߇ ;v$hK_SyRTlq5yM??&hj r۶m 5 <p vb\Y,w4/eK˔ 7Rcu $"rs>I`}_ Ə Ž'7cB|E.zG?J_G,/ )5F;x|V\kfޥׯ K@$ H@*g^Pf}c? ]1~ Hy97暈m T r Lsh$ F G E7</ [ s+) ^iA{^,7,V};Y<]vh3?炜cUƁ"!zປ_\Ű9-qQ1AKJgVPo6ѹ4aN<!^f oy[/ţ[#=w;|3 ַ >1 ;veG aiv(+` mÍQ"s+ԡ : ֭KЈҬ-r @ IDAT ka94x 绀m^mo{[zɀi y{^??%a룇sWEV$ H@$З7=/3dfncyc'ۀ
p y& d|ODL]%ZՆ$ H@D Q
lG#
އӧx䡁)?D?aB YyD4I6 f.6F$4-6 5>XlXJԥψDqZlD +w֭o}[0x{%.x:sͲhNy UZ*9thIhIexҏI <ޥvʋ\9f\ KYDSdÊ{&_b42ן=/"^C_%z SXN] '?Ź<u7OuyYo$ H@$ ]\W|8Vr:#Pmg͗$ A{M-B׃>''HD)B".ꕆ'FCX:q-&@!aJ~6<b+6s7Y',fwx{2 !Tߟ8"]Jo% hѢKYƙNJ 1}$>$m9Q!\/~1PvY EEe+VH,k2tf|+1 /&)ùWfDgΜ֮]<Y`Em=#㍝Pdl1 K_R^W0 ѣG!>l}W"T`>>}{Plg$ H@$0H俥K $w@N\v3h$ H@7 b {3qW$-၇iO+ arrl{/\+6sY} _l> .Baw=s2 iM_@Hbe C%x[2b#eLeDI,"`N J"(c~&|>hӛ
Z,7*᧹V\{ە*Wh7.k~Nb5"? x7+鮻JhEE$qz P x"r}+_Ic|?kUY֢eg6^ɥ*2 фiS:
& H@$ H@$ TmjO$CX0/}K@w*b ^a.!N!z!eE)B ^WuIʕ&D4EG/'. S!+<,!P"TS8\ G>T/xAD1G Iw &oN FHEh$]zp' ,O~2<66w?#Y&]?N<X KE$~&y,y hWM<W*5z, /kr=r }iӦu\c`uk6"7y|DlS0?nc9asÆ
ic^b;|=[n#\r.V$ H@$ H@&@[iړ$ g$+~_Ma\YXً P".t ?h}(b u4D CУ?x/ڢիWr\pa?Eya}ܳgO,_*T DܿB]?ORbZ.e.~*k-4;7%e ء ^\ $!of^H7
I>}.y"jN7S8k!_lem# ~xX#\⽋8 Z" rޣ ^xp=~i1>
Ȍa/Ξ=s⹚' #26-אu&[|m9\jF;5(O& H@$ H@$ TmjO$CrEBX?䥈$c G $"* !v8DS&)\/ \(I> Es FތE+9J.ڤe/*v`H JE8y>ń,DcOQ̠X}YhDGL@DD5SM k/|! r-<;A]:lpM 8ab7."yg }x&^c~Ö>W l>1vP}+~/b96>=gΜז: 83SI$ H@$ H@E$[
ڎ 8I?O<hmmI1#ČxZCSsVZBK,4!я~47v!tq3 Q VB #eA|9oQ>9TBel+@#rE[]'uN̎ ;$ ,Bti(˺wLݼ,b5e [Ä;9EdTD,`#]-qChEd ! rोM$[5 ޥ9ZÈًcT^_kllLޯx;NF/=ϺHÉcA_a$ H@$ Hw7'щ%1O|"<cofem~ٚc>ej:kqZffxsy& d a1~;vĥQ=n}WeG$ <(28?P=&;{Fw( DדMKؙMjY[.6Yߴ.3 .] gg}}ě/yG̽g[ś6\?l>\zû3$tcqt5ٶ[ H@$ H@$ ڞM H@@记ԙpu-ݻv- n(ڮng:V]I--.# űS=[ H@$ H@$ s{^iW$ H@$ H@$ H@ $@; /C$ H@$ H@$ H@&bUml .\aweGq'Z[%~YZZ[ZCkkpҖ[cE ;, H@$ H@$ H@
%P\ tc T\墶47f8:Ĩ;H[$[ @e6Bs9 ۖ$ H@$ H@$ H @8~t8ul0fT;ft? rڪ_8aذaaСa([t@Qn> lss|!l9f;UK$ H@$ H@$ H@@ZKF5lھ3ݰ3& V, gY%F< hMMBU刑#CMMMOW Ae?{28^j8755?$ H@$ H@$
7OwsrxyΗ-/=i/b:y=bY:+-?x6< ߪ!Uaa\[NUчȱ᩵©SasA,:ZTӧ뗷c<VFoA;bqX& H9+RѕyN$ H@$ H@:#p6=}a*E> ?~|3fLg;)pܹѴdI6 N**OY"^)]p! =z4E St\{АFqYbGck6'Y8]M v8aKcHi3gBKNcpy0n0::]En7~Yxlh3jd6e5ۿS=th\P*̙9rY$"-) cWT'wݔ$ H@$ H@$ H`@@p;vX =zt=ꮨݻS" De˖#G۷'Q.D ^ӦM ++Ç]v%1I cǎMu>w7dG*+6&z4Gy,Qׇ Mwlר:
ԵVňMaaxgL n^8:Ym斸b9w!4GNkW+{67pImw'yG(W
3MI|g;^يb~[9[K{C% H@$ H@$ H@$08 PՊ:2zHe)&'"mg LQi+JmO[ }ڲeKhllL4iRgCb8|Qo߾ut Qq'NM6qƕK+x^8!jl!̞5=X0TEЭIFݸmWxz0|Xm}P_73ܶzi7l
3N
#kQoN7 Ξ !ai2iB=_v:\9^aHlBK=sz7Jv*#ۄhH$ H@$ H@$ H@n ih6<]pa
1ާx"|N2%KP1" '"URxbƥɓˆLΝ;Ábqaƌ in~"q1!-ݸqcp3s̰gϞdq\&іqر#^:wl059vFpNx[TB/\h
6mlstՙ뒟ܺWꪰduNe(Ƶtc(w(ZeŢ0-WkB֬ls,eX>eR5
nvX$ H@$ H@$ H`xɲ+krvi mݰaCIRg͚Z_9`*O&`W䅋x"#" #{YKr #( . A R_M9Z1 +sWt9y>aKHυ脛D҆˧EA*̞1-=j9QSsuj{qcG% c'U{ic%a鳜
֜qQ=v2 x͚1%,[7 Y^A7M9I@$ H@$ H@$ DNB #p ("!l"?~x
s"/BkQ W.+%DT֯E;wn!i?{ruiG?'L>,QDbD2?\[<!v.^b5Ó1D#´]5]|u!Ls[\og7Qd
Q9p8{իF]@mxaM=~Eq6
q}ݺ(rIu~dKc[A ^J@$ H@$ H@$ N Q,"!rr ZB#r |HCuI-eM־Eܜ9s.)-)Jf+xϲ>-ur9O}?Y8| ߺ3<ל=}^ϥ}eL F
o;_=4ϝ aZ) 9z"6Җ=QM+5i%0; O=948K{Xܺ Hm=-J@$ H@$ H@$ F !!5f
WL<N9OB ={v;Gؤ,b'ĉpXʺxrnʕ ޫ˚iƔmm˺xDS kkd2y\5fMvgzN-gY E+Q#]43cѫvƻpi0u=5Q`>$~V ̚n& >x/WE6% H@$ H@$ H@z (k"z"[.y6+ GC<^|DQ)Sr|<lYCԩSuf a=U"#=ZLH9-*,bkccc?xWe<rnݚk
oܧ@+[w'rl[g8[naG{hN~Eq}MQ=㚴Qݽ`r] x=ƚ6
5ԍﭫ8=܋}h{mH@$ H@$ H@$ ^ xG3f$SUDNOY^xh8ZLR\6lkCCCkɓ''L+oe\#FHb0YM?S|s k#[=myi ^hNXx~/ijgMkU\[vK8|!kt)7{Tchl#kla,fkk@;$ H@$ H@$ H`@$iӒJ>"(:sB4)-^$lyϼl.y"R䗦\/Cݲ%/uSH^<s Lb x
>F]v?n Z-ú
[Ƴ2q6"G\`vXtQl;EDFC¢ys=i0[S]fQC^nk8xX q钤$3lXM?gFXdA4فhud$ H@$ H@$ 2"&TۓoEݿ
<f̘P SO}֙E<_7.Ps<^x[N$%/# ;v,E^dIZ6[Dc֦}'S?VZQ {{MƎ ! iH :m N]s- ^ 㚳7-kg v ê]x595^в% k8<i0rSMF!w(N,UI$ H@$ H@$ zȑm) 1.&ewܙP\s!v۶mA/U#+K-][ֿ-=K[7oNb*zĉ'E &WaȞ{ |#ajbxN7*L21"Cl9,7\ F
b(i[DH~I <@ gΘעR i;:S,cVI$ H@$ H@$ lj]n]N 8HT<X):uuuaӦMI%1acHZ&qmiyg85͙Uٮvv-\]`Tm
/
x/l/8 5ݰ6RifRIq9~:|WIy;{ι ҖÅ
X$F6YIΝ cC#d>z9/X=ڴ_ ho]0wKg%ɑ=͑7\Ⱦ > ,c#waqɞ<{a
%Q3=jOD@D@D@D@D@D@D@D@D@D@D@ ҵ!?E"+RAJ5K,0w-###!:6=sutt4qHR6Q b!EN.WQ7j&cGZ垞mkl c3ٰv泋~
ȥf-:lMUo=^!;2nyb}nk|qo.KGAҺ=^'r)rAWuy{!ͅ
o{'|psW$&ҕHY beQNt* >!=E"hُe_/b^ʕ+9u d[D"Q&wjP'a;翲nS.6'&w7 =g/9˼/ښ*g{j}}Þ< r(c,175ںx`zV]?}<!hcvJ8m*/qvlm6g,477~reFuYuY)KVT7`vq(/ol䋃/AK-" " " " " " " " " " ' ԑQ;1'ǼS4䱹Xm.SOAr^ l,s~ Zzv}; iMy 79qlbfv+2:{:HťemO=.왧AF}q57*k\do#msnO? ˮE
xv*l/n5mVgn-~r>aZCD& mp}^nC5ʓ'OBps~xX&O~|y
=g}Cz=qo=NyъڃG#VZ뷮 [#`ܧ 9{TR\.g][
6-;~>.iYKs<[8+c\C[ i綹'%#\3k̂e5;l&+m,UQ9f 4 m||<Lom /Ub~xrׇ?dR/gؾ&OrՓ. 'N{,fqP~)Ԗ!kk>촇 mmfO_MzZwFѭ 1{dHk<M
ŕ[9rS3~鼟 |Rh ;?FҮz\f`]f B9o,Zf쮭SOxb95Uh%f5M~+-˾y.S +0fӖWY YxX"@c;E&FNMMᙔHS$( qL $kGz1|HUbBAtIDDx͂hΝ;!6ɻr?}^xqo&pB]D@D@D@D@D@D@D@D@D@D@D@N:Q z klSՕ!..q tΐƈy?_ie%~ 8@P`giwznkN5Ow<}}EkiB&N\9Oa6eo٦7jZ4e++[snM_\EDm|`ayuYZR%ÄtD|"_z-[24F^|ؼ] ҕERH ; @ >|ܜw%r]]]lKA{Q3d |ԋVj"u<F"_cv8Z1<)w8yυ q;63;bK<rG9y$i4c?yv!;f+;* 7{Jb(3C슭sʖ[IE+;sݬGѺ i]³_ Yoi$8eٙ
K:#RHDK&^,IIENNn(.jkkC|Xi X}߽{7X' f܂%17y >d@AlcnܸasssZ"PgvsvgMN؝_^` W\XEy
t 38M[]۰cVUYf_^hUk8o;قvSO>Vī<u|塚oذѱ3#x Y!T%g?sE_m`E}f?Xiy+ɅQE5K'ʤt%}a?ѧD<::v}}}Q/w}/8酛<9t0 p{8 gvUb$ϧ ;Uc=]glRkokW
{dݚ?m=Z;Vnos[v3\ArpsްtDΞ,)tso4kÿtAJlZQu,nÿҴmLwd))v)ɇr|D>~8Dٲ # <yd&ۈ%ԩSyg GB ڤB:icY,X
GÖ́D#Z{=ND@D@D@D@D@D@D@D@D@D@D gDUUUor)97ʊr;)kw=%rrBvw{M=0ϯ3- mLA}X{04>+Ƭ~j7W/]_}J*=mrieoG~sچGxT]GAF:ܹYcˈPRG'`3-w]h-Y-#LI QqeDnTs^ݭp#a^ơ"" " " " " " " " " " JgGGaZmSNj lmm#V=&ѧ!nmzEl {C+Q Ir&}Rᑴg%o6igۚԱ<fwv, W]xa5Kyᒖ @Φ w[z֏Y~EL+1Roo2 Z͕i>j[-U(ڷϿ$%1Ҕ9_
YI^r,27ik+u_H"L?nd rwz'mw}g/Bh_:^0 8u~1j {r$6v[泼vj=NGvy:tVrv@ASUIGj3+t^|ۦGǦ<Mo({==q)Okٹ!6;7j- =ï gϞƮ^-w'B%ݾ8(ѸZa?w\n}nuho||rLG;E@D@D@D@D@D@D@D@D@D@v!qFR, "Jmmk
6=3o+S fR-:;Z]Vmx-j w
#nh~ā b OQ좵Ҥ .UbZ#3}>P;aGryDGf< r֣hmمp / r%&
9ONuImL{˷ kdd$Dƾ ۶6kjj*JxF2¹mSxxx u hW>}*Lsp8
|N |-X F3]YYn-do* Dڪ}t84-- 憧7_ 0l7. B"*<ʶ^k V!#hsO`_ 'u/QWR[[* ?Bz䙙Um]ܡP&|[ '&&$hw" " " " " " " " " " y Ĵ ?m93𝞡mPE=;JKR>Wk]x Xr,<A63x#<>'l)lOm/-ѷ%筬,]ɤ±禍n73!۵aX"PwjR?6 8eEE]x1^YYc{QR7Aσevv`u." " " " " " " " " " @Lk%ٟYGGGx~-{}W@ ڐCZ |'Rz| S&rOnXf]1XeG=eCR9%=%2mE
V rcn[*guu5}; ''' <1_Bn ?DjRkg/hYBTn,}D-~m1ܶ." " " " " " " " " "Pr_eHo3_wwo_|#Nd
ڷ!W疥}kgbŅ+բ˄u啣r]n:;"Q.//-..Z__;7(# Bj}}mD0oA2+/v fڍp)pUUU 2W|1>2ks Sf2Wn=${Nʏ9>-" " " " " " " )w_E<ok7"iO$<VOӡs#p2-szt+bv#c=XpK.MKm3s!2<! ƍb͞ZKnd((v D #͛7sZ*3NN2zsssA+7== ~w^kOd0[ZZύ#?nϟm%" GG{I~=C߷_iϞ=|AvvvtgΜ3p8H'Iqe)sϦH=sKT n닖BԺM{)<G¾x"tX X]] #0BAȌ6,24J]ưSk '?_TpNw 28w?c|%
Hn8F 344Xt E@D ~P¼;ǡE@D@D@D@D@D@D@DS'c#'?߷ɓ'at i˔|<8H'O"b<MnEY}>lnåG `\[Y+Ȣ@$rT<g!E"HdĄMMMt ?D랴|ɾʷ?m[ Yk?QYYYe[&bcpp0ڇ ~i
Q ?+WrIe8j^R scQ" " " " " " " ")yvWWWx^ ̔ ޑd|UIm}2C6 L?
ѳF˦+<uٲVB$A
ͬe^ѹ
L)Yw="rS&ͻP)2}QD"n}vBgc/Pwb5_,>Ɣol#1Xui.2(4.b ]pIwLƤm" "p?{H%wIڣ
KD@D@D@D@D@D@D@~$3g<[gDl:NWv 8 'Oк8et]<eftj¾f7gƙmI]z J5OmCP
ypҥ j={$ /{ɡYD遉FeS8 )\7&ڤB u#r;cx'4UD pb^m~a"" " " " " " " "p|ܙ !#+fggI%p-&YRH5͖lsi6& ZiuG" uvqNaۦaL ^TMw |Gě
E~rr2Y`%/ic-===An]<gWdRh{nBc˭:р|I"6D1y9cEfJp<i)IOD@ ? Ϗp.yG9%" " " " " " " "3[^Od
ZDky6sOq<mrO[٦A{\Ua=Qݝjv~ѳ3 뙓-Bȍ )˼<G.K kQƇ縡!#6eG[9Y-4.%M0Sa?%یHBc;672hטqKT.빅klc6a"." &ϽǼ
[D@D@D@D@D@D@D@D@D@>.)h0+qA]͑͵[ mKږuq]R%VrkƲVk0,7^_ZvfYI_
B ySID62_-X$(yE13 iP;#Dr
D*Q9ܹHQƳSm& ) ߿ 6?l¹ИGn|vGC" " " " " " " " " " " " "hAkr+=}ٲ8G.?Z*b*+Rꭤ+ Wv6gGlmז rvi+;sRU^ m ((,9|7Hle ىݷӐb]ER1ԄW *'8^$6v.t@1N$Nç=gde8h'[В┕6W|.im#iK'EKwx:| aoL~g2X9l<E#[g ]kYǴSvx.D(}@J>A[Ng~)Td\RbdZ؝ Y*WWWCv˘2NHS\'7Sy8co [Jedmm\_ɻ &+aSgڣEKH =%rvm̍-TɳfnF.u;K7<~9x9{PP툀@ Ѹ9D"eWlؖ9G,m^*"$pE!hi
1z OsZ܋^IUQ]ۗ}TY4[iז9FB-I PVVGdJA
L#g)1z6-wsAjXUUU`bwn3~G}TZ2J*<ݱ%=c٩G>m.Nffţc]ĆT[|nڔߐ*TZ7ȵ&" " " " " " " " " " " G t eY5Jٸq^|g[1\6| T) AxlI]=quO]<v{D-˙58jm[yclT oNd4㪈 $PH~OQCK-j*Uҵ>XɦGBE҆V %f ϛ $@4_yNvI,noӂ <Z>$eq $" " " " " " " " " " " " "Pn6ۢƤ' A Ղ8^(J @ IDAT쉀0|8 gD@D@D@D@D@D@D@D@D@D@D@D@D@D`O$hID@D@D@D@D@D@D@D@D@D@D@D@D@D H~8C " " " " " " " " " " " " " {" A'L$" " " " " " " " " " " " '@*ur^l#-+M[[߰|| |R ⊀Wؼb#/mf~N75XV(+GkEAU{" " " " " " " " " " " " "L&Ҕ9mv{mlfm@UT[!JAw aG.E@D@D@D@D@D@D@D@D@D@D@D r_3 (ߨ[|嫛^veyuFG'mrfβ̾WN3~ڏn OҒ
UOoJlna =Rr"i Dn7[[_?*dr|i h|
d| MٞFb *" " " " " " " " " " !@4̌Ά*++1\Vlѣ/.X^^n
bi<x+ XorEI{UUUv̙ UTTXsssc=h٘o-ثIG.ye%VQY-immJJJ.t{OغO_pi;26agۚ_gfK?u%uI= 1 e$z Z e?HneucKnM_-,^
%ƺe|}cÏ˰/M2^w똣 8yDd"Ƣ<E"3 -tf666f/^+h_|E > 5یbIxi +O62251 b{{{=ò G /c谞ws\߳~s!ҵ[[B=ۦK!"n皽UW٠K{5إMKozt~e. 3sv{= u^iލ
tOrM6U@#~w9C}`i.-!\~vPNM KuidpdҖqQ[7E}$rI/ n*" " " " " " " " " " "P ⒨V"L---VWW"*HZSޒIE"Wڂ,MԯLrE& rvee^~ 6lgA˸+/U f D>{,lg iKD|2>{N!^lɮ]wVs <gõw9{C{؊G~~] 똲~fzZMM #sS4߾8D{0̺l3|fvj#_p9;Ć =U ݺ9e|UV|I{`hQ_a]>Yo*?b _YDl~u;i \MAV7F!!-MMM '6&*X"aَ\eTOmcJdP֤9>il^"k)E ^EJ"XL&ʖvf" G,,s K$-Ѻl?I%f!Y9^I{9ژu}Qw <q1kl6{iyu Inc=vn!W356xVW(.UG iX
Z.QV")6o߄ND@D@D@D@D@D@D@D@D@D@ދ Ϥ۲G*V^UPsv"oiYDpPꍏ^"gĴ1>EynYFs<}06֗|TE(63R7FEK˕q/Rߺ ]'[Y[=.عޮ!YCC]]qLǷ%kO{ М ?rG z4⑳.gd( 9\ee ?F[.h?IO |Eb3`Db (;o߾ H-Lƶ|H7L__diK _!YxE V Slx!eqp|nx|13Ma[Y}NWQ; moqޮx \֦z꠫ؔ[3eiO}#<uwM\Dže4 _ k嫞E-"A[ WQ " " " " " " " " " " " ΅E&ѪRIa %ioooQ]4>1.mE&BKD?>HT{qE+16foKme2eK_
,繸h?{h=%4NY QZ[:ާW10>{K#/]mjf~R.O[)Ѱ^gyy%4Mfڅ얜+*9 Z(@@|"+A"O S#ӨK`y!<c:a%
A#caXG;B>ٳ ^植%_!x_z"pmgΜ ǰ ?~l]]- b<!_8G.gcZc9i/xz-!SWH. Q#/s*hׯg](?I5{i? v%g ƃv\wYK N
!DaJ4'O(EFȐGG10BZʜw
ʶ(Yy
7 Ŷ SojjFFFlff&Z cA"3^}KnLi ύ۽[h<'aٛw ӌOְYkR8V8
>\`Hk<쑴s_SS3>'[H啵xyeY^<cϻ 27X%hJ<D@D@D@D@D@D@D@D@D@D@D@>y" ;>>8 ,mccvZcd /E"l'&&B㉰E|D"RO>
qvttD/3.E<#re "m1[O^.-OkX v9ѫjyYGӾ-tק%G##l#ad / ˖HkL:*r味)ga-A{8)" " " " " " " " " " " 24AKz`E"8N`) fB4FFQ;c{-T1,s rv}}=p<bgHY2T`EϦ- g_;.sAΖ<YDjw ZYi ƆSG)b
EOٳᗖMyc+ =} m5!1rj¸%NF6C" " " " " " " " " " " "p *D`s":s6WD(xx}pp0 *(]a mKa"Z [h\.s_<6J(j֭[A _z5uDS%h%{>6QLNyZ.>3r27 VV^NsXN8Iw\n;v1:i+m|]ƕş?R" " " " " " " " " " " "p $,TD2o,b]XX2D"y={+Ƭ#cYoiiْs"Yi3Yk?Ի~ܹsa\KѣGcʌ&6ϟs<q.-EhnZ.Oq8,i[KG2[r6RgQ/q]㩨M/Yu>lEEyrs.KՉ|jaVD,(-|=}tDZDJ Q
<! hp6W& yqz|>p>Kf d99KcN}vOG;/{)᧷l vZ[]iyZu\Γ蟏OG|ܗ,Y[\;£g;[u/k[6лp0"f;;;#HN$& _WR#\- aI#<== "[~"Yi7)~ rM
i|ҥ/Q דr9 Y 6y^~s;I#ًW6:>a |y߮^siW 6ܼ<&{ e<ahi?7J2Y~=c7nyzm1]M'O $Ze"eBE,#8(9_čhq=Ga!?dvn>yL0)ɸc
; kemfmqSD?x[juŁ^+MXIi=vr붴jw} = rvs?*=s:DmN؆KکVޮv+uV$h|D@D@D@D@D@D@D@D@D@D@D@>y1^(f IL#@1u@ r^
S7w:6Ye)V\/wܢ--Z\qy\=v|/۱\c"gIk<|L|O]uHg/C$gsHYIk ?iչ HܺG6MxT⊥<o:ҽ,mszj\Z EOA}{VVW<U1?0r< j ]|PhgwgC$kv.מ(AgT(" " " " " " " " " " " " GEo]]3sVPktk5ZuMTV ;9K,rΐ9Uݒ.c{jf5[c͍>n aݬe\ԚM Y<1"%hoH ԣfzZC)ro7g.=7ycZG#oYKm9|z<rb^Y[ʅ[ ǣc>' $9咶:Z4V?jZD@D@D@D@D@D@D@D@D@D@D@D@ޗ@MUww)k HR,/,zZ㡧.gGzZcW味=r`_HioH-Azxt,DzPM{f}= ay\K h " " " " " " " " " " " " " o`Vs{ɚnqyŦ\.>d( }=!q|r6A͍I槌ݴK; DzQG+AE@D@D@D@D@D@D@D@D@D@D@D@D@M
uvqN77ي2˃=!6ָPz”mk1Dfyyv VUY-qۮh<" " " " " " " " " " " " $%.;C,ĝ}f >&2+~@&yXa%vy)
9iK," " " " " " " " " " " " GAԿ+6>9m%L6celݦJJRyjk#^]ξɸ9iS gl ;"A{!@luVg/lbz-Xc)ÇY Ipetɩ=O\ft5{5ml 2m-gljj?Hi$ fi zApW" " " " " " " " " " " " :% WuzH-\*+es1)A[WW&" " " " " " " " " " " "p Yyy!Ç܅ =aR%8< 2_J- a46E@D@D@D@D@D@D@D@D@D@D@D@D@D@% A.mC! A{(XըK@]&"" " " " " " " " " " " " " BPZUEO Ju k82$"" " " " " " " " " " " " H@~/--!<yX:G!;??ol6 ǰS >cT01nƜ~ve2=nKӲ# A{G 11{={u vd"q٭[lee%/myyˍHݣ566fn---o]Ow||&''mmmJKKFo E@D]?X"ѳD"f)#<Qw|X.%%%A#h N
Z"߿ eK ێzOD@D@D@D@D@D@D@D@D@D@D@D`H O( I bhV"
)9u^di ڭ~_Dɾ|cᘃ,О
ѳCvww۩S%5sLw{E@D@D@D@D@D@D@D@D@D@D@D@N ړsH3VNMM/^)
633!-뭣4ϟ?+&rhSgφ>vAbbL K[aܹDz?kf io<r:"!{ƍؖv 3Mgg9s&ԫ璔{_D@D@D@D@D@D@D@D@D@D@D@D@ u=hR'Rh ]CVVV Q~"]c4,=|6DR_p!SrAbJ`ڏ"IX#YϜ7oW^-~ؽ,_UU
!N 8eY"yIbZI@d^2j!ѳQz TMhD|ƂTb9YVV֑XyIX /Gb>}H]B10iٖ,9Y=ΙHa
2{0vf[, @<'gͬee㶸 c?
~
s'ayŢa#_yE "hTnZD"nso|hOŋ!ÇCD+ 17ҘhY/$-ѱIqhK
ks !Ea(#1$64\h]D@D@D@D@D@D@D@D@D@D@x3e
ϛeϥ C羳 y Y$yND={?*M \5 7b#GA1O+B(Z/HW"5T~ pnԧLTl`m.Be_
"X#wy/E;5>," " " " " " " " " " ǝ Ϲó|x;6
ȤeǓxl+nLE6H?E>C;/R~pqWL*3yƟ#y=nv',7Cd-m#RF|Q?Dن=n,1Kd;R ϵ|TD@D@D@D@D@D@D@D@D@D@D I<K&ȉ{Y8d;l-^,{I2˟yu=;σA^"m0bA2I8::6V3* pЛ@s<Q'?v>^xWrF`NF"#<~a ԗ'su!>_?#E" Ai]:[ sIYO
MĄuww;D:]K+ѱ|X AI}"[GNq| 1y!6^zNm7NfH_aǴ pMIAy tCQ" " " " " " " " " " ' cvz
= ڢ ~D"7yU__oHQdӧOCd-/mɉd?HƑ O|Qq(ɓ tʴK}֩Oda.P|gϞs #Coݺމ cO}˜c'3ׁl=1}' A{LEKHD"S[ZZB'*˗A"aǏ ch+X#6
PA>| %QɂDܲ K{eC51 e|ǗwGd1,xp!"k@ M`˰s Bsrrr;z5
ZDBh"h<R# .ϝ;8e?QN__}Cӳ&u؎0&B6vʛ|O,b l;suuu䩩 Y1*" " " " " " " " " " " " '"hO;#6Ϟ=kmmmR3 (? b X%1i}I6i4ʔ[SSGꫯD([=uTog|˜_v;(hrJQ80VDًFJ6һL' 騣h"#XXF.W,lOۑIjM$o,h<32FΑW /}ed2q>\{PcR;" " " " " " " " " "W< x-NRL8L;!>(
Eq$4ܭESdԧnwڿӾd_,n]uGE@D@D@D@D@D@D@D@D@D ~&,nmC|
Jū fG66 z'I'.EF@.q: "_ D55/8"" " " " " " " " " vߙ22[sOќϺ.ti%d|]h.z A{?>`.uE9cD~ƿt(ɴa8| 5/S.i1 i?8wcz9XYbaZA{.t'
3*_1UníT[{/" " " " " " " " " " dc/Fllcf}gմG/Y?JC-?
.jc$_j0h?hMTE`b6 8 s?}m9[UmٺM;2<@]٦,/Xznt˝?K-,Zտm[t[ M8)@rښUU[Eyy\}r K G%d|X6Sm=c_ثC[uA4uYB[QyK ,O=}d{|n/惻P`l67ѳ|r|'.d39n
=kkmKz6֏VW" " " " " " " " " " "p lYQ6Uis5aa)SyWyOeexnОn =`ىq[^YrlA[ZZkQ~k R/wcl?Ywzq~gaye"[aQ^^f6=3g7?ĴԌ-,7/ZCo/,k#4I#A{R)" " " " " " " " " " M^6i[U"i׃AFar,QuNHԦO{,\Z/u)iW+s{AՐ2~:0um^oܻƱrsL7
]yc>>Ob_XثOO.s.zhMSiKScVWSe]9RbOp?csdV퇈4.}e2PW[}|! !?9I5$" " " " " " " " " " "P.2YpirY DB'$6]*_WyX]nlؚGZJX/;cqqў?n
N>m
F?655Х횚촹9 q\ԏnwXobb"WDkuu={۷4ϑ{uh%a2G[p aV^Vϱl](B 9;;QTg|v~{Mwi#cSL6 K?G'Sk]:gU.i(?_b_^`u|.}.Vg" " " " " " " " " " "p| EU2͍OEVUUy #zf
zZ>߯ p,2vKKKŋ f\#$(i ^w799oE[GGG/_ c{uy啧Dw/Y+Fe#by!/^D1csq~ uڵ'i3~]g|Tz:B_4r{.qb|¾Jne.9]{9d몭캋z`\MN}q킏rrscbl*<}3Q] igVoED ~)2_cLavi>*" " " " " " " " " "px>Y2E(Bj{aG-~9xv̋z;]x<ϠgffB$*===&Hڱ-PM'AjD"sP/ְ/9IO伈ES/D?c%ӧŸ r?00zr:ƶSUl.h5_.<_ܸrtJ"Ϭ-ww]xzJs3ީvjRZO166>>kxxK˂:q"~O4`Zjjjzg/Hvl(ʈ:|y:u*C}2"J~ɝh!"k9"2y!xKIL96ja"rgn=lB:(Gy66df|3jE"Eig "7M; !ԧW^m?+]"`yNPU__v-10&,iisݻw8q u?pN$ 3ʣNoܱW7ID÷?Ͼn mOVsњ5>s٦gl??|WVgk[
9<œSG>qnn<tk wa & #N _b/o&|,//ٳˢ*T_~ ˗_L\Iv|.]|>%ė#6KFED@D@D@D@D@D@D@D@D@@ʟU-3K/-/?M"lNGQt+ϢyL!kƳj"d)<w~ax U\q'Q,>Ƕ\ȱO< AHgΜ szH_Rq$+dڊca<#Җu "!ESbGx ז*ٺH #c.E~Ukmn,\jOc|@7>UOoLaۻ.i>ϯ\|\O"g~!ikr=?#a#A{B/q E{n`t._|ʕWe6vvhz.\!_*" " " " " " " " " "12b|@0FFqq#=d;ϩd3lm#L;;;ëjO%[єAGX<%-㘨Go #IRg[?nc 9 (g `iI̍#Y砖sGҮ/
R!vy:8sI+ct9{}{1* >sM
aq&TڑX'O]' Fl睛 `va=.%Pl_" " " " " " " " " " " Uh3i)Ϝy #RG@<f 66J>z(DrL5ϼϼ,}qQReziF 3>,ѵD6
cd\ԏO=+9{ocS mk==3>d_vN77n_bØW5{
HڡGan܋{}N0yy
T6͍uܵ}9Q$h8_"#)dȫ*DT`N#c\ yHS$'"9\)HY2"c$pg{=
VR3Hmjj
qJ-utt#Ji !K~o}D>~80&
l?&ʖ<HYƍ4f@ x܊ZG_MگRYki {_^VOm CV JYn}lˤkb?{dkv/-w,29]H :bu " " " " " " " " " "pTK"DslFytT ~s6t">lybv+{1h y2C~ǻwrO]O.[E$%kDF %ҔB=SHU;w.},e:533mhA|2 DlX/60ٳgzYc벘~ϣ/>e|W-,g:ښ+EÉ9>u8HnN. gn=7veu? x0v䬏_:iOkzc=k[)+ 8x8"* Iʏ`B\#x4d
o9+w!CԞO"Mqİ?{?/X{S+ɼXqEga'9 - 90w,WJ >[ epn: A8%Ɣd]_z5D" 㡯w? q]q}ƹ=q痭ѯ\sd454u:|EI _:4s.zc
<y s [yh,'}Z#" " " " " " " " " " C لB:IdT<^On1ю:7 mq#e
v 7bmi}{^/_[MEٻu?p o||<#|oGMK`mL5LwĿE
`YFIgTMFmicrO'-/:<< v,KQRzAEY˜Ŝ9>1mmuIiK,r+>lc`G4׳}{ٖ6U˞C.~j\_>#[^ےAҽ#MlS}ymк:Hk> j^mߑ b7x#
9~a QFD@D@D@D@D@D@D@D@D#@ yb
bPDWgD rzs<i T*QF{+ |n܂tC"Ṷ11鿑<;Gd"hC"_D2W-GlCv#r<}O!ʕX3z겍xx
!vi}<8~Γ1uX8R!.Js
sZz+rr6ϒ U tӪ*lpV<c[J8rq,p؋]!7NRpDw+ˇ(ƽۡL
& ݎ~Gg( Urvo0gD #\{-<}26o3KVi;V؊G.ޘ<Z4~ F <#g\W\k |iG+ѩG~Il]ZZ
c>/U ?$orJxO.m0,Gs )E?|0SuȘIZ|>=h_]hqצgޜGhiki}>Fqd~<Ƭo[s[QQ[ޮ1|}J &"l:t܈%̵kMt8_T7w 7na($\v֭p#W6䡧 };Pi]D@D@D@D@D@D@D@D@D }GІ xƋ^mx36jUu5{3EXzs YIpוRs})[ל}D2N>Fv$/Z?sy8
No9_m800 ss&ڗ / =Y%:kWS3olkv2njBvݸ5d=߲ľ-P| Yʷ_4>wmQ8#A{/a
*7B&&A}'L&Md=/Z Qc{ɺQrMn8ڥ$
y˟{Ipͷ̍˗ǩl!Y> =Ss:趕ՌyE,YG$w]XgD @ IDAT ̳pN<:#/Y3|@,
[҉]XX<[|=G={: C$Op,~rj˔,ycbRb0 ؑ㾖o>l gNOlѵNzg=l ܯJCT{(//ڝOcӮ5U.ܽn1 bpN(* xetMc?mj#% C4,_S6qěl\OY oLDN.X13 n}zb"spd*Rg< dAR?>;Y{<>>y֞t߭Pb] /c'2Xr;ѥ3 qQ;_^$ |S=} >t{2;]Ύncߘ֟=uZ+[?XX\Z -\⟕+3"+ tNc9rKv
QƖoH .lG7 7χtƱG l#.s yɡO/cc!iK"w8zߧq^9c[s >Wh}y_{lg{kp2MzMNwK9&umgYddKl;ߐ JKsBPT UM^Q)^At5P@f$IwGYd5-#H:G{k^{kϷVQvڶ-%M+ ˇO`ٕGNEymV%mM<_m* A_0/lLst.!O簘E\%tLM|(#Eey?84
S0P80J:_e&/" " " " " " " " " " " A b]t9!#q]֪UA
a٢(b朦g_:bwOgjmyi۶oV7'! t*=6I{"h݊JÍcy(x27='+L5+m!bÞ y(zСpҥT8K600[GEPƒ:be(\{z#Vc)
m$/I|XFN08<lQ'0ڰ 2{iIX0O,% ^ZKA
.u
uqj榍 sAz -=/ A
DTo fANHy<pYmDB?{l-g3 Ǣէ2VbN9: 6+<X <֭[ɬe닜#",6~ʕ=+,a6ְ%ʩESrfav.{ycx.Ng> VD@D@D@D@D@D@D@D@D@D@V 0A(
"gl;C3%G}e 04ڸl-iub ۚm8$Ca_22S:0- NKK P sҢ" (uիWa:UF Coڵ Pۑ#G{(n t۶m5iIC%Oc9 z ta1yC;x)윚j,1D^;|pChLi/SB۷/5(@@c`&ձtL?|u{>Lkya8[[D5gC~VUQnwM΄z(AH%3LjaIoA_ ?¢X+X""""b݉c;Fu]SjUUUp\|# p0?v 1{/6S?@8ˆ~@Oh?)z{S9;w.LZֽ8-u
"_Dqy9X! = 3{SN"^9.,zGe-.*#7 Z-6gw6#̽-i zA_yIHAj-I]WqB'Կ8Z@r â5#OTI&9ukM%Ƀ.2<Gb2u eGݹsmmmSx<]@fϔ;vsL= =zʹheL [dS'\'0|\(3Ȳ%EA
c#a utl%2\ZF(
bsI"0-Af;tYgvb}vL4tiSV!v-6fw=vJˊm ֶ)7仓@Wp78Vln %(b&-aXb oqn<#S']R$ӧOG!70K <=.rG|D o}Ry[X,i2+2. Y&2ԗ-J'" " " " " " " " + c ?~ܚR c~ <x~'~bjfx 3
oxC/]PYjjW٥a B{[-7ڷ]U5+3?gׇG*ivڧB r"lIh wQzu۵*ZuUm˦)L+@[5g~FY8V2x+ 7?"=Sbщ-!ǬCTįnXJ*n!9ڵElsSS#d"xR6bJR CMcʅa W6ڍKrX+;Vr" " " " " " " " " Og}~^W U1ӏ/ږ-[fh|'[8q~w~'k>3կ~5&
1F[KKK2x*Jݏ?ž~ kNھ5T_ajʣ`؎A`9:nk~] KمԤ îw [Wްw}- ft,ggL"0pX.s>AgK5s?`7ÏJ,K&yFjVǵb'9TKڽm[Ϝ ^hsޕM{K
FI9
#."p#5a@r^zxXvb P -&S2ɏ/\YMɓ_*0 <}̙,#2S@?#Nȭ}=y" " " " " " " " " Cq[VngWWA3e9Çݻm߾}Vlڵ|N<i_WG u1|3q !~P---'HeDQv,LeCZ<Lm<n (;?d߳.8{#Ů
ܚxrZ072H,Bmuy1luYI,'0̓A0h
uVVRl.مm!SОd v9luuXth2ȓݧ,-_@uU>< O܊|xxG]eY>h\p2 a=R?R|x L|СhJ|@
v\%|4 7lǽ|Ύsl^goF@c)}QDhzի `}.5$rgcň } ۿh˸(cCőO3+3
ekͪ2۶҆F/űʲ(dWXv.\a Gƨ=_?Ю;هޱ7Zb!teA
CǛ G;Tg,_{>Wn# ׅ K3?6fNJ?¶67Cҙ#fL6l敥; F2!E )h#bHÀ+q!`qWH>$@ź0?PO!P%i ,w4q:2p:Qn%y 'sٓޭI8e Gּx^{1m3,=c{.Q\`X6c%؞y8fXߑ#G~ ?E[ݹsg #dT?qLIW~Wx 1ZRs=}J3}4셳W잍VSQj=ׇtπ
E?d 20jyݖ8:\c6t31-SX,X],J*glS\Յuq#'Y%o߲1Y;%3, O9% vqyEi|h`݉PΥ~ U{zzJ p\>^d&GΝe!
{yOtԏgraKuYP> i29# 8>Xz E %3qA_c{18=1aG>+c=f?51&ApH}o XY z)LWayi=Z l Iׯ. `4 pXw65ت 2
w?h_yӞ|ng,>9xNї^貿(v(XNswbU"p/Z 䖞ڥ9W NDD~@Ȕ~<Ӄ||`-)"$q:89|CDIO|֖2bA)a^9%4`/=c:# f`c]x-ԕ69>~")~ϟǚF 0 "
qcCg\?A {_ >qF,e0HK /Dz.ϲOXey5ׯkUyݷvZS+wS ꮯ^e/w\Xw(rFًOM6ۧ=PF 5N pYc:Z9X(/,T7wH͝k35ضm[U {`Ȥ/`ؽ{FZM:CA}M@ LL]R z*4Æ.X8DoC eףHLlnn v|DUE@D@D@D@D@D@D@D@D@`o aҎKMx+o|/yjD>)wحlg7rKs:9;*gS= S-
'zPp`7azBIAT
AAɝmj2hcvBhP^Rha&B}p #sm
ȉ@H/R# Qp͚5sn&b##b*) XUǛ6mLSw?.&i{:ǯ96Sti5ۋ0)mް% b;Dm>xWu:h/" " " " " " " " " yzǞ1w&,OO ycd̾[aq#-ыQd*kWn vR}; M &.nXL[Iw, nG7ug+Jݯj~%浡J@lƚc:O}۱ WD@{gS[l$f
aN`dw+Q
GZ{j:ǒK=ǴSO7Y:08 Y_-" " " " " " " " "ts=\{zzl]ъ69ƙϸ Xc]zהJ<f{gOOb|792 k.wͪ+r{Ma}`T$`,ްK;]h.2{ !U듙D02[ aly(#̅ڹRܜ$0r.q96-BMyL`1ҥKẅwU{77^1=:|SS x]}6A2mWˤ1+>JsJzk۸:6 kچ81B.ke5,7)wpkc/ok i]Mإ`M[f?k_{3Nm\}챶c__yV (Rb,W|H=,`
c֞WrLY"'" " " " " " " " "4KQ46~c֒}en|Yv\b'g[Fr;zU䃛,m'a¸>mb7ګw7 $_Qׇi'GqO hWBw<l+/uYЈU!vʀ}6Z( >
ˍ#"$.-. tLq|t!Ҳɉ,>`Qo>hZg?A˙w}ǶfM T7ykfO<؟&(?֯aJ`jfXPa V֨jW X\k#ȕ<.\ iU~]K-).Ңh}[Y^l%ADi((+)(j@(UdF MND@D@D@D@D@D@D@D@D`i `NX o~;8%h}{$cYo>٩S~~;Ί 'dx]ī7G'zzmnƴWnomӗ~6Lc< DI57vҠ
ጜ,9 K~ T| xO~2Z"}ƻ6 ]"///F7]3]Fj+Kݯ,f+Úgs쯞:f;W??X֎Uv?<ioZIt v<(g/
a0
wDݱfhl܆Ca''" Y'0zPD@D@D@D@D@D@D@D@D@D@ ,n/_~[~} ~?8-2V9s'k~C __4Wl{X4ڛ7ڍnTO EO_\X n<NC\[YDq^{㚍QS-3qī>Roni8%radR∀x] D`4XQ =z !NG<<<lc2{ӛ GZof `<Hlɳ-Eݳg
ӧ0oOK\ ,O4x6{UķNpuW5ck'"#v"
w#4̢`·B[-T:k;ָ :{# )2%ɓ/Xc٭[Fa5Hַ//FYGؖ-[c bcJc֠X7e.q/
1rEej7 `[ڬ<}Vog_ZoUeQ$ >ag߰lG7a}wf}H=yr#&zonѰDm(8! S+Yqh{_hbϞ ȹGzlCqI?L9}x={-kXm{$IE!" " " " " " " " " "l0u?lCCCm6{fzliۉCٟٟ'> {ꩧ쳟=LCީֲ7n Ξ=-g |(bU|$===Q]jU:k gIQ5Օ[yiu^ qkX]j +Ra{Po~pqKXc7Tۃ-s68ǐ23~6µ! &g<(>c_{+4HVIm 8Ϙv
{=" xXɉ@:\;70 s" !/$O=& eyr" " " " " " " " " Gi~~jjj "m&5Xfo1qgg!w߾}:[w644>{W^m>hpw}cǎi`BϞ >swv6VɋaM C],ȉvǷOVk۾M5hPl_jaøl' vulBuzfsaG`K\Tf~.oyؘbܙq,'I#phAQyH<t|H%20K ?z [hXS3\ {Xݲ1ǘ ~~g6/Xn]rtuu7hw-.A?XZ Xf M yI]NޱVY^֍EDIDXËhO'nãQ˷=-%%% (1xamhWJ] =
'6NJ# رcqz~vQ G y > P~U+ 9?1vС۳g 9r$G\GGuuuEvVE@D@D@D@D@D@D@D@D` 8`̑#u\8`250`oX5 ~
P [/Δd*kAzft(: ږnaoh wƏ$@;_J" `e˖) Wu)?Qǃp[KKK| Y~}ru܊h;jL5<GtDֹ{M7r_D@ V~%8K(.XגqƘ|k'.S*TUU٪UbXKhҹ@ .ҦIO,|<~c$#" " " " " " " " " " " "?~6]% vqy4L@
j[S Xou>o>Ҋ@$fJJF`xxFGG˧KND`ݼy3UVVdQQT<#Qw&:
X(hFWv;{544x6D0vObɈsUUUVSS3%ى'b ;vXccc,ҥK6666yUWW[iiT^ GPfP+_X|܍1H
cL-2vab0i%VV\hVXpwÙ_ڄծG'y< . .^EJ3g֯X^r%)5 \|4ԩSzj+))mӵڿ[.] |uuu뭮.X;FY.P" " " " " " " " ˈ c̬cEE2j6qqUVe43׆
lܚW[]eKWig%ƄxxA5[I3BΚN% yy3eA(y
CX_Ǐ'DV>( -P XcӧO֭[c::S-uwwGK`Z05~c'iА=#QM!" " " " " " " " yE1Hf1 aʼjRTHJls.mնsc%+aBF[ 0;62d
0^3 Jw܇rKK@_#A+) fc|@7Z[[[@@%+;{&X""2U磘{(pE}ȩRNLߜhϞY f" " " " " " " " "p 1c lǘ$rw`0cwƚ=yg}*7o[yeU0-B칬V<qpl@jdž@\bh
W[
ʨ,qVthW_#*"Ln۶-N]?@WmX"nٲ%ZR+!J .>X3BT>HǴLqU-x\& %1 0~,1*LD@D@D@D@D@D@D@D@&d1` ɓqIT(10d͚5ql^ Y?Gv5 c7_~ٞ;W
N ] 'l]ei`Ϥ_$;'qxdN9g zː۬q} x^b@W`y<X"8FQc7@; +.>~0>[Yޑ>eOXL^V&yiZ2^ϝ;g/^Zv`
F\~9 0Hk1F 9:0l7q`- nPmO <oϞ`ݗlt<,36ܛgK؞&ײ&p9z6p}f{ޤ-N>MLqiI?PGw&3ll<\ӆ}v0 iuJh/Oak7@ϱh4ָa}@:\Ktq2
<|i\'6ׯ2 " C|
];\Hj]A#
kRtӥ;?[y"cN}߾}Q-]픁 XCWkl>I+'" " " " " " " " "0; =֮]cl0J{umqVgwg qv
Ƀ&Ư;[A>:1>#
K RdEg p t{
2Pqtqԉ{0][6FYbUT+AԭUSiƨ i{Xe6nic֯ϊ;:,T̞
*].{tׯ_Cխe ; $:\\wwwdD</}]Y~ɅPxPPU]Kvkjj~Dh^L0C>qD\'צź6K0[T>" " " " " " " " " " ˇ 1%/3^͘3QS6x9Ӆ[~tgϞ83䙰3cr))]<L%ͬQl@U<c.fD% "?Θ2sx,LAu:{RkBT,͛#mJ˭q{=Sn?o
òPvݍvT 9n5U6[.\q <i{ЖlWw@dWV./d `qy-tX""PrPvɽ]^^ _+"^K8ʅO/(tX-iJ'" " " " " " " " " "20q'%̌7326HKt1}Y1jƯSS<aǑL
1>
0F!mkL50@eZsh1JLeB87G(4omۂf ku!c;ƫJK lnhݷ3vd{ȿ6[,\g G7lg -4 Gl9ѱq;i 칃GvԸ.s3'x1%. Y֯nE:Ѥ(AW3gϞS2ɦàS߹sg(̽K>L3ӧmSYR /L^ 9&>xp,'" " " " " " " " " " w#2X21c툙YcmD.2 M\UfdGƩ|Y&NxcL]FKHKlq:M 67n'ԙw6[^G1EAAb4rf=u > 4d ZY1X jҐkKsY ]=6 x{. };!GCs/KGOY
+$f.S wUZ8u swx@ O<; 7N8tқ7o/ :`RرcǜIh^$S'AL[ KY^xp,t===1>Ht.s,^E@D@D@D@D@D@D@D@D@D@@KΦcqeL9
Hq1{0"aX2>^GqaU¸603hx7FJ8f&M!c=K<ʣ:/ԙ<ɛ:P?ꌎXK^ߕ ;u֞?x,NVA^Njq-cu?dW6؞6bUutt<;ttd9Xξx(}1}wǛڮ-V^V:ctyj\2ˬ^*_й@x8c/ 91u;|& d%fԕmGM
m>PPh txD@D@D@D@D@D@D@D@D@D` 0Z4,v#%#7m"aXjr<s.xݖi{t`onav<L`#(ftEX;WcɊ 5E@Ee|է*FDuqcbVL#XaZ⚚3/~qsCzĞr\čW?{$9i/aƍ(0uYE<]Sf 60=79(V/^`qE& 0w^ֿ'qscg t{)[u^|$.X. M:]~y'_YhKMXسEGڇiB9^ůT
X"B"D@D@D@D@D@D@D@D@D@D` -mVp'wmyK ڍ8M, ^V@-8q
>A u2, N.յV=2?I WQ w?&b)VKs q1x6Ÿ%_^0ƍ6-tLUL: i*4sQo6gy[HK]=h3 ѰKO"Җׯej b6=VX eӆ7˓jccqbnغ&%%saZ 0#+
z
Vo%{ ztt8` z:{wtX 9r$>X&;p=e!ξ+Q(ge^Bu5,//Di4e~
D}~Ϸ>J/" " " " " " " " " w%P^az̊&[Iyk?`WTPla70A
VrN YK<Jlxv߰
pYPTǐG-9xXbX8KX=cԌ?ojj #2fyƵv1m&OݻwJ$J #28e1`j .:8yP<ۣK9oذ!I<hkRw |,=7Ă? L |"9;)z[6Q*4B°nu6H{j_(rҷ7 'lV[ݗ#'
SPGM@w] ]_bVYE㤃Mut>m*/^ tXQ[: NzrL0 G S8nwɆ <,ER ^D@D@D@D@D@D@D@D@D@M X؍MVX H[x];ch< dy ]s "ڥ̆k$WspYK,Y1bfKf=9nglZV0nU,k2lKK5c3Ot c<<ɘ8z o߾=֕soY/QC`L ZFӕ{k/k=q=iO Ή+.g ؿ*+5\KRtt_uٿ5\!{1W8 *ϵ+ e0 )N,RJͽklkD رctl?3%s3e[{6`ħL;y1e| ͖w&xܹ3<fYya`%K8-a< $Pq'ڍ_U|7Ο4+
%Fkم,Yy#xVڅ7<a_D dQdưSǹ8@)cԈ#\hsX8cФ%MK^Pqs?nE0t 3MzeqOzfcy9|7nX.KF\v#GCOA5gS[\KlWӶ*V8W]Vp-KW,-[GWx{ Jus߹=X2F$~ xGNǟS//=^&&=/ÇOY;$ xX6̳Wgsi|r! kb^>r" " " " " " " " " "tUkX?j%G%BBl$L-ܰ:8ưoI\qqrư3q/31c==ihɋ-<ocp1IqjOٓ+X){&ǏЊU+We˖h9/#"@T闩M;S iOtءc'mFq4-Q֜ݱuݹ-k^otXqQhiרrۅ;ƽt]|Eq'Pr6yceo5LM=tt[nsTtnJgLg96:V 8lwɰ,6I~tLis?nNi;*F9Iv}%eQi
vaN+l|ϊ\`i`K'M Lַ֣u]7n 4IDAT+cƌ#8k6c<;#bJܻX9cqg g^iYC lō8L5,oj]}gdfdͶH^ R/Ը>, H^Ƃ5酞+JS ?5&ۿ{8 p]ϴwؚGvڅcI˚ / : ֤
K=t 7Lk| ulr_w1U)x訙?S3_ y"O:{!^F^6:3q)?xeeOp˃ {]''" " " " " " " " " I2~8eizv#<g1K _PH#wՂ=6,d6,DFƲXٻ@cw+X.bC' ڧ )qi ƑS⬕n=ԛs~ [fMA\%>X?Z % euttDc0gk֦{^Cqho}mmX`7l<XWvnba\: ̅L>Kḯ7nXך7`㣓K>R~QUYa[u9lRv˔@UB @Hs!;V_H ԺHC/ppK&N'4ټysl uacqskerY/x{Q !" " " " " " " " " 0ɘ.cEn(ǂ0;͍^D0͚Þ1aDI6]Ĝ.M\;#v =z4E:1&#OL/S oڴɚq=Z@zDXW)ï;.bգ,bb?]g 1:sgǎ q
Z^YKG 6S͗
3mئ
mg:lsX,c۶6ہݭi٥n+? 6gW0YA;yӪWW-iZ(-
:t.5x6Gz8Iԝ20bKօ &6x8>)0M" " " " " " " " " "Mw8909q1z5^`[R% n,m cnM3a33%*#_M04☴ וe{ Y\UI#f Xvm tq6al` }u.xf/qn :b f};Şg·O[K>r29;ݲv[8y^:|zх&> ׳bahIܮel$&i/L%y0t
=xڋB@¹(8B3ΰwYO<dPTxQELƜkmmFUQ<%=לmz {s9ҳm9p@SaR6B,2ԉlNe H v=0!mn"V}o6=qvddٗ gCs}M{>:\X'9u
qwS ^D%&`+D_yq$x3,/M"gLJֺxZovA~n51pooo.I){z,"~#.]Xj I؛tsǽNeĸ] [y^|DhJ5oZoܿ;WtD}0 sS0 v ^9jL/YA_ ܿ#3OV%S /0eZq1wuuٶm$f
PD@D@D@D@D@D@D@D@D@O"&cX,x=Wd't4o3x82ɬK^/Yv2dx.^\S_6cv%*G{yY[]Uak&͵iƭ{1r8y:ۿk{{:W鏹FGG\pNwGWyI]l*Ona`F#*BOݻ
)" " " " " " " " " A2)L/>Ӓ6(˸2ίW:ϴ,[ A !py~jXjWʊ.]OwۋվIXݭVW:'Xv7m\Đ {!X^|
a$;bg;.vf!z|Lv,vq!"3EȋK/j{W _=qZ3 X IaoW gqXƕSǜ]bR{A `<u5mksc5k([ xFsFeC-h=,g_b@X+wӆAnuӧ-»q#tH=Et:(@GU[x(;S+Ȟ_;1%~bwaÆ;^3pGN'?iO=T GvY _f?Lt4iZSҹ|3fvm?e/ <1M-.B]+n
lMZ}6o\_>|ִag^+ S%߿B$.6, r)reHb
___ {c;wZ}YP#D@D@D@D@D@D@D@D@D@D@f$Xr :tȎ 9bwq&8>n?c:3nX[kve
[)kn\oa56Z%%ֺecHSlϽ|.v8b7GF%[UVj hf5@ %"@ǚڡz{w.Բ_z1'S wժUQ% 3|1ar" ,ܴz]|QXYZ5|?M5n>[uoMmIȜ2gRc Y W>9>Lo#A7nFř]# c< 'LNB K5Ua*608dX6mazf u4Awl|̞}h-
~myi9$Ny2^xI4y|i+YfM{{{Bٓؒ矮sYn#1<<dEťVȇ([ MN]2:z3֔>4|ȉ| '=}J{d*Fw q:'"pn/=~|`}Q&}ŏ̋cē<iho&xi֏k^i'yf'r!Uec[sKSV}p[Wжl ;xڬq]CY|< 9T\% $x %)yc%}10% ͝}O0ݮ-ig~K0W˹ރ~/gkϳ¯ KJ˂@~I (G9<(Z>D@D`9?oJ/" " }ûw 9 -sV+5&F 2(3 3F~~L {?ts7k@Xh F%j6JC* FnQVZb[7qʪ*ʭvigʍ l Vf ֭)j^K˦J/5:G رclhhoG @Ç?6Y'| 'Εc i[kkk̇gKK ?~<L7o 6cjllS '5֭3gD Ν ckAmm={vO|ªcZ`*e'c[QQ1jʢ ꁟ~~wy[~}eWÆ
C|g7n ߴiSŢE ? /^onn]t)5~z g1ٳ 0WN\T?kBp
xfR===S~EC;hyvwwǶ lp0 T瞂31 qܟz·USS1˽ӎl~V>ld^r" "0 ޟ~>y)dB9$∀L"}y .Yqr5uX [2<8Cqɒ"
.صT2844A\Uf\Xy<Ը6ޏ-fCq//ڍW`њD`q С-#(q{8{^_
{_b8I?b(DŽ#{|{ 8䏟ϱI!C~ϟ+8K=E~ԏpI>rɇ8Cy ?G(8OwGχv=T?ey )~&.6 ~>?h3I?q(䓌C/u?YR
~
a/'" !@>DZ,4;]e)X.wHGmJ(w]d3 Ćs?n%,!>~<\E%P\ gԽz>~0q5mZ-[~asFvrW
D aaNhOJ+N_p.Q#O;I ፍS'cAɎc/?3I `&KN;ɖlk0ɶq[-&g利19S O>~fX9f>zTD@D`0S ~)'"0xnx~xv`fVZ,G}W>O7o8<.cl~qsca~<;`XƋп]kl,,qKR[SW n'3b"w 3 `.Ϭݢ->ewN;vE <ppO==^w%^&疣?ڔ佒\$ _'߂}ʳSM+s;$é пҧɉbwL!ˁ@M.+6msv< 'uϻ065d84ku`VpK䖖ڥW ^t9^81wqpc{c^V#1(<lo}/2D?L1-'" %7?Wo" " "043QRI 9rwRJ&y0f=#%o7p S7'Cô_ .Ni*e H]+W ^l:ؙ^xH=>X b{Zߓ.|L1ӳ| Lgu%T%D@ _^^BUZD@@6//*D)yv8tK-y3~+cZ Ny C|9! va*W /R?KcieJ 9yp?^V*-
?jdcg} ۰R-"=}GU9DXV*\D6䳣o\仓'%'c_qҟ?oe$Xhr) /Q?Ə`>8B.~pOKxϱt>gQtQݛ[B@\T4F3CrҪ@>>o[" :7=8wkT{X<]?o+]%:qӭ a>ׯK>O'7rq"''Ϲ@xEIg =>r7L?2Mw|q8p P!zd665 =ǝ),y^~X x6x֊
,Y6B&I Zԙ.랳PU1''l}yE@D@D x]^ND 3
ώ ̌JŽϳx+|y8|<>q{Ozڋd5;)eJɓ6<<l0y{'?GM^jgΜVQQqG4!sv
۾}եa3+KE ֳ n% pq<?" LGmLq<>>6<m>dZt " ềD8BS4ysͩϼ3T"Bw \!}d 5f0G9ݯc=Cln8<iX<hu^ċܹseCCC622PԽqVVVqO'?00`QM
~ڵk1ӧdZz#677Ǐi'SKY)sˑ0X<.{6 UH τOS,hD5ɠ]m F(%'~CM@'?{17B@fxvxfۍc9H%c|>N 'ss]-%Ӻ}9E@C@mv8.\@0˗ww[n* 9)y`:4yc iӦhˇu]8'HIqS RcˉJ%@_la1&Z3ȹ:B" yEo yUyUVD@D ߪwGByUX@١g.*2 }8s:֎xg<a /ݞ09# vX]It.\`'NvXƶpi_+sƒGmmڵˮ\2eqvژyHKLk g'Si`~Oy9c6ELC;?t\[135NŊ96E<{'.3ώLT Xg2V%"އ><n%x{Wҟ k/"0$. e+kGG={6Nk\^^n۶mbwL[b9L ᶪʎ 92ŋ#-nSSӴt _ߒ7k40s zQ^:97[<dHg'RTha EyG(űT@W_I!| ˤJ$5沼jg8=5w-ET{XLE@rܸ9U :k;~xE$=bla= K,a;~ZI,k< .krl
4555Sx10.R m)n"Y&nx.MkM8{Zs l's^liي'B{
C-3/uKfw EQ')`ڴ
nwI" " "a/'"vGfm{D}l_ty2 qix '$X8hmƴ8J:kc:bwxG %5KZ°eԎ8;88E=-V7o-[L;<KyM-@|X>Xv9%
{)zPO1u :0<kBqRޯ+爗K wIr"_^.Na.hY- 9 ث" GoSWD@D@D`1=A[e,<78v>#;+q\L{2|di+ɟd$jy_H=˻5Zbׯ/vDׯG?V1ppIݏhKx85, F`{~8( #!#nj|?
G??=uvbG=3i]\]eO;|]14BfjiέZʮ^M!nuu'mLCzX.בz.SG=k
ua}b,zki' M{tj .5;OLU$m3 EV*[o9X VND`n#߃scRbӷ3$Ó~Z~cWڞgǟ@흝@6T ^g|XEDCd-XSNE?B. b!;sgQ/SGZ'Bn25H1+"mee唵j2MO|OBE#bJްpB[B 34".8./b ;7Ŝ w_l7O>m]]]Sq]>\f}b֔Y6fZ7L x?3T+ QI OD`y_7,.oS9 3gb\ cL,5,y~%{ =?+gVGxnI$Η2NOnj 47~c:*7MHCE#;B7lwgK9aA
E4iZBEdcLf.pA͖(RsE"tsNfو0]bX~epe3(- I@L{7nhoo(LJ<dezshb;+ }6r^<y9X|(t.5 I -gll~hd9#ws.~"$pb
S#FAD$(z1io>e陚]6ځ%
RbS J۱~Ef#Oؓ'O`cL[jkYK Dj\7`]{2iț2/ג
+ilX{bX2 J/]։|$.,i~ED:G?:D={DKW/]* Qg4<ԅX2 3$Ɋ;kGDD0=qDXͶZS&B*\'E{= qiDl%?i+su )2㈋8g,87# ѣn˜-9Xh9~O?ΓϯU." " " " " " " "k䭸" ' 3\q9 atⓩ|Y7Ce]X"rrnӦMqc&!BeRsǎ z{{c[b+V,`;qsp?Ǟ: suibO<o?iuVi;L̹XLy(\r -ju:$LLݻ" " " " " " " " L@D|TF@J^=)֞.βjUUUI\g G }#*Q"G8zkR[DPf`uNJnEd$
uɆ^w_iS2,- i3uIuxwQsɰT?\;tҴuiӁyXD 2yv[rWh
I5$b ֑L$B"LK(&0u/ְ +CEDC(gC%-uADmkk&!+SNE1uWi
ۂU+hO-;c1?e7nPK8&' cġpq-Ydyڵkq:dl~LX&x===Qw1?ǚ0\&}.vݦ9gvjD@D@D@D@D@D@D@D@D@D@RHD<UDZU0o CDC^\ˣЋEqR"qakX],wRvΝQXM9^CYK y(7[z#uqaD]siXR72 panu$ճKzN<OzS'3-3u>!?oW2" " " " " " " " " " " " $N +&"B#bmۦ*J"łѣxQ|L#bI Az=sL:6D]6Epd
]5qXĭ0*2"-B2u@%<I3_Gٴ)/("4B C@łr#aD|tmM֗u2֭X1諾\pOG~Ihu'%*"&B""!" B!" pX"9s&
CD$jaA_JŊOI"%pky1
2V #mkkk,Dip]Y\˔Lˌ/\A<hB'S.SoQWFޙxHy b}bzq=<Gmrk0o.y+ xb>V\49%rSis b!~m 8DX/Fxus>%1Ex8G8 v""Hf(
ODڳ2}
0B Y HIdF#`H>0$ aF/Bh -bI7gҏ L I] I_r ?/))-4Snʁp ^`^a_b_gi?/ p&'pߡ<eI%ezܽuHOQ{;vF @ @ #볙 "+M=Q1ϕW$YipW {)|ܺu٦eg\a2RX̭l`n\s ~X__GvXQ-3N6:lZ :Mh M6wS][[pns,wifR<۰cm/&@ @ @ ̺_|-Ղj;?mǕ}ώqQ;z3E*:!w^Sm37^s<O6̈osYMXkNK @ @ @YP=ggiSbsLϜSMa6Ϥmfe] @ @ @?
XI۷o7o~'zrnugBk]I @ @ phOp(!y^l
OQjX @ @ @ O@ [ k @ @ @ '+0w @ @ @ ̎k @ @ @ P=` @ @ @ ̎k @ @ @ P=` @ @ @ ̎ktsssvj8q;2s n:f9n};g ɕVyn$ @ @ 0 > ctKw\9wkcT`~~<}\zxbh\vZyYy}~ >4ӧO'OʧOʕ+WJϟ?7GÇVtRIC|Ŧww\pu <xP`Br~i9Ymmn;^&O<g,:q=HԜɗ}$ϰ8묬&O>G:Nm cH 8F ?./_n85K?9k]sNm_]]-xqC7oޔ&~uye?~UɸH_ޫF3.]f:N S⣎jǣqWjJ\WHI _0ɖq)ga!cv7'F @ @ #߾}]_!5Q1ϕ{f 3&vS4q
|SkyeI5NuSj?SMq,m0N2ŨlTZ~Mm~\#ӎ?~G$N49stq͙ɓk:yl;?ۦ?L;qo01?q!9L NLqJmgqrfiskm3:u|e1Q:'q /yuIX˹ @ @ @Y@^xwo,.732{N#@ U ES?t:G;ޝ*R? o3X#@ @ @ Ltzw%]i&V< ڻ*}5 @ @ @ +@;]_ @ @ @ PS @ @ @ 0]馗 @If @ @ @&y-VvzIf 0y}
Yj @ @ 0}lwMޣ}W=$V5<8&Y9- @`:mY @ @ @`\kWWBcU666rqF? NrMѶݲnZ]kǛ1&Oqaa N@7}qqmO9q @ @ ̐@a7"2LL IENDB` | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`?:VϘ U=qİK.J_Y}_(UUylX]ve۱)S!=[~ E0 FYf##B B B```VW5}ΗR8C.C[Oմq!!p>@{>'X#Љ 1Fؿ_(ą@@!P >kul
f%N0V 80d !bh/@@ǩ #mmwO\@@@@8~`5!k!!!\:+gee ;+g}w'gN ۻUC 6'h7gl9@w>_8:.JYw}!W\]uUKoǯTZRN]t]!!!!!Sx3ٝR)g@@L'Ps9I\gwj:i,RG ~m+o;WS8>ot47T q (GY aotPFr`= (Fa0p
#J*6qC B B B B` j2v#*B B B` yimJ^UAKva(w gyfd
_ FCuo+}8s=5\B/ =zt8.~
8yK'X _^|譼}6P_ #B B B B B B B B B H2@`
VMvxX%֖sRw *41ΕfhDRV^/ϯ6aSSa|yK7͕~V}nV4XuUW^~⦛nڑF)ه@@@@@@@@@@@,je(Y{ ܮ.[2R|+)##ՆpՖO~\qj7+ciSk|'$ q66 W<i߿'| dFs~"ُUO~/߃<^z%<U>Um5s\@@@@@@@@@@@ lQQ^~adk`b$cai
__Ty(/# D[o߾/?ȑ#;Ｓg)#6Wk =DוW^yљҪWFK/tXeˏSvfuEOiN~iq֫j{nxy1vP҃!R+7x駟 ÿt[ٳd S c:VgKX@@@@@@@@@@@$fqرcfl`av۱"Zոmyצ9 Ρ>L VSA[o 1aWYQ>q,~0^W~+); tM';gl$:ɰW>``3o|:epkjRj }|P8xXY%ꫯa%t!!!!!!!!!!!= s曩VΟ.feбrv֪G0}˸C`yl'c]9~s\jiN،%ZIZ[S ><pF璧]WynVN?C凙$I˘~M'U~HFZ2 cU 3.B B B B B B B B B B`j⣚5kO-+gmC8W'l!.Z>9lTcbȚf@06GW 9uu~}ao
xf$jV\z̫_+c|ۗWٌo#\f]Y0:^jOO峍͒CߣG.=]Soat1_ Vu\@@@@"0 d|H|^kcC7Q[ksGE>HћwG 6i-|ZΕ<3lT>˕wÕ-7xc X,mvΧP5iFFbex+.֭UX^^ܒ4](}aX à J?o0VEKW_=WeySUbcXrΒR#rɒ /Pу S\3Zˈg+iᅋZyg !!!!!9 yI˶+yژj)f_(1ymytRyxMC3ޜH o+__|u]7'|An-L&9s\ɫ8.}Wr qJ{̓MՏUni~v۶-VuC x7.L1/_jjB'æ3ɳ ]g?%Oy<e`Mںr6nttotU 8qgƬ+ '
^<c[B9B9sK'-#8\=Zcrܰg @:IxfRr~xk_;t1ae'[o5|?N]w2!0B B B B B 6 }ߗrV s87&UZq8{cvrjfֹ];[~Ui[9߸+x=lVxQuQ<iX?Z][YoEicn mIz9yxjX?|GVL&a=->[Cmi]^B:鼌'/
?/UFٗ~W|+bזy͏W!6<eOW_ omWmPZu7jdn n MQQu3e|BŪM7h}n՛kpD<g`" v3q6*ʗ\y$Vi2˟T~^Ɓnq^&OQ _#{n0$zj3ŌnXjG[;&7q7OeA1'6mƺ` 7x7yMY1o;h7hipC}%u3K@@@@@,qáĤ~;?}}a0ag 9"\c\i_ yj*?z'-9\1)y W'ɦ+_ۉ[yϘjc -9mZzKC B B`^sƳ̳|-WjNל82U 퀡Prs(t
?x)OСCC?\~ֿ`kI/L!=4)~/F>ɩ#96@˰jm"M)L#u&oE|7
w 9<
ܼMs bn
YW.~54q&j&
*r,3L|Mvg冠Nsk2I.c"A\z9u|'oum+q.{M[7a1Cu n YdN!tҞqў-r\OoNHp$1O!!!!!8!Tӌ
^ 03 ǘ _kNZcv:쭕Am<bNnm^% C OX[J#iR0yr ?堃1qvb;Io3W@gCV;Whtr !!0樟pP/1y6 3n
O xnk~ ]
5j.݂ Eݨ{]FzK WqȴhK_O]gYWBsӧIͷ;dMK
n?B_lVY8a}1j5
't<rSv#vspvsӐfѐl -4I
_|7/ơ
L7U~3DX\amE +AV<Z]K*w9ܸ+ҮfOF
a K?7{aAVVݸYΉĖ'\i 9˥-}*/y҉n%ݗq/6) :PĄB=+/3rk5?I:/B B B B B`o̸`"Ǐ,j26,V\~5Rv /%˜cd;PyHo,نϏ,aR $Gst0mGpG~;*\1Wag;v<@[y+?#1ҷ&X+\y8qs !!xnxF>ݯ~%#nixɳsɳ!sb|&?Z gsS8p/TXi+M]0~+_2ֲ?W'W <.[< z4wmz_| 9;1/̭Wi&cmb+,7o!r2+"'#Eeh\ @eq%h5H3(jRA7 LN[2cl 0oL9h0y7 gxn`n]t5 - Փ?>_"\Y9C~t.g^Z
2q
ܶ-mC,{yҷ$Ϭtp'wu]Wz{~&jrCK>Q2<ߍ kc_I1J'l;vȰ78T>31`UH0hLi|ERƏ&/+^`ϘHzpVp,?*O8k*$GV/M+_sa%U2meϙT2ָͿulN@ʣX9qY_ׇ>gz{'㠟JsuI\gWo' a;} }5F_a_bӗViK ۈ~Z$9Wl3U}
' r z
c &My*AASǬx?k p^ԩt#v!^-s_l_}Tʛld ɴU{<yjUA.:xUFk\m ߸A.}9J¹0ԵqH$
Go7ǥ0q4h7U)g [QaӇAQ^t-\tQ X8]E:Lq{^z@ K <1 WΖUMI\2j f n~9K Q:hu}rI mCU;ƻ Ä@@@@f&`c>qCMOrԤbjƨT c:z* c6z{YEMjy ߖ% AWX͍LU2%:'Xu^䌳|rKu`CZaz0s̟dU/B B <S<3}\Տ7[oux||tZ(ae8%dz<<;;oy]T8͓(n'io"~p
MU#ԍtWN|}C:vf('/ ?%w'qSUXW Q;'>S*c//`}OK8h y]6}TyL˼Zu5к]fP 7oBi@tnMg05$.NV}ȍ05zHaԪފ'?aZ>8W6q=LXiXh' 4W{_ΟEo >QцX^8ӫm zۤj?N;n۸t(G7 MJ+iW ͩ+l+zQt6@wN*{řg/va \ڣss2!!!![>}k?oԘӄ8&%[W}J߆cs&ǵ9&O+E(q5}5f&mzR&Lj*9W 3*V%^ cѕ E֍52.2:6I9= ʯL`g\@@9r \?<<e={ŭggO$?3 繿կs+m; eOK 稯b8oԇza3O S<9}v6OY:7FWuUdwa H0̱ϐ] X
s I?2J*cun0w]b.u)aM7a[?d~C5S?yp|r'_?-*<^yG";JZd`4[qTx;*EO0R㍋[rS&J|fïkD!ñʡAY@!XY4V8xvtǷn|-P7)*g9\МIK-L{̵ \9avZ W^'ҵMJ7Ozds&
'~ũ~9Eyڶ 8Mɛ_tkچvTie8B B B B B,K~\j,AcrMu]^t\N?đqiVy$ g|nONe-y~|<> 34'x8ccmqڹ
t&LVZaѷƚƿ߸\Ţ2gܭ1?+85kRK^5brTYS=V8ą@@l?sJ깴yzN{x+g'A# } ={6yyz~=óg$i7q]ui_ F߅}Ϩf?v ][8䥍3 61vԗEȠѯr8w\Dz9澕] U ˣ V}VM{s S=ᩞ\JfuW1s}Ց d߲nlȘK~ O Jѓ};-`d~YNtru:_j
@.z s1sȝtmegj(tɪ|&47m &mZ] 0]\mlWƊqҍ>.:o
]-q] kqJk nɕMu+ uo8%ݻ9j/n+qR>oi?kqdaF1?qkvk?)kH[tʒ^FhӴr ]\2+\J`?!!!!!K~*2.kۼ`ihk3 0.5^ i+ZWryYx&ȬIY?3 ݏC /nDQNy*l*]_(&jkle9J%bo+=M;.eZ)וXڤ\Zd !! mQ6l5Ǟ! (C029C~z#{w@kozV2*vyθ ׳tyUv}3| ;r>:bdXɨ~"?e!C跔Q 'vr0Ť:S_5\>QLN qҚׇ 3䚇
w,_/2qPpYR,UFm}CyسMR gJ'CTm7~] i,*`WaUFq*l0 f56akAH]9ɮV\2Soiᥧ<aRj|*pl
c\=dk]$'W<U_\ XXF/>r]:amLӯtppX.29r k[iyKݴ<0UGMW[eYzNv8.ҹ\ϮeQ7}Xج,R
M@X¦nh<mrOݸXO?X¹qtm5;*9&+x?.MwܞW\~d8؛*x5I*YGٜa~Gq۱gGcr>5kyUڗ_ɒt37|eN[Wu8B B`kki?~nZ%We%"7u: O 3c0.8Ye / /(@[zRq{~t5n8 WX
W5:8`Aef}N W /.*'~U2*V+ 6f^ھ2XZ*~Kuö.̳8ԥ'%˱ؒ-8sqԅO% J]rd*S]dg%y|ߑlm*, .ZpYUi 3U؉q:'O&GG
־ҭKCi:ПlqZGL .+] AW=mXvci 5.q#P\{C&`'?N8-i#r eoV4ԿZlqjK}MZ9m g,'!!!!! T~N]_me&m&uLW86X<c
Z3֘<9>Ƭѥ_þM
+?*c-LDj[qoA2 *9DU_2lcc:mtS'ŵW9mqNm4q!![@=J=d?N9G`$qYD7As۞G^Ϸl/Pakq~_NͳZ Ĝ)>Nu\[n^]K zҧ| \}҇+I\9aϢ,ʤ ضV媲Wc1;c^ DX aVzq}C*ڏhҙ|i~ I
] ،lI& 8ܿPS\=}o}$hgA9ICqs*
0Fŭ0`
&lTXFGTx8r8Ϳ4wV+غ!xx:wcY6FΗS/VΫLu8M7-ެ62Mi<JvcqQ| 7JF0 r4=MD8&!a2 W|ci`,mdg28ݘ?\s{57I'ZgF~G iv"=ʯcxR!aG<FΚ|1)[Ms&L d+#&Jΐ?Øȩ2c>\+)/& Y&GۉJS8Mzn f !!uj]~oVs\ ~ =<|Fﵗ{yCYTaaɬp
_uOO!C1c{Щ[% , :R֊v o}# }Vz2k3dSVZ%U>Wm.Z,m]_O>W,C8Cb%#{lOSl,6q :tmgo[U呞Lei+\}gJU.mĵ^}YrYfF=}Seft 7*d{
WNCsQV'O~c*i2AO ߖ7.S Pε他T`Lvv!r>Jۖ'&XWZ&iԎN0qݶma*0zZXVc n XNC B B B B 'Pc. øưǑ_}yFL~
&M7ǿ !@<a&Jo{0䘴5Trtu^==LZ+c>P6~@*?<Se3ޕN1W\,:3Ί;օli9q1ae4)욈2VteWT ] !!+!`3Gs<0Vz{ٜN\zVz~ɒ}^2Vr+o-qǺzhYpkV͋*4XZu(_}_OˠWOױHcNݱ>
sZז*Uneč
d\GUq]3?[sǮ \p _o2hrM;/Ղ9O5Z^ AKO~sע>JI|L @/}KCY
זIg\ķGZziWtx#c[-n O$~ 0+0yrn *u*ōKxWo_c+8ȞO=ͯd/
qZ2P =198snO6V&<[u^u=o:$8n!pYxڕmL r/.Q)W,u^͔pOp/ ~C , >ød !!!!!0@k?;|=e#qqpA&U+lhƣgZ &5yH#qkv]\c[v\B*
4t1~1AWO2;)t&013Ftאñ:I9G6^]Y"q2?e752֡dV6]C B 6 jɯz`c(R8<֩ggh[sg0#8 m-ؐyke5iV碋Yx韴a0`NVSDA" گS}}&SꜿǤ7O\}JOj/C! sʥ|"\<j#3kQS_?:\VSuLSʢNE8I?\bG%ڢ6Aҟh]lqt7O
4Bg#
G|ڼ d&NՀ
W M+s7 #d,ɷmcՐ뭆iyYS<.cřgO-B[~L^[/Njuxe2>:/ :{q6oN;SVߟ'zK!K\d#?u-v/4Nrwő^^F2' t*<IfB B B B B >ÄٜI4c|M;O#Iظ\XF7 |B6No6OV:BA'c" #SX73nȘPYY R6# d* 1^^:9_aWݷc9K&yg+nWه@@l~u_oo{;B<HwzyZO RU|}23ɟQȳY
V)9Ted8ơ~NY?q+ _U0鯔:8
;D}#ǥ~chcx,Ւ◁l)V#Gش c/uFuƞNC5珑tLIyO~'3j# ƺ^ ꇑNM2Pq* m^VNmb^G6OO7'ymTUj``Qf+B$ 3͉V;TrrTBRa4WnhmpcqSq1hD%^ C_{C**
j`Nk]t q\ hm*tQPzU oVfsse<c8+6Ʃ x[ҥX8~nɹZY7mds
R~dT cWV ezUOƅ@@@@@@ｲ_/εVo喥ossm [QOl[2QlWN< 3Y:+98iocc*3c:y cx8xބUWe*s?D,N ˿ + s !!qVA1γJL9!zv,e3J_jxfy>{6R,E<۬{~@h" }} s#rŦ80wGHx~ Sz6lsޕ^ꃕ]E? ttw9,yʻR v7VbQ >VoN uxm+y裖㯾kל>7]dKִ<k+VW:+͋tg5[YuVr*We4͉.
FUi24,ci Yz7w7FŹp+M@a!
P4N{nYn.&@,z ,2pG+>tn9Y_# wr&6?۲9)i z䁥GVSmhZ~cy[oYֿҸ^:mLDCiߜvDmwt'f%Wz\]%? c {953 5V/DXy&b7!$^]ĭ㚨11*s2t. ķN|:ONEU(Q¦vdtx qS 8Y
W~uRs$Wq!![{y='='*ܳsq I<0ǠE'|rxn{Сa AgG }tiZUdѽq^Eկhh/g #L?A\ :ƙ ,f }sڕ c?뮻WSJomEzGyl:)6# zؚG/N-"}ֺE}82] l?9s i; -Zf|<Sn33& \@We
c24i&r[
W<4:8ݰ< 9
}zk,PiS7Ye.٫EfH'aUΒsev* 2 -_q(ٓfSy 2{̭-2Tz 巜 mtri[yy|Ksi@N6<[yIÐ<7b" K :$]wJ'm"CaRX/Oyx}lc<GՏ7֎،=M76m 3o,alVyn7/| 7&1&6&QC\c~_L:;w<UA/ GI\q|
.dׄfӒÏ\!Cҫּͧ4g\@$P~}ssfQ9@gNs=g=h}
q\{ ={V'/ۺU} <rU kw'cMK >A-j_P~ zʳlJҖ
M'fwV:^^{ C6:Ǧ?m8a` _ d,G'Xk9a,-lZ746U
daӜpn";v6 J&xˣsM5v~;c% ٖDZW
Ҍe˃ ƶ^N104nu'=k漌b sob&Jv5N BN9{+< cZ7o^cF=qevctSspڋ+`T~@[!YפzLOK횪'`zȓ=M欲$,B B B B v25}:c }y{cZc [ӷd1O+.q|mÔ+{kܸckצ!o F76&RgS&(< m,fdkZKWθK]S^m m<0֦dr !!9 {ksOo5٬R{)z8V+57X~d{0yWY0EġC[ͳ믹bfXMgR~Tu8MiN~d颾;+MQ?MfW E'~Z 3-m믮Pe{Q/^nPO^m)S#\ 7>t}0-n
-L_mW%36h|%K(Ti%ҋ?n tFAJhhѹ1ATziZtmuV Өebtiu\ɥ7 aQN[s=PrXʶ|q8N:䔓3v&]iUcW"▌ڷu&Nk&݇ z?LhVS|K*'@@@@@v"PcYexl@@@YsfVVM'ۅ/o~Pkw6nϱq^ߕ$"N+s</>IfSs[ݩsv:+y{?X1,;ؘE[㰝vJa d@u&[c<pfJv-guGvL> } :4|c`<[/'M߭:+~U
g˶ b!w4%W]dv|Jjmt {Yus>p|d1J{Xڕ8[_j_Ίx/~ꯆHVV>.N[ =B B B B B "ǶbE:VYmCf,?pdXMNڛov<ޗ_)kQ:E ;0IJi7`:"y|Vf"*Q\]Vk S*ul%ol쥕ƒx7&AW^!3Um"Cm5<I$[Y}r 8uc
7,Ri&0F/˃Q
UGdҷ8/)Se*!iS=K* m ŠO2]lO;. +9>58/^$7fcUo7Pߓd/B B B B B B B B B B`0 .gg<˿ @jv^=9RY 6 }ch, N`!Zpt{dsʐ0Z_<
/׀kt lndVJ2^ds,M:ҙn\ u_ҊXgP]IW]ZJ oPp- z ˒ԓ=9d[lI?#mg+[w=qmڞճ7˿ c>!!!!!!!!!!;?? {fa @ IDATѺ<sғ[999ƶS-B ʥyp}㕋R\eʤSM|#]Pi5ooYA<͉x:pǿeiՅZ<.4y<+ ISY\gܸ(-dw=+gyҾde !,γ/c<q7C2m.nDr-S
|͡|À =zt/åÌdpoIyУ6)\ }:0 i<:W cY9X?@~"yLaAՍ*8s7^HF
YV}ַ dC̒-Ã'?**Ny cc.VE@[h 02ڎ 92/go|sͻdq+?!!b8h)n>1_ ¦94νc,W;g _7r_~w׆Evl֓OGDž@@@@@@@@@@4via9fsˌ5\i lɋ l-Ö
Wi08cYP9NZr7V qC B B B B B B B B B v&_/c,ιoڪ!b@,6ԫOܖcW7>6#zuӎevϠ=-XFC B B B B B B B B B v.sɵHl''*"$~l+E#X[7?Fᓯ>[F+{ٝtsYh "ж]ǵ_f;bB B B B B B B B B B`(㬽mN9hl-!hR[2ζ4GK#Ǜ^=4Pۦه@@@@@@@@@@4LZ㬹2JW6&+!#e
n u}lF+1q8ko2FC_/dY`6O}FE`*NJ@ ; xs,څ@@@@@@@@@@l5\u^sе/}k/v<#-%0~<.B B B B B B B B B B #`v =&s|\> X hW-B`!ڇx㰜@@@@@@@@@@y嚃n㱌@-%RC` C hjWVk C B B B B B B B B B
cyf%[C o*=+ݮ5rmj+yէ'VfS>ʅ@@@@@@@@@@;s5\1NsF&!x1.i$\aW{s JhLcW[Ex/C ֗@ 7C`&zMz(N )0!!!!!!!!!!!vIW6<!K !D`5<$ B B B B B B B B B B`j~yt>w &킁F\,@l%?rB B B B B B B B B B v2Ҧ! @( AvUz!!!!!!!!! &0iy<<)Ո)b&!j!:@@@@@@@@@%y[w|vmJԛK[H!!!!!!!!!!E dNzV\6b6Ule` C B B B B B B B B B ֗YaU@ 3!!!!!!!!!!!!!!魳gW2I7 m$g/pxΞoofw_ڵkP?N<]vek_^z_8D0 w{.袙@̟~ݾ}3#/ sיk5g[yJܙ]C4\g{O:ڴX79v}`? Ob=? =Nw'N秝'p~ h#ѣ+߿w=\tw/裏AfwM7u\pR |??u5\ I!!!!!!!!!0t{ݑ#G˃N5Қs |_?,~a]/wԙ䩓\zoMÂ]u肽ߙb<`
Ycwuvn{`NZ/M#7v ·lG%Jq? yٹ!?no?co>yw]w
otyË^AO# aov~;t&je~7{zv$.B B B B B B B B B`Zd XPݻw`| =qD˄6sW8f_#V6sgzgW_y;ݛ_w322"qB ILo ^z{뭷l{Ӌߵ^;t8$+:+\_t?ڻ{WGdcO<}'3-X΅^JC B B B B B B B B F|9T_4nXZI+E/6_N{:B_( ybyuLV݄;ＳD:
: ~U ?_~cr=|įR]-3 FbxJW^yeH>keWx!!!!!!!!!!VFL RH3(oϪ8[s☵![@ [m;àsc-cǎ
Y2
Q'?`d[n鮺1 {aKm2:02u
yIGa!VΖ5\3|5{~RYbE'a! <\}^'8t 8+[}~'u ݽ2,#UVZ [] [kkc>-֕k*Mkr !!!!!!!!!"PFZikҼ9W_#4:E9![@ [elO?tϏ2ZXU:e-3z{K. }ѡq}
Z?W/rG?` f!
yV2,'2ϊX sBs̅rPiҠyӬ-Bه%0ʱs!# X3_rOq{ ~x)l|P +݁nWLF_Xo}[VxG ?l .!!!!!!!!!畀j*4 ;sRn /!;@ ;SX W^Yʵc;3Oalbg &UdZ| go~ z{ '}oo oM5K@@@@@@@@@z--yʋ_me !s @s>%/Z:V?`X}Fx%/h;O<D_bM[6 do ;vlH#3 {u:8
- @@@@@@@@@7hlgk_[?%' <9-@ -PIQ16 /<t0t*ns#˪ٱ!a~Ý<сyì?뭘ا_X _|뭷G.5i1 waw}w75&
-H -XiQ96OC~WVGbcPe,?? 2>ݿ 2 9rdR#.nEVGȧ}@@@@@@@@@s2hQrTxWWwVUOoWB v&hwf!07XD8Wu8Ƃt.>noBfm cߔO~ҽê]qUW]5|
r }Q / o߳j[rꭴJ}@@@@@@@@@c9Js_q͛4; 7|s !@*)*"Pgu4 <x{ >Es!3<3|':YG ?{c V+u?9`Yco}{ :Թ!7 !!!!!!!!!MBvNV^wuKWUF-.,rpą@<1:OC`nV>CGaVg/Xc+]u0!o߾/{u=gnя~4&_vm ё.L8 .oɚ3e@kkYbEx3k%||Z C S$6oY
kƃ>8re7fo%Cհ; gC~{_jꫯ}m'7(!!!!!!!!!= ILk6,Vg 'VrQ _~僌}"Ϊ6&S w^zq?i `xg
.&<0Udc8g@V0C B B B B B B B B B<`=p0Bi VЊ !s @s>%> >S7b/aUl}ا ? Q7|' /ζH"iFV@@@@@@@@<KNIii hB !_{ꩧ:9K_ҏV?{ѣV :t}^>iB B B B B B B B B B B B`vP
$ j5OY(}ìLm6-Ro<yʗQX^}^9.B B B B B B B B B B B 63h7sD@~c?q[o
4[~֧7E?W^~_
qDoO81|G ~gtq ͊/OY4oƠ1Sdz%,B B B B B B B B B B B||@M@JT^~G~oX)+ >ecu<`ex[~ݱcdžߡ=ryg};oKߤe%~ Ljk
fɕO)yd$N@@@@@@@@@@@l4,!U P qӟtlE]=ݷO?~ +C,#ձ <xp0O>9jypP{7kfg~m}&y!/ ~떑֊Yjo
8@@@@@@@@@@@gbMS V{jUO۷o02w}
zwF{g0̾ ۧz=۫jIc܇ zh MG MW%Q(6_<<e$ˆVZI{a>%,$7`'x{AwRi~ V
i !!!!!!!!!!!@ _l,?X}&sǏ >GwWzNH1n$[O1 8pWV1I !!!!!!!!!!!A B R)f@@@@@@@@@@@@'.8&Μ !AO~7n]{3NN۟vԩx 9I!!!!!!!!!!]]kn vt{!ytY
L5{N6 ].UhNbX:kdAi5dۆ ,P[[0lO??e;q?uNt 1؞N8O!!!!!!!!!!!02wOo
H{ ΅hs^ o&sxox0j J'F%^0(VL }9ދ w|
{ . [ C g
epV7Hd`
TZ 3O J]J ۋ@dTulo-cmfa袋d*9ه@@@@@@@@@@@@l<~ jr_˴7$YWKB ήš u<Wx/^\@@@@@@@@@@@%pЮkrYFy[vX$kl@@@@@@@@@@@@@@K`!Z"OKY@@@@@@@@@@@@#F~kdUMJ!!!!!!!!!!!!!Yʷ]
*! 9,@;Gn!!!!!!!!!!!!!;@ ;S%Nn!!!!!!!!!!!!!;@ ;S%wcKn!!!!!!!!!!!!3g]v:DX蟸 ]L~!1Ю H
'pĉɓ';{'O:5a{ ۷[)
_tR<N٫u<OZM.gb=w@@@@@@@@@@@, '| ;v{kkb,l16nF-E]۷SYFO?th = h^xaw/.7٭|kC B B B B B B B B B B B &hYLF+f_2+63~Y m饗e# <aC9ŏ%=03_r%s> %nu>~>*=y@@@@@@@@@@@l_V2F2J2 Qi7cc}20NsǏ X2ζ囖.[@ ggݬnhϜ>ugNw|W ݝξ!Y+$z@@@@@@@@@@@ZN3P
*'
c\0fU6Z{C檼LimY/'e+imF >Q}~w3 9jv.3.ߤ`>6_DW5&7
scȷZopt G Jҍ4B B B B B B B B B B B`({rd q7fC`SS]۴ j'Mmbҝ~p;ݙzgzvw']nϕݗܝ5Uά0WT_ˇowc綾^~^z7>vckR~8|5 o+S^{m0tMk䙸!!!!!!!!!!!ۛ${.qJUl N };ֳwgFJY{ w݉O }{ݞ뺋v |}QwǚW\q9+QQ^o{uCwku^UZJ7>z9qЍn6JaO?w}rtȑ#ÒkvqY⒗}@@@@@@@@@@@@lf[@{㷺7>ݝ9Yֻ/vgF3>7O'_Uo{Ӄ]H{V fe@m
W^y`,tRaRqny!
#hk_{Wlŕ/0+n[yw]v`dϷ1k>}7C/j|۸m0PO 'xW:7>q!!!!!!!!!!!!!U li`d}7ξ`|Tnץ
1u7 ^x0b? {;]Fqwxo<hwfw]1u縂4YV-& C W]uհ5PJ/oqXuZg[~6PYo}!:YJ e>_|qHs72z(#/ YC4'=>oR m\VߖUGϝlŀ1~gd !!!!!!!!!!E|z\%0ݺyu>٩݉O+g鍳O{K+b(^ߛh{K`|xGw7vGN _u{;}Ծxݙ we 1 <8jDFm
><ShKF#on@ʸJ; <:;VMjZ \#:Isɮ
OҳeI,<̐ﭷ%K~8Irk7 xD.)s@@@@@@@@@%[HS?ؼ;o>ѯWg~g
鍷1koo(ev'յg^O _]{;y7ݞo^y6ߧܬZΜ32$2tN2c7tj[2}B1^ &ߊʓLwy{7 ׆ 3 #~Scǎ
ci]Z=[~'/ǎ3c13]'9eNuUwVH[
!!!!!!!!!!i6I!vWok{b~랫%㬰Su ~v_v.k/LS.m۵ n7;>kt:9j/ cO26ZY )1 9rþ UUVJX[UmeɠX:W2ܜKoLt>:2nȭ<d3ξKؑ ._xA߱\2 flFD<Pn֯˟
cm,aq@ߤ:\ m_iz؏'5kޫn8ۇٓ;ǃ_kH{io=;/M{Go
߮7)ju3r~RC߅usdo?Lչnd 0ڷyNS YVJǿ ={a4nzӆRG&cձG6-Viq !!!!!!!!!!;9w,b7J[, cS|6_lUW*rrnE9m-RxrXWV֬Q͊ ¶/ʞ
~[bϾ{5ݮz`too?ߝ:w:r|anw|1edO&mvwCz}}!ѣQ̧5J
W_ nb dZ*M]`Ӝ`-#hӃ
JU9a~V9_$>CMK! zc.= B B B B B B B B B B B N0 Xg}ԜW> <x{衇QG 瞥j8l𪫮ZI#l+)[J ~]K9eÇ[_K٫CIkUֱ]MH|mM̾flkj-TԶq[|hvbkw`Hv~5=Clׇ|G=~gvw=ro9Qu{c{}K,o`-o uc1j=c*-']h {Ĺzsmd[V|^ya!ˣ ^'UowAHGKfKRaxV3SM ͼ;;wy{' vFZA׳ X%\Zƾ {l0I?o}ko
x5\F=Κ<D nơ +EyO=`(g#wNUHg}v0Ou_v )i-T,],ZА<6 {n8fHfbgўB) ~3ɳI&n7l gv:9
L 7\17m?;<v_7
Ecٻ7=<g $ը8X-$ =?s%$ǒM˪XD[s~xw ^3̩<i9gjֈk<P KA)-cԌD(c.s]{Π<CMX4*\y >C<-quͿ)]^Ϝ=gI m&~gn&@A @A @A 0>oL 0N @" O}Sø^giz{饗gb0nsBG}39q' 4`ztZ[v}LGn쮺<x0?Ļ<?dQ ^spwZ*
/˃.l,,{a=SKc
57txr3g^>';е"@n|G^; + 6a;CmPx dm_5^[%մQ4XVU?3JJ
jU-2
_|+њ]bҟH/_Ң `]"'41iR <Z" ^rsA @A @A 9ڍg?H5c R֊L}R.ؾz[@Yu[8s=8#- blD /]mNtJE N ;|=#un [%jm1{p8yqAx¯x
SUpG%Ip$A?wr]Ĭ< Jքe{[ [ξ N^0|;vf3smOsmmmi9p͞~͞|zJַ<n7.$oצ6s-vbCիկ
Z^JH\lm7|ٻ*(=4 HR{HO)
X)~3t9-q<S@[V
+tU0aVaPa@A @A @A ;#`|݁p3UYil W
׀EX=͘?醠xcܺ7M p'lH+}+յvđvpvX'x]rkr_]{ۑNnG`cU퉽I)[I'? lq,zqFV:N?G Z]|g>>˵=s=Cwq|ۅm_Mp }]|3/V[F9t zoçշ] :fX ؾvR~w|; v~l4uP ,BV!`JcQ4 J*NqQh?t *` *ZiR36F+"]pA*m] !n3$
{$?FHp"A @A @A Cq[Z˰6䭀EځpEҺg>!ó xC>5ޏwxg,/|yrZsBKn O< :ea|mx*khJhKo]L#h
VD* ;s]罌E" ', ]q s5~O
N
ob} nH> +DAg }%C}uO
Ovu͜x ߂][m ҵ^^OW;Wq { .Q"JXdPEVN=76pRY
])r){ X*l 1H'h¯0l?iBZF[9H㺶n'θ A @A @A 6G / @![xU^z4*GU s5K5w 6ݽ"o,_7Cz?ܙv/ޯ//ǎ:^}v?p'"^MVVnY'|H['__ N{ϰFz'&X;EW~q7/RYL%oHc~qϵtYH/w9m_WΝD[voo Wk}Ne}+Y wkKmm6t%fN}Ok!)(M)xN
!KJ_! b֊\/
/J>bW8V\6QT烇;nq38 Seܕͼ3d!C$ @A @A @pS0FoE+<C(w??$l?.NDxVY5.NcˍkZ#܅틟}:q|m3dO>h{ 헯X^jO?X;05!_|qX -v>=\{gg3!E"j
=bow|:E
V|^Sc&J ~Ivh}E>f/woU-h?--Kqi'_|lԟٹg6?{,G8RRĢH)`VR; HP|q،S|%`Q*J*2m'lV?2y3 (`8 sΌV-
~&ӻYܹ @A @A @A LG<CX Vc\
|P3No j ?au/<řةS?j\vZ _gk'V/^N ? CJZ 6Eկl+K퉾v;E涉vޗ[`'1
L Tp?ZQ q)nS03Ix"qy3 .pq[>n|//zHwpCewJ|]o};Ŷ|6sSoWj_~(v^<V*FL,/%NxVX[3Bī0m' !ϭ.(BHNd+aVH?F1)fZ LwaXB
R[uZ /r?\_A @A @A 0>O~2l o!Ƭ1}c1GS qAzfu&![;f6p G"3g rnWH* = Z[ ؔ=Rr0cxXwh'g7r0w@#{+' ;A" u)BRYD^=}y+MJ)
o^{ ^-ڇm|v/۲'g{-ʶWv*~7ٷ3;?|sW N6JWPD
U8SXn>(܄cBv\ C֖\ܮ-a{fHTJP㙂R~*<08CNU%HjX
3'@$+Lac)#m @A @A @A#`<ؾ1wc:c_җn}_{0f̳듟@ ?wb--9Z+˿pJZsQ쫆W*ؾSLxJ;Wn-ȡO>N: }DZlSJ"ӈ.7pV~2ޥV{*wI{Ỹ24:yE_F7?ũM> k D'j|-_l?2ֿծU'r7nn3 i lJࢤQ1q0rcB
Jy+lʊDZ`(M3ⶔ
D^ԭ 3FyftUsV#ZX텷HV aV+ܜ@A @A @A !`8nqv s?ϵ+EV>he WA(..8 xvϴwϝo?ًP'M{v b"=?0vhyN[= | ,ӟ<M @ IDATO!\ )?r Ɏ44
pd`*]$;>g[&[k0R%f$xRyw])l_Йv:_y* 8<3'N+5
I'ݏsS0?y-l(Ha
09ÊPp@|*</-HҚfY/e~KV
l w^d.CuOZYk^3g= @A @A @G 1 ta, 1d[c~#p E6t Wۤc;)CX=k #_2GZ xyGSt6wη??=ΛzS(MȻC>sC:aY~_ xɰ"~@鯴x\i[i- > ?4)_:w L{ |[[Vǵj}t}kپßj3 Gb7(פ2nǯ f0d2lZJNQ0CN~/(^X B+n0m-# ܛw2+ jbiQ`<+bҟ
jDC:=-LHZ,Y#A @A @A tֆ1k
t'EMvS00n_+)[=ks\ ӶRW^i/; ~ݱ0se=|tgζW~z[YX% \[loN;uX;|}XPϊOX ]=SXN/gyfX:
{T:og<a'i3]yZWdDcǿVn\n_dP㏷'f<#|b#4nq>KFFa'Zg²HTn0jYd8ƿwgt֊k?,8Бv"
͍_rsA @A @A ]~ؽk:-BW6=CYeL,1"ЊYC>t+_J;{@}_ oZ_ c ރᩓ:Ю~v؉'6Mֵ띜=,~- |q Ȥ ϝ;wsw=9aeЈY<E}HPaY
SnTx7^+qV<ccit;d)
7nτimvg/\
63vkkKW L̑Sm/tB>EU8n'R]8
9Mʏ0jo3 wMg|!_
˹乞+X3F~ @A @A @/1cǎNqv/@!泈 F쾉C!\r_V_ׇg+C^:3grV܈7i}ol'nQ lC O<~O_|}bNҞj:v(啵vڻv> $|L
;{ 0 +Bb:\w s+XL u܌]WkmysD¢yF_žS+ 8"+vtˏ"zM
'Y:GAˏ_0 m`s=Vq bHN,}smg;a턱 7[[naN /@A @A @A EjudLm au)f%]8nE!jpVq"GӟZUYkdUgN<3O_y7.<]JgjnXV~O?WnAʧw +$f#AzgRi~s7â;ҭ~ W\V8
YnറR3anz1RiC^Cn6sd;ʍ=IWvsC/;߫/:
A @A @A _V"ju?뺐*ЪI䜕3&H"EU}97NŻևOw N~Rؙd#O :3eVpjw? sv^^+P̟ww[:QτxpifeoTW=O|-/]k^ mt6_n@ =>uIAA @A @J9Ty+BHq0Hz^a ~O< g;7N ?ֿC{tX1{_k@>0S;c\& Qq s0'OƵ=G;{6xI|m{/u7I Go>V$
v;H +n@A vP ǽ@3aoR?oB"Ϭ F`f}nݿ=rP;zHэ ?.wrwAl060=V }vvo2͞D[x?@A>"xݍH o<%A u|kiqqqHA~"ݶH wJvl
A}D:O> {c1[gA fYBf_$ AwygJmsg_q@rڵ? F$(wN>< oAGL{뭷.@w%h$:1;w3HA $f/,,OtA`KKK-ʽ 5䬲'@_(k껁)o ^!PcU 'kpQMxA @`=!fA 0P A`g PX睑"@ʝ @.T ^E`vf,
A @A @A @A 4B7 @A @A @A gAg_m2@A @A @A -,gN<A @A @A @DcvvkknnnpvOM ; z$Z1N
@A @A @A 6A`*⪈{ $~{yynXXX߸qcSwy7@ ^s74 @A @A @A |0ɥ:2uiuM\)[V 8 >e$CpW"PzA:!h HA @A @A @GXEE"%E);&i苤NǑ#GTG mW^ H]8"{K wҋA. @A @A @A l"_m@TY[lEz| ~F+ck;:ߢb
atݩcIuA @A @A "`_ZIWNeENUAv=Ńp~A T@@\L@A @A @`Uu\ddY)w{nOo#6
A zΟ?~[o
ߙ; z# 3Īauҥ6[z]F2@A @A @A`"pO Z3Xq7V'IA#Mbgqͣ\Y]~loȤnC K/^x
28qD'>Ѿ/G }t+}{myy}ӟn?l{ @A A`uujڷ> +{yqq]reOL6כSO=Վ ;v+J}_WN>}^H;Ν;7L6&RMX]laO~rn܍xG {_7zhُ}cK]3' vE+GW^ ;ȑ#k
`¾JyeGg'$ ^f u3% <lZ]k3ȧ)r+7elb gRwJzŽ Y]YmkeK++նݭkFo&7/پ 7n }
/7xnN<.\^~塓zԩab@
A 0cV 9 @"g+A!Ϳ7ѣq*K!B mEo
$8@;_eԧ>վo܊SLZ/ L:-$QO/~wwoSÅ0ofHp^h7 9 p !1/ｖU8c=,Ѥ ~ - 5я~Ծ~Cáp草%X653M`~i"_cS:mAoy [ FƨؔpoC<?OOeggo @؍3V3}6Q/pj`v#:Is'l,!g
[I>aF_}6 laD S@Ʊղ< >ly##|̙q\]5u$5
8m΅:UTXt_IʋIXʽ:NiV8)
VGt6
3|K ;Թzs Pduz U!={vz0c`GÞjUzIerS_7~r7mu¤+i
NUu_69 ؛ fJ&cX
ګk>(UU[ #nI];X8i~7xer@ Q"/[+Bi2
t[~sP߃rv E.i*q/~1/ #A6yƎvZ}`P~+I wU8!pKWaigX A8-i~rok-݁[m+е Ժ_:(lG =c5#\}IPoa#-} W: YʇIwc63w%ZXC ծ. ŃTuL|˝PBiWgx/{>))7>I @
39; Zވy<#ly7v0voY!}Z#f{muy~rt}e~1yj븚ed2 N>;VfFv>3̭ƴƺƻtan0ӑ04vuD/6+u5uDE ' n+-AJN%-:m@\u"*
ҜA)}_&2 ?#Eбۿ п}s
mQ%AC CPΗ=+"PwߪV__9_r7u
s>̥21ggC5vLQk%?mp, ڀ>ڢl&tKm 6DnѶ5Q.ݮ''"h h Ļ?&ǣ~O
Wg{N{LՏ]9q:6"ĆIѶzO >䕕*pؠCƽU&x3}1
ۖ?? C)la_}J~+ד[iz R;nC j")=w£?꠫O?S51_/!D1Qsy{D8W ^Aqi, y.."^v,d_8V_0 Ía!j+p*z A VA[ ئܕv}W m
A[&ſ2N2m4|z#Nn|yIݫ!u"cGm]kFFƳF7"W#V'`, 2k+ Z W|V#Z<ͺX:!pЩ-? i\h9tD4[ g~W2 KNE(s_ |;"~qUDtr L+!D Ju rV!gϞ tjo&N>=N
#=
&2]]?WAI?pEag?sCr2n="
UG܉ p`U [x-vr)E.)'Y~d`kG* [] :nD]yF
b
ZYsLΖ[ cgC}h'HÏdO^xa o]&MҨcqp6߰NyيFٌ4 +wF;紶wYB$suN o뱰og|?K={fq_uKߵ'V/;J glԦEt? Qgi
d>N6m./Jo O} A %)A2xRۋV +zd/A %!17rcloTzukh;I۴3l/F 9B@GBXkFuF-g<Ө xmvCnt 4mu\tt&u.u|}|ar,\::^Z9>
rữ! 9Ӏ::3V8(h ['[b g@K ɫ3Qw`:txIVS D{{uGzst̥gc0[y$
ؔX@؎A% ;5` ;5;=1c&r[KPO2JH[SHoҫR x4A9A`<"=O<:^Z\\#A F@>؎C[WL
A=nؙ;66QRmUæu_4iվՎ /+OڱD@T**O'L"met18ES9L"cStp?v6ئ X9^" z N&{C{ }y
if7y%
Õ%5QD iJ .=#Pe~'Qywd2Mi UBӘM F]`{WԄB+YMb\~#l?{&Av(m;z%MIoPkK:dpR~
})d:XdPskB,OBR 0_{{F*:⻋} _ܺ{9}/nH5 n74}v}~ O+[ 4kfn
!҈A=P:Vj4kdkkX;h[ͪӈp!\Gvqxw|π4<7t&tx7\ :5Ӡϸc65T! V6}_ O:t~*bp(\raAXcoBۢΔ<P[js@:gϞ )%:#a/0::7:] #&E^ D `lUc6 * J-oɪLTbw61uzG K6pE[V ת^d,3%_cBg< G%*) * l~X?\nG]ٛ6:]9sfHE}]m^~ܯɒ ګl:[W>E١ OMNaڽ*5g( +W^?U$8.^mp͝w" ALN&OWp2s(3tUNM!n&l;x,OWĥߋPr0z-LS(Ү]&cBuVu2Voۢ\Z3/BlAa7ilzS?8n7UzMP{X
w5闾Vkg'e(Ss$iL2V7Wz* &7:*}c/mtMM8UmmL~pqGA3Tbz&0ԃuX<[? A AtmiV{! ljޭh@m3hw4.\v
c
g @i1ut6 P;:E:[Ytr</y A0T
|QљF
O@G@W[缷7 t 1/0;V ,sg' \jk,H'wA`{X2H'43EfuF qur ɺ[ĥ~Q$#V+&n5q˓_7a`s-Vye lA(| J䱈$$f~BM*7!lN[I,[]0gڭܱSj?a#hюe*Qv7F? keU.h+͕Y?iEJfewUdPZyTi&X
$>i)bC4o`_ P"6՟ D;db[^>:.- ?v]qk/6 QlVؕ6~ܯճve69A] !m[س{' svVn VQH{dspDy(/sC0כlgyڡq˥˄Qpp]Cw^/M&H/#ک 6]&%H?zH=5sMa8?^i^,ĪɟTZII&[0@{h>Dfz}}g9! 6EB
jOz`aݸ[zqϯN1?v;LZz :
%5HfGǴ iVG', T
|ԁ)f8a&]
=0 J7muoE|[:tTތc-f/#x+LD
N& Cuz cЅ)tZa7 `cXط I٢{RgΜlYS
1[b0MP.Hˀ4 ip1ʉC:3u18ƽ5zN "mcs`Gh"@\e rR-)w.2}jwYer",m٧Akme47!CDl[H2CdIbg\8&4GA_"f[A< ΛX#h?L zJEW>XIgNݧ @,lD8< qxcwĎؽv=XY
1偰2JJωxCވ}[ .Ҹ NG_Lfv^PN)3wBJƘ5w6AN=o~=Pro Nٹ);MeϔŞ 5_[ZLQ(wM^:[+ _|l,<(5.3N7⠫O N0Oȗ++[h?qiK+3qA A+kkޏ
0$A ݉ GYUWQ@M5b555u
s90͝45u15ἕl؟8 w© H!]pƾU::=Sc 3VXt$ى{_٥Mٺ <RC::V"j e+:&lhѵg0`؞șKج2}|3 E^[f)b](}c;0'ܨC K}aJ k@6*=6Gc` IkPL ed+^Q\G&([G/7!h Ŝ@Am+}2v{Q^T@9M`HO~Legΐ5mLkrp1aP~lV+گZ$UFů4e2{mQV{T2kiѷ(l|<w;` A;
y=C2u)Tg bCȝ1Rkzaܪ_Ƶdw{}rW.G;ȏx*sLP wQʖ"?%ȽtHC[Y ܔoѻ~gtPYL#(ܙ]ǟ0w]v =OzEou,7> ]:t=JgrCwwgvJ{YR[m#Li#R[]-| A V)A[AH@
W1CLg 6t
\h pvg"
yR
JK' Q
U:ĵ8 tw"
ɿn N0"{ FGwNf:(#%@Atƹcl
GuPD pvXGo?~5 a)*152 6VǘăB]97ELSOs qW[<9Ýp)MJ;j#A 7bl'?Wok/j'\eIٮ^ȿUG OH
`נvg+QmlNhH 9d^[<ƕe8[u7ϔ7JVDv|sgg8E [ҏ4
RDMlk{&z5)fN]tF"l7N4)&~vln,dlOܸ.bMzE*}rm{P$)CEH5|N"0f+f!l{ ;ߞ_ًF(jOq$n)# 4h Te(azl]P'\8>zBrV ݑ>mQzSRmՒ"haBzK/"<hM:.A: ;z,pu۷w^F@QH i uJKdv͛"A tY|TB~5 "VCld7GvjY H ^:En' Wch'L䬸ƽ(϶+xבVV:I|po/"L^uZtt.~`<9ת_HUxV{&F_
A߬^3"Lq tf$Jm}FGuf A6oz7ojvgIϤg0X4taq~vD:L(Ea L ʂ*Ge @vQK2G2~Wޤ{w
NFlR~܆eKl 360,E*'Q٣vos J!^xa(Ӥנl (>GNJ3FCz
7 C 7u%]Vwk:M]"Yw BoJ~]:O
H9k;npO0GyvMT [;C:v ]~YY(le.-]~a xm~|LsN(`Ko/~,~1 w^Y< ~A:Kz0)]%~C%! X&'
*Ml6bcqyڝ"i݈O)_MqokzSى67NjVv"} 5{G@/Eݘ1A1LA FA& Y) ƻYN
ߍƬ::
u8u64u>o :1xfPHcoIn :-il K:9zzuH5.9(y2@ UsOIG 3kZgTbئt:tkAHMR\f
szIZqzr6G 06h ̮5ZحAGgvٱi6ZoamWͬv_ >8+ P ( )F+gqOyzW9_ k #)}&2N٠AsDk=gkUx7 5PT Sh|+I& jK6-{WBy'" _ZEF*K[,rT"΅rr 8\_J'+bgէ?h ߞ#x2kxN>sPOsSZ{C<~&Ni flO<l]JgW:W9 e2<ؓl&k}[q#
ڤ-e6e wx` :tlT[zß;:M wd[~[.> 4:m8ȏ0.֤79*<hwE䬱(lf
OkYȇE7č h'wNg.>l?͐ x A 4
29#tհ6 A7!t\r_Z'Sͯ: ::)g8XԠNl5{::CHV
6iUXOX^ ᙎ \ .7:B~mkU&O
{3{aԚ͏W[H<WH\&KKE@x/&b|RV+ԏ~.asIwu/e_ )|o
h-rDWF}F @=V vX.R~ [CB>s5Njww<Vq+
#|R(S } 7y$.ev5, gzAev2G١.>GφNS{VBYf\ȟvҬ=鷾Ml6r6qZaSm $ 'kcmA` }WtlZ;l ik"<}_v@U_ª3cGڴٗ:ڪY0[`=s_8u'U>CH2lYY#/)77MomcS7} ;-z\\̻F^WH9NȏrXt.t٘xJx_=v.lDit9J:>enh+ r'D~qڷQ"l+| =W?=ΕNI El?϶F֮罼>ܠ+M=*
k] 6b;++IZ vfkXpPס4VbAd
^
j@!65LZ@=S1
s
~Mu2e Y i^NNgV"EX:K:jLHΓ9I1ؔ;&:]:v G6l8h16A?E:: zdBA'&;:p蛁Y6];&?_P )M`k l'}3ˮ-{v60{68 0PzSUi.nG+o
M_D [oDKVʨӕI&q`SG@ /b۲3KrJ9ew'2D,C(2ABbpRci?@CٷO<u35Q{{:6*τ]}ohժ"E'[9W*L42&O:w./
P]JՑtL?6~"1) ~&#܊YlX],^6&
dH[D|"q >66-8M!c!`a{_ՇW5~wQrd60+egΜޟ1proǽr^3C~Eu1aCaӽSQ/RzZڕ&;iT?'dN[MGg¤l-ƘQ~Kv(nu#~G><w&(͟9
J\ vtFNb
h6:-έ<OaL
h-iƺD:4MYiLｃNO `LntHu*~on DA'ـN<=_0)fW: rwPMNG] t#崲 F@d` (4 f Op / uٸ,F9@G9W=C WZ+=
mظU/ʿD{RfHU2VIJ){"A lkmGL2hȄCm v
`-;+C϶ٴ8vxƆ & qh)la*?)AZǽJr@4)ln`^^ a D!<yV1Θ@OWHvhO{d$czOE;& J龸\IAY"6^WLf<qNL<O6 :v
Wq'^{&rlQ W|&9\gbĉHS~I2c3L|wk"N@ͭ -Qz3mDzGLVfn;'78ц+ڠiՆ gVʒ;̝V>1}CcC5_4=bq><6rχ@c7S iw A 5B7 FC'AC^Nƻ
t K nt64'IUnGseANx4`RJN Fu$
"A L
zk`șygwh҉$v3DA` &0fpIY eju:`@$h@{ F6lp!
Ԗ!N$xQ7o ?ʋ Toʩ10(c-ln^"l+M<\}S97Yl 6cv'S. "F
fTF-AhS# [ۥkO ;ޮhs(;]ҥ< D9 1!_[DVe3 ԅoy{#N؈HM:H$;[hg7:i".rZ^_BwH]*cc+oG;u9Q#ؕٶ zNZ? @ IDATQ:4J l! uln"˕ V/ 2m>w3`4n'{эr̈́ G#r5*1^kW읚[
g;lRKV7<Va*g# SgE]LUl w&<#ڐe'mƎ A0 ݮ&Jڧlt; `cҭ{/ޛTytA ݊{5IwA ht:}S@NƷU
PHlq3=0tu(ulu"9P#J c
"yβ{ 2SWA $% "Gg:!1 2@GGo fO9Z` HevD<҆%pP|g N>3D)G4ܨ^Si&MEԪq} X&bDe?Qՠ vnj<Mkc #m݈!SI8 7[ܓ ~V)'[+/E(A٦a+W<s~GtMG@!vmO7D:Iozo/.đ Cr?¡t! mI-Wa5kŮ{ bP Q3?n؊"l֮&?h"H&F 3yѧjy wO?G gm; `e0Hx2klA\y t:(jG'3>vO`0A,e-
:,ӄGcp',~S=cʿ&lB[>[WyO 3
A`7"n|kIsA`!ã3oƷFh "A"3Z%q&F)a%W,ot#
"MvHOA FU(^ w\O
;~XC6i퇱C[Qw mi"A
XiI M`7wZU lWli):[# uʵIfǃ~Ɏ"AN˙N:&Tq4-n8F&:7G~_1[ l8FdiK5}?[6MB@R"v Hȗ;q[mxaiwUd=ϬEҍIUnUYZ[*J\4)l`E&^0K [.3L~uĕg=R' '|ҽ 0I2pꞲn m;MճVr_~L>ϐFm>ﻈo5e7=tSzMJn1*/{iַ5 q/ I;C蛸=xƝ< f8J )7aY%~Wl w ^> B @uVc^FC\uJ :[u ͨ˿ˡ3#iPI?ܥAR&>HFT6MXqtI'ѧ|wE}7oe$`QH;;K?oc~EX-A0rAFF8M5C E@
DX*ߖVK"Qe+Jk\OtS } ϥX#Mg
_a!
q54.A*g
'z
GAaּ~sCwIcF[xovo J;tJV;+_y?HX+ C<=d1aLCXcFzGG 0<_s/
ܛxm/[}?A @ڝ >B@ u(+nW @A zH dXQȦ7^ݍ챲N>M'rc2 adVVV>~կ0AEn#LCv ܛ|7|jZVBwM 9mWmQ72- KVBow+[IhvE ;z].݆!h%;iWec{f~fz @A !df5ٷy>` %Y A @wD`x =AD1 . D`H5C iw>z[/+7 fowV`Hޕѽ v@A =jfTG@A @A @}v g[{B;uo;跦\Yno_ZN~<q <0.-/hחֆհ "Zavw뜃@A ݆ B6n{kIoA @A @-*O<|}~5ȿxzpu-[$~Ǐ# 3ն\^ >>1vv /];=ktu4 @A @A @A 'h( i]YZm}ir}ye PmI|}B;~h@ :箮 zjDtvu}y]z@Z['"9@A @A @A E`_^ge6ūo^:"N-;zБ
پmak<^}F[n^zgCZD O i':{e+r'hs-*}QFA @A @A 8qYﺿw,Ws!Iэ-7- f{~ON, tlc'sjWʞ> Nڞ
rxmyxZUzxZgtb'Dt[<
A @A @A !`څiRޏǹ6; LBJe ߮p|;wBNd 7W.\뻣.Ew; Fb ;~<zq_i}Ez
;> #}c9,-7X:A .ho_ю<>_\{āf 0ֻ?X+/(n߮9 @A @A @A#`w: b7ff;/2;7?_5 ځEh$5nr =O"=?9C]~sեncxyvxܓ'ӏ sIEv<rp$6uyщ['Xx7.t?{oo|c{8ե-~ x@A @A @A c9!}fo ^*#IVXfwuk++miZ[xh;Wn&o,~_j+]қy]br?; }z;UAWηg z
{<L;wkSe/m {c- 9~<2No^|vM;Uג @A @A @A#@W<c(VDg[$} (fJk+7ک6>?9-n7/ly#_.{o 0VNxP_p9?gݾ"h7{3ϊ^*]dZ|{^@k&`ya~a}va]7@A @A @A xژ;l?6I)ʷ<T߷/ <oTzsl[^[$b:
!;K A{?}jԍq>emk8؎ uoiǎ ^w"wcJ9Y* @A @A @{ y7: Aމ 9UVZ˶ԉtf*Akf\XbQȱ}l7vma3
>hU8ߗϯt @A @A @A |to_{`wܻ}^W>#h7fS[}_}u}&a [ڋo]kK7C6d_5'ݍ>cXu;*A @A @A @A i;v;1~B;`껋W^ -''N l Н Vf> @A @A @A ֊پ&vgf7ɃЁvr{r[fggoɍ;'ډsÙ~{{v3+A _P ,--/W `˽ͶEpG: A`7#27W\i9+I{ m ;]pa6I Տׯ_P$; 5] >|J;./-']kWWo7./}cn]/xt ~_<@ מ P XK.&YA E @ A ouBoD A ; ;
%}A`w" ZXW;!˷kڍvuiecGיNo 嶴~ז /wbvuui+@Z{?<@ $0$A`G!z IL9 ;9;U$!w@ z8y %QǷ9-Em^Yjk}Bt~xR}+hom\p㦻mliu~9 /sss< -Ԏ =-w{IR^FN]k mHA~"1AT ;N~ID?SpV۰ 9Hkz溤t7Ӝz.%gzg>>J<p㳛]_pq^B sW rD ˭qn)[ GJ F7復fݩ+<)FA Y4ɓ'ذڳ $cA`!cWǎ @z/IJܸ?s@hD@ aQAj;q&{6 'a& p?P$ݎ i'憅dâ>F9s3\bp` @8o2< n%"f~DvJ9^zps{I ȱةK09wೝ}W$ÑCsv/Z:}Gہ|RygSI0z ol|&9nWֻa}Cn]A {7Du /
ƶ8>A q=ۧ`3 ,s/NG`RWS?7G?w N- hO >fϵmѹ~̶ {
f[ummc kf:669ɷ"SG X< RߕkKCyn nHrX;||k;}`{ڹ}guO@n">ul'O=|`;qd]\\j/t-vu}S k?Ql'>ګ^iG j_ۅo cN rfa'f l<bu;b> zЁOtb67[n-lSI
f/C< @A @A @A& ;މt؛k;zo3~lO J VuV"Woܚ%E4ז~<2 94IjW:sC~~J{VގbnD壝<cz'//l+`=/t`@?Nt t"vyt_IWvsZ;Nկ ֖|}{<vpÝb'op d#'bhOj Wڣ'>u|x5ty7 7mi]#h sO ןϋZ+Y~ >uJ_Ri|ĞvOd. @A @A @o V:vfV +,;ox@]dKWn;O ?Է]갪
W\'lC3Xm ?z` e S!i;on'+<Po/@"鿹E:fjA3 ;Ԯ\_mW;%huP=1 fr':z7V++D~tvڍn'Bt2xAz+>o>vcz;W؞[ |'w]W/7_ 9~p~{G=?+rK?6"Dw8zv}eNvz;Ws +u A ?ԉ=h~µpGTf!hM@A @A @A } stH0DXh흥vmjΠvn3m=R?m]g|zs}Bx?Ƃ to0;{{ba:=d",f@fEfr'@3J㇯^+L' 9Ҟk0}bڳm߷(z}iXqj[c/6ބuXCGr_|Z_6E^N<y@\n:y;+t7: Vǽx*}}fu YjlɃAq&Jթɧx+\MRm9!eG5Y%8 1i.n
n$ƚz|WcU-y"- 3.i 2r`G!\f2wlh0 eFJ@$ H@$ H@$sbd裣!
8VNČ́P[(v`l$kirLI YގW~V_8Q"㣨q}6f2XFv*aĹ?p.9B%Czc'1{ə`5 L {:ߣE4E^
, <2x ;LXƃcƫ!2p*~dYb2kՙj"f.T&2h,cR,?AfVlXyWu9 E"coXzǶa,sP(XΘr;^L=-̹n5
ݚK$ H@$ H@$ %]Lz,BH`
o`F˷L:
`bf$x,87'O*RѰsl"ߍo O=>Hy,ˬr1km뫦C@en { L QC;lRf~ ;GvDzM
Xs*LJ0cYs,#K,ٽ<Wb-f:o{5?hW؋=D\7f\ _pLyo""GTr0wC;bfR 01qfReu S>Hpo'ho*@Uib$ H@$ H@$ H@6KDzr쥘8 "Cfc 6ؿ\Mh6 \X* خD(3dWg"-ǟ|{u`3#GcdqC12Qjf*Ĺk! څrfBdg4}t_v
Vg]Fm&-{b8U<9 ߔ .NW9}:߮71Rf P̨-yCLۡXz|d%_{<bps:߾ 3uB ٯlWq^luwp[r8P:,3E5>aΦp2A#EVEHK$B2zqz#ƭm7i$ H@$ H@$ Hg
֘86 Z!1ru>k]+~
DoF[7@$./f6y/ =PfS·G|FmteLy7gZ9f6MwZԛ*נŵUj
V\A< ѽcG!22+!` aj[|C! _>W}K%?[9{:w\+
TG2#7yBd/_%v!Nlٚ!x,V'KAB?z{4XD2z)kRH {;3g_( |+9i{7xPm7i$ H@$ H@$ H' p_|61o)4f` am,χ"I ˪dONϭrE\!*-1k%9 nh;s
!@GpuG"̈́Ȳ#$: 3L'bX۱W/qDEDeaTDڕ0b}ԕkbpXuJ7fY"CDdGoGlU?a(S؛ D>!Ά+f"_٭ċsWW݄_oT(n9LRn$F %ܙH' k7n]& H@$ H@$ H@@O@B$E3: Y!}:K 8VTb2a ǵf"D68XŊV,YK Qk "B,lfP ͭ;O_5 (3oS$}Q)#ݓ{WZ7A3aclX.:`O<g:ߡ]
lXgb Bz9? vKD-aq%쐇/LU;đsuSDD?>?lnãb1+w%8߅ B- 33g>\T$ !?\r K!q݄j%j{h'/M$ H@$ H@$ H@=N !n6C SfŞoNŬL9WLqRbZżǁ8eGBD9T ?aC}MyZ&DHLYvs i3>Jo ɏ䏛?8;U=~`"f~w@|㕥ɥj:f>4moƦ .q 8 Ď wc43T/\ 5@1s/G~'ϙbp̂=q
k>qI>j);82j,V[j8HU|tk)攚6 H@$ H@$ H@$&b6'%c8م`,;4 "ľtt|$fpecܥ)Pl:Z]62Cq!,7ƒfSo# -*ތ-#fn Ƌ^
X~uògB}"Z& _@{}n j,T 3P"cDf(fn
z4e
%7_3
?ZWKc>ߚYfV4]}9-RnXO K>WoZ?PL|3xÄ{5]@uYj$ H@$ H@$ H@U`|Ct6> z1ĽFcR'fS|Yrȡ
DPYC0{3.HȜ!Ex ;b#[)hkqW;lT@=6_=ux{heX8ι(C<M90q|,|1[绰G㱴k!.e6@廴',Wf/
?/̇X!9m .3b< YՈX
"ޮ吆KY#÷)ituijZ `̬ĵ1& 7Q5s)n,4$ H@$ H@$ HV !<P,o\ ^kg)".UCٌ7 :Y| u5>CZV[MwX o
E&NS&Ì<pAHdmK!vf6nH'o, OLZ P^ٮۮTC] KA 1[y9ȕl>ɍ|L!
5Vb]<8Y1tv=(&Ǣl6~gf ̀e|?8Vp ^Nr1Lq/
ri˶
]&G$ K`5[ H`(ZʞeDarUa?_MJ@M eFZvv<zIbکcVvL?Twf[ìS[nl?WiKv͒{/eEqbR O,p81_v,Ya#c(j-H~|s6to|of Bp?a
Ǐ%x÷n>-f,Gdž㻶!F-WbfVw)[ڵHv0hns57! 9Z ۳ 3-B|T,3<\MYΑe¼e?87]Č+X3>\2/֯&>2aͰqc4e 3>4:5}c13f_UmGD,}qj!x^ ! `B.
7-! wrd$2K=;h# M$ H@ @
ܩXXNMMUofg}j۶mv;F:D`qq:{luʕrs <xڽ{ws .jΝվ}J O?e=c HwP\t:w\#vB=\_o]p|r7ǫW#5uڵRر;?9uK@J6ڙ3g-xll:tmu,}7jϟ/vGFbhڅP+nŋK={ȑ
7;K N{8܈/JZh >|Wa]z{9Av ]aH[)vKz{)<8}'Mچo 0yIs
;ٟo_Ľ1}혒=14Xn-K^ !toC!l&VnPm\[fBý 36w Djbv1KQx""3p"[]9"0/B+Xx3 Vj
536G}K :[ B]N]ƹ'gk1ުX̘]bk쐻,ը;36_" 5bw K!.4K9P: ט){pTG#>3Ûu{=-UMJՌqr2Č?ei`u4Nv,WMh$ p2Z;O4:-8[HC\Kq>?q$0 0OtPŇF.7?| /~q}6im<G:w+/| =٩}y`؝%@fĉe"KOX "o꣏>*Ww'/A ~믿^<y!$ =3Φ\$ I EC}C{Uwz#nc|<G xrH,30_e9HȀ=\i]H@6q qk"#u)/ ?~g?[wأ˴O^hQi=m2z>6__+
b)u:qqKyi&ã?+>""8!EhHxNLNNٳH7ͶG4ַJ5o`K˗/ };iC^// \vwI'nFLӅ?քu?GkݼVs5f1^r}fC|t)fe^ u.fSR/GO\[fy6c2f=
Tgb+!MJ3ܳ !1 Rփ} 2+ ՙaS]fB|]DbBBpZ+1;1;IJKչM{1fr
:?5[Mݢ3 %Cx-"mC }rxO /cO] K-lf6uwq{/f oF]č"h҇`3]^.:'Ց|pp- H@T8҉su'6s>*vqv8> KQr~9>?뻏?x H@ xFS7۵ݶo+{g:tT. _me:ً u:LȨ is[ٻݺ}eЩ[ lEg(ܻ JLf= 2c QeoY
}^z" 0SN?9g H`3T Q7\OZ4Bk^ᅩoeW_} DSgR ru?P~I\qP~+?ֳ~M?I
C<V6G=_K-B{z *}|i?QO#"rѰn8GL qe̪%Ǐםݶl;SK2A;* s*'}]n vx.>? Lەg
1 CN tÓv5aviB?%/ ~h:8_0vឆkYyc㔧P㻲#" ڥ34OķJYx*D `o"ދ[%{m%">]<ȸȗXx٫#';;BK|bK\_ 7
(pzo~|Wu!A٘;P#Sk ].zW㰚ϳlh!WTSbsC#>"|^ qʹ?mZD͊em$P:5٨u1K(RYBd/WyveK,$ N ђ_.ADGe&&&JG:|JH( BX:}اcLg`';U_7'|Ooo e':l% \#NtH
vc/I7LX-'a §;bttRa(&L#\pߘF7~~!x`,#\.9$I#F2|җT~ 1,Q 6f(p GDa7gy۟Aol7Ad\W[ m_eb^|3<+0?b'A\3?hP1hZ,Hp69EMM6}w}=+i"<N{/OU{\ %v7d↟ącY2ݔ _O<qvB'3c 7cǎzQ'?_(
yJCǏ /q|ភmXUY* {NR y Pyy < ?Oh e /X,)DFLx3Cz@hm'D8G^WZʼJ|iwONN87i8G|9? 0qm%Ίp`(Y7KJ5 ,"X><ƩyV] ߸Ysz=D [
er9~0L,c!+rxeo΄Pz=k&~/F^哉<^M9b<asc&.3sK XRL&v3f"& kZ;#F azA[j5DjV+j'+4r/-kqLcٱNjq H`KCXy#F畎1<HEo0Ȗz 7xt3y^x|h?2BA:\)2I'N 2B$q=#>1y:~.r/@! zκ!{t^ 3H` pR8t
vpGXƐ7 q& F:+B|H sNLX!"%˴I~:Nc_
Rt S#D{͏:e0U 1u^ 9}O ݜq uI I}O yn%nU{;<?ftc߱G{:Hh7`xVA=E Ì- e @6 FD gxy2(699Y#X<ibp|3)=!#f_8G?Eܓ܃GH:q Ba#d]$YO6KzL[ P҇E?+he[~v~ fcV('pQv(WOa()z0%inG'Xč>wViegeykL#Î|nsӏ>.mVOHmMI;g >0c9?p
?lYw }g]]^z-.8]w~ A 囩-[(? nr잺R p"W-goqtL%ԒdtdF
džbe l9or~SFL'7b @4 Mn% . @=DG7V41@,S=Kr 7)@D L: C-Yf@à~0+* 3ޥxBgAI
Z:t#\2f@z9cH'ّoU9:{A$5438@ ÉЉZOr@#: w:1 XAzLQqxY'? 3t t + ?'|r-m:~AH`+~eL?(gU~s_g; Qn^>e0g 10`uF-
A `~'IP@8ɛ3Cxv K!.7UpO}Ev2^LŁd; ,@{6c-UhS#\qO7)viW#\ޠ]sYhO'z^@9 *{?.h?G; ^gp?/ff NҎ` <?Z]G} Kq2z9m5l#}ifIWԻȞm@ڇAC @ IDATߍ2āxNݔFC'~ăd)qC9$'"eYYApK>v3q_6}G J;'/&&\=^h ?i'c=ܧq.$Wa rB<6r_6X@\|T:GzzG~B ) H@(9BLd t@`%63!2)d`B|`FƄx5~0 C|SLO:tLc 2{$1, '{=t$N abrKz߿ۿ43OǞ `rY.CĦCI pr t@Yz3' HR M>9o T`.i%F~ 뿖-ӹV#@yg 7(8 *tCH``n >^ .TG *s4@o. A0xLf@sIg.:u])lo ;E.~d=ṕV%@YyJ ;3EZO;!/ vqO2"oG?y
yq9//8"K8O[vF q?@ n8}J>/*fh!'u"u,gÖ)В vKaf)nw7e?D+6OLnA ?
?y _2JGO!+?҄ wY~[
qoM?62
"7232#2l= ,q!}yaL蓓:yAܷ
~g^P_d;x t@
NB@[rtH@#:w 2#Za*A-BH!ҹ}饗J M:H*e0B Yt:Zt9mh:vt&laB vt!_~6J:yp q=a53C'pb *' d c
F8Fcr8NXc ̠ gI>1/IX#F2 \ğ{ Sι@[+
~|.%D$л+m3YP`/
91i'ح?ӳ]] 6-B<i?M}a$\^
ef"/:bhϗ4v?/Hpq/"FJ7ik@PËH 4!~;u݄Mn ;g^.JahQnY&_}o4GYHqEEԤ,Kɲ~FIXFnN}K:n^t`~icxu;h }nqǖ0S^3GxM! s}A_;))<,! \'n }?6>F^H@Ln}*m H@6
:yEq6;@t|Z[l(Ӊ}{,GnqKxt:1tX r0tAcЅ}dx4Jfr\vzu?L} 'dFK n@s?3DLs
s iE+LI 8Jq7 uqu% P~a ^n d̼:);np.
ܦ=K?r[$ $PC\y_.G=@ A>k mzޥ
L C;k9L{{=<s + a1~8K7؉~ObF'L$S~A4VfΒSQBD xYcDfyZ -vpC8 @ڏڕ(a|*\) o
-˺Y>[/^_wK ~#m]p$/ q"p˿3/ӎfz f`8/ŋޔ{ˈ!~54
(+% ̈qvn% O
~K@ *Ed /(0ssEPgK'wcR@a`e gd,[tT4ӑfЅAfҡt$gXy̶#i/r
Ni=Z?NDŽV&}K
,vŋ 1Vs :^r&VsR}KYG} uFr?SP ,vvsvgu-O؊-0pCg13N`{e6#0# WO>qJ ?nSd_}$>KcJH~"R2ՋvXV) !"~2!pz iarA 1H0M^$-H<f١ݨ! iIe2DŽˋS,lZ~FD%}ДLW)"f?s
Fo)hcu}q1!{#8S$ B@v$ lr !:?tz 3H"mi~
u Rr
H3Lyk*[ytx7u@v\=^3y^ˏ&3 d |s.Š staOǙ]ݤs7k6;0J~ R1``
uYo#إN `R`z3fd$ Og4u3b 㼔E*N@G | Q#@Y#ZR5=}P m<ϱx/Y;8{<1N[CJxa7(x)yH&?y0"")3D/V]Wi'wm7CG^z2 §YsO{nAڛ<+Xr
1[HH?QCEc7v鯶w=;` <\$-jhmu{kܐK>em<3n% tm'i$ H LѡtBRZPѩd;99Yᖷc;:Kaw>xS7aAC\N#,ob褲/trE7: ^aGZ|6s=N{f&XQ0df*gRĥu Z43M{f<'JK=_/w(C })! ePs3EymZGZ: Ĥ|Ĺs0vdg` qq" 4<h}K6< 6>] /cJB/ov RqRܧ}ݎi{>8E ,͚}$38=Kw6yuapF<@~ncpO@pMd^j4gc^VHb$f&Zk`9`DŽGދ?f2Ø~=}l?opk80F@J@ ~;)G?-uW@ϟu:6_QG VQ(=$ H`u<|ㆎ +3S"oӹM% Ybv1L `SŒH?\#|:[FdR'N vx;% 1
8Pa #.LߤǽvN7V:؈G ڐ&:āo4'\'yf#ѩE,'θawr`ᗿeɏz<rd lEW+ 3иo b:9V{;A}099Y5fp/28H{ jqqRwi$ 4L@ ?#f _i{1M E:E,N];8إ-@7@./RQi s_mO2+f"-mzմy4C6qA$x8я߂F r&HڍFoB?*yQ=CmMfR$/[9G:ݶe 4_&福)/WC9A{z2ÌaA(G<'Hg݆ ;"
E)o fcHY0a|@|f y!u
Zy=@M;KO
v8rEDy _+å[@xѺ|sh\2$ K ~tiBD`@O:Ktytr/b:at^9G
v ӡ
$/BL ,5:tĿ/$" G?*a mt'
̚%Pv-96 0XBgY5OgOC8 ɵV5BaŬdQf9':ĕ;B !a* '
t_~ʠqW&Rg:J` >bzsu1B p3ý=`EC̾E垢.~=Bs{5@oils*GΡZ 5,<y i(9z;GLV!C>`x"M0 D+^bF/\<yE9_#l} ^Ң_A> m 97[I$E)S)w7!?`N P.(vv5i0kiӑ_p}F u?K^4^` K٢JK6DŽ]d?
#,SS }B̋ Ww[m3<z/Dߜ% Aߒ&ܰӌ[ݯϰ5W<ȟ'jǽM_q(< Ym8vܓğ3~Rj zךKUb~wupl,kڵzkB_b1Eq|̭ >8
A7D@S`ť+_=c t)l4m oR2Hޥ8L <40 '] pN]ڥcǀ^c
o !tX`@ ,vx3AԙI' ,""Xbwi ?1x` i!mC qC\ؑ&NGN3` ' 08Ogay8ikFaI# UlS,f0`@U1%?8g>k:tjI#2| xO>^ҸӰo2@u x :{{r=Ž){/7G 8 >u!?M:Oӛ( <gh'LMcO?rà;/}RP/'mk=
3CNua)<o)7ѹOyGϸGٯ70 Gp<m }G6m?wц ^&ާ͑;~v i֍< qKo
yKSQVny<o~
u& m4إ@>S'
̿OF6 f I{( MvKڥwcڸA9'oΏt&3Mă{Sgy}~~c~=;5g^*~g"ĕ<& Q#y60I{ 4l3;'NV#'_|%W}Jc`u[lWƹؔ9ΦE;]h5NR
VQ/_pDVb_1X<uudT!wP/P.
188tk]y}}Ulnѳs3` TV- l}ـ %ϖ=[c" ;,OHw&" 7fᗝz:xө9hH:
{tif#OOe??%{l19B8O # :a\9 (a08߬_p"' pPG: i {/%L^vfNAY ~<Ip_?_{>p/q# ufy1mg: nGZ{!]/
j8gyef#A[-Ʒ92xEZrqpqoqO`/)K/l7l0L|tsM[k<y>Nh,5#أNsm>3噏[. vӍ&@l7v9h(۴ay6N+ɴi ן#i{{ùls?f e; L Ŭ/u>V0mI u>ag{\?MF F:v-ܒYǙ>,~cpC }H6zm5P0Gy!45:7#M<SS6(#]Np#Va?➣s6>\gIX3
u%Vvc` Ɇ'/Q>Cش`[\:?o_v gB@M_lɇb[|9L~;yxslj8ޗ3<T=c?Ss zt&(wVO ] /G|; ԋCn}{UwRA5 H@? ҁb)"t0ؑh Q8;@l 0 c:qbpY:q:Yc`1= I bnKõd }Kt1N}lv n3̘q08d\D<q Fy fd?7pM#H;,ܫ# q.=E ǵfޝ$xg;(z9m H*u 8Sed=uwK`+m|s4wI#ߚ=[3Wb|%Xo٭s,D^'bT}Ȝ8>Ϫi)^c?}/ 'ǬYN¸<f7i?Q=dQn0ccܦ˵fO}5u?n(gl3wL<[rw7C,~vcC1"0ic!~՟ s7q-O03K +>"mhkSd~ȟ7Wn"0m}vY"}G/>yzr1iT6J FG^ols(K@$U;C9 Ag*
v|=Χ i?Syk/ZOX &97vq<qiv>ùSqad/N`e9ZvO^mvmvFOX/c
ff#v"f왛~jf/f,=a[fKmSNO(K拨sGVā_=龗Y6 d;
?
LU=r|;e3 o'<=Pv7SXLδ6_iĵ1z̬##աsG0oaZݒl*̮`~wj{09~pu%HX@Vz. 5$ H@]KNR;&e'orrNLn mn a]H݇vÕ$0zNo滩nG on8(?sϕ"z i`/E Ӝ|mUյqAtp?br S{-l5@g (vI@$&:M `m0gi_;RmӚ$ H@$ 7o?wAeIV>`˹2͘i$ H@]H@ 3$I@
: N8@UrxJ@$ Hwd?UޡcJ% H@
wCM7$ t CG$ H@}$`>k Hh8c^mcy$J{ڬ\w';Y5ˀyV$ H@$ H@$ -4ŕji9ؾj/6Tڃq/ήėhTqܿTZU 0} ق?(n^}ހ@ VB*v ke? ](nu= H@$ H@$ H@$ 2I[frk !ֆ~mWa/lwqoz2M hB/\P]r|'bϞ=I?|uڵjbbBm333ST{-[˗/W.]*"paRNrX$ H@$ H@$ H Cׁ0c qr0~̎E菙q "l8Yέn?@XWܮRޫ=ɓ'VvjKD3gtΝ quj( .-qO?-".Lj̴MS{wGGG#;[ H@$ H@$ H@z|P4Xt)&SO,.nGUE Sm/@%z!ݦqcX<q,S\V s!;^Z^۷0>Tm۶"ȦHK \$ H@$ H@$ H ̈́f%v k{4^v9a 堋X{%]%i+Ǝ2ro0{F͜v'hcYfbX/^XDYnVEF`;) =z̸-OVvyV$ H@$ H@z BN>]ƔsСCerzTpX4n -+:u;fX~GdO}[ ˘(J G3hW-٥@rOsP&8"-߿:{l---7--y\9ol(h$ H@$ H@$ 6f!-c,m||:vX /T h9X竗^z
&/bO ?.a >|<Ė"y̖AEhf8 ^1h6pB~2Ҿ6WK[=
7&-[H|%QY-kF K@$ H@$ H@@w`ʕ+"" ?~:rH0_կ~U&2qgf,Bm^_-f/_\;իZ:u3z葉1_9d gm^"i|HZ;]&A}fMcǎ"mpԊ$ H@$ H@$ $@ovg)ٻ[fže&""""-LqOV_WքVaoϞ= n{CY%)ތ{$p (ށ0sΕ7eYV%!I2Ljmyk$ H@$ H@$ H@@hO*O=TWs M1?{""eeYbVzd|e}˪,k'3%l wfH$ <X
Az̞L'N'?#в1ߢmuzI$ H@$ H@
ƒRgf,zbbr 2Y4v9F`eYbt5cof o"ܹ\?_! 3iF ,ho$,"-y`psi H@$ H@$ H@0`LVO?3siƣgy~~̈̂E}뭷*f2nͲ̠=}t|ڷo_u~l5$ @GYĖ ; ziypdy 7,a|@え:o*,[B7o$ H@$ H@$ fP <Xƫ-KL1b,b3gʸ5-bw]N!kǎ } ߰}wmrYq mxyN/hyl߾7eyH˛B"-o%pðCM.o!҅ ʃTX}$ H@$ H@$M ?^} _~U/2̆eIBe3c9cַʘc=VٳaGɲ̲Eo$ <\=#F <Ge+j>a9 k4=\!r p Ϟ=[ɒ H@$ H@$ H@2#K 9rzX3̏?xu""Ȳ rWƫ/}]#r{]?2#F H@ zB5bѣG˃A!-$fv*1ob-,x1ۖk.]*ݻwMM$ Mj$ H@$ H@$ H@-#8mf?ʌWf2Ɲ3js"nju3 |/
v.F6h͛H1LWf2;3ceaH˃ 4%#ن ;.(C" H@$ H@$ H@ covӟ]]b97d^fblƶ/_\ƬnO8Q] 3$"Ʒ 3W# H@@O,U˛E<xPq myĖ~1˸
q%cG# H@$ H@$ H@`<AEL~V=3eiW^yɲ#~dYn<P3l(3?s5$9@y @imکkJmu $ H@$ H@$ "4g>7߬eߕO!2+_rqLMMU'O,ڜ{G_|կ~UkG }T>#~__.C H@xzR#n%/ H@$ H@$ H@ Xz//cǎUN e 9RVFp{7Sfy=M{իW\;zh0R406 _۷o/kvJ@@g @Y& H@$ H@$ H@h B7bYxii FGG˯vW>>@"ر}'7gq ۶m+bo3 _~%q_qӕ$ H@$ H@$ Hc-adVSL GM[sʯVU_% H@$ H@$ H@mXOHmvϵW % H;띾I@$ H@$ H@$ H@@+
x^$ H@$ H@$ H@@ (vI@$ H@$ H@$ H@hE@K@$ H@$ H@$ H@0; H@$ H@$ H@$ H@(ж"y H@$ H@$ H@$ H@ &@az' H@$ H@$ H@$ HVd</ H@$ H@$ H@$ Hh; T$ H@$ H@$ H@$ "@ۊ% H@$ H@$ H@$ tm$ H@$ H@$ H@$ Vh[$ H@$ H@$ H@$ P0P$ H@$ H@$ H@$Њm+2$ H@$ H@$ H@$aťeZ#-N`yflW%orb9f1}\b1]}<,5C#x6 ?$еguM}km$ MAfSdhA^>ٯ pi <4χހ%:&R@E*z
m .lXFǜ){Az\F؊h|n4g t G^~,,,TKKKݒ4! lR;0;6ˮ$ t@sPvo=@ .|4Y4n&@@4W
Ưo``UYPJ $,Yr,s:PK̔/ ɖ3 p7
c rw#.]T1$p իWm o/ '@'_@f&|>n\2n$I h3R<XPJR"qBTAٳKw89Fͷ_5$o߾ط` gsW&DI@&$.%@}ӥee< HA@`x$ L`lll3GϸI@$ H@$ ܁@ sk^$6ڶQiQ$q67L$ H@$ H@m7i$ H@$ H@$ H@
,[?
{mOd$ H@$ H@$ H@ իW"n۶itŧjvzSLr
]&O$ H@$ H@$ &<f>.\P
V=X# {OΜ9Sٳ:vXH{3smf'q~̝nP= H@$ H@$ H@$ugϖpp aaR|p9 9f^~h'T'Nfgg&q&m#{?˗WѣGKr lM9{K<yCʹfn=w+[yx$ H@$ H@$ H@ b((CCCd ~X---4Źz
, ;v4vq_կP8K\GuѝwGvZ<11Q 9rNS|!?}"Gܹse4b̈\ڵǯFZ/nh{1M$ H@$ H@$ H@=A э"}E`cΝ;K.Uk*@RdELcl7X_g\Yqym "g?55UZ ,KOcf,3) :y]#oۙM~2kQOI̯Zpzm/i$ H@$ H@$ Hg !!!!"]xڽ{w [ [q{}"#'r7L&ݧ&of1GsG,!/?K #R0㏋PKxux{2~h{9M$ H@$ H@$ H@]E q - B+bܣ>Zf""!!!q B "n
|?h˖0YvYý<$V oYÇs┍sNr~\, D[f2|"(?,mL^b(o rSe KJB H@$ H@$ H@ ?1~\-jzDLKQ#!~+_fQ1lAyM "&oS{#緀 `| ]\ ={\G>"lzjThopO$ H@$ H@$ lijauy̕+Wn͘" "K!#i&DP{B@e+'(B+3iRSef3y t{j߾},Owfϝ;W`Y[Y Ǽ mc֤Xzwv}$ H@$ H@$ H@xX]xlID\3D8m jP B;yˌWTf*#ڞ:u,]`K:ߥMy %qY.w
[pOYB~~, |I~Wh{5M$ H@$ H@$ H@=G AG vUD356tASE<!&Tfb'&&?9="=Nj ;_!"G~6#a1۽{w@Ch{(M$ H@$ H@$ H@M 1o)1fk 1; ,i,XfҒrEe65/gr ;<q!,XW #CнvZ}3 ,5Mi7Y' H@$ H@$ H@ B3 1 LˮNx%~\_5grq;/"l6-"NjrǸn
,3j 9RXF= M3-N
nqFwGo|s+ H@$ H@$ H@IJC%m |WQh'|4=Y;+߈ef?^Xfb]38F\lgӰT1dsmgH;<<|KY[=#R( ӺCYYP(cQ qGAk,\x
.~0 -j9 H@$ H@$ H@$)hh|h(gϞP?fe
9<Xc=V {Β;v;}{-+f*'|R\,\gޤ-Oc=F5k( <XZ
Gea*o 7ME #Ȟ<yG"r-`#$ H@$ H@$ H~@ ih'h!+;XNk
e۶mkBH~$ǎ +yLWÞ={ʄF&bƏb{~Y؛!ܣ o[ߍs C$E42`kA!|-^'''K-nrk?
*
~駟."->mB%Gx̴% L- I6RF$ H@$ H@$ l "bku-p~=GqGEC{ kw&@ޡg6]p`E\h^̘E+C{m̺eRc sMs@D{
أ>ZfRYC=uTaTof"fDa
4EC!tRy ;O;vqM
=,qf*?ej7=0J@$ H@$ H@$ N@[h)MAAݤ.ض
ѣEE' D!vj7N QLRĐ/D; @ IDAT)3s hU`|f5Z/sσkkt8D= ^6@H KaD0 ,< iHLۦBI_{뭷JME,Zj$ H@$ H@$ H@ (+)q7q{p.f ;XY apntt3GUOt/ |-"*?,m߭EhSS)h3p(YݰON7iBK 3q 2yh)y, H@$ H@$ H@k h4 ~8VeR hwu?ʅ !13X=쳲h3fx_|n162\Ѷg||MaZηIZ
oqpga
ڼ-(2kEA̓|;1mBKE8 ]⠑$ H@$ H@$ H@" Z3!9Rk
wh LD[ R\Vnó>[V2
`^^.fr y Y+gR>'2O ?^q.۲Y3{;)J2k5 (odDW
3 Jen8ʛ
)H~% o F# H@$ H@$ H@:M O1E'n@^N@IM5qx06M+y#Ѭ0)X]} e731*yݜQj5 kZ) Y*KFA a[7\ ~Кn|<- H@$ H@$ H@6L 9L*kG@K"vvZH)ʶy-r̯Qz^km:%̖͌ÇGN Rٱ \{À\gYg+3e?Z W}=&L$ H@$ H@$ H@xr v
_[@O dӬٳzf^
lQYg=k)0==]]zu̾Epem! f^tE% +FR K@$ H@$ H@$ HPGlVٛ3c 9ٰ;v(Sŋ˒ &ݳd2߶0Y$ H@$ H@$ H@$znm's.@lׯWgΜ)" 8pb&-Yڵk |P0{S dK$ H@$ H@$ H@\zBe`~6̠E\EEѣE'O,K|e'''+)v:wO$ H@$ H@$ H@@O9ӕٮwʎ?8x;&_DUY-Z;ʵO?|A)Ç+f*)'. H@$ H@$ H@$ p %<Ho߾jhhdBDWDVDTDf"-/#bX8
K ;vڻwo1;;;[.D~XgG# H@$ H@$ H@$ t?hF
(+3 ݻwW;vX9ˌY
$ H@$ H@$ H@@dYך;d$ H@$ H@$ H@$ ;迓K@$ H@$ H@$ H@@g(vH@$ H@$ H@$ H@#;"҂$ H@$ H@$ H@$ P G}$ H@$ H@$ H@$pG
wD H@$ H@$ H@$ H@!0oE$ H@$ H@$ H`3XYY꿌S U{-{dK/4n KmH$ H@$ H@$ H@jff(?V^0"l85n7AkR}
K%@k$ H@$ H@$ H@]B bTR1",&Wۜ gz8?ɬj "ڇߠ% H@$ H@$ H@
7V).ہpY8~'qncUՅo2ڴ#P+#who$ H@$ H@$ H@زUjd 64 Gjq)m,r\ε&nY mF|qi%FGX: bۦ{u7J5ӡկh: H@$ H@$ H@z:8WفPZC
q~·Xq_|K B˥ a ]
mgWDg
F~ H@$ H@$ H@$ H@xh eÐ$ H@$ H@$ H@$h-$ H@$ H@$ H@ `$ H@$ H@$ H@$ (Z$ H@$ H@$ H@$ <
H@$ H@$ H@$ H@4N{'GB sͶk{纶^Rwj,n!
$p!)ҜBS{ν@>R!79ES$@ !MHhBȍlKd˒K3<-ْF\k1sM q" " " " " " " " " " " " ڼ<e[Z^%7J.G`U"jYl̺t:|NtzŖҾ>mKmiWiO]}6Ĩ%&hGy<yd_&˪\ʲ囥]ĚW|ayߣe*/RAAED@D@D@D@D@D@D@D@D@D@D@v3M@HW~>ɭL ne *ȷ%:s'y)ԲIX*?-#G+JD@D@D@D@D@D@D@D@D@D@D@v5M Q""!,2_̏x _|R :; ID@D@D@D@D@D@D@D@D@D@D _` 7iLh&5fD@D@D@D@D@D@D@D@D@D@D@D@D@vi칸<fbv P6=v!x.^sEzE 9;X[a͍V\.G@v}TKD@D@D@D@D@D@D@D@D@D@D@D@@zi9Lx? ܷ7d3L}L]fK+_^l3s 6 ~$>VcvPW" " " " " " " " " " " ".^cmz8r&(3|x]I_qkjRS<9 a"e v|ppCXXH[A~ | p ,mُȕ}yv
r"4 7'mzz6H¢"ڪ
+*.{7>_\7B.Bv}蘍O+,VUYi+.&m~nv'\W bn1f3v`UU:q,|vcܞ}R#
(S8
wAJ Eu9뗅YMk<Pc
dzW]:IǡzKv) xy `Ņށ ({$D@D@D@D@D@D@D@D@D@D@D@D XJmͱ<hƱ6Q_cmMVV]t v}
ɗ \DVV[ |?7`ƍ)zJþ5]mtt2d_ "8g抿.t Ԍxr|PM߆jt% rkCFgHXx U \Zgk >O\ fwg.ža%NJ _돀D8` {$nAؿ{c\ ͼԖl#e㓞.wjkk*\λuA;|}ԣ-
<-%ϗ%R1%bڦ\|.<lhvARVAЖeO^fCF%aKAoȥ 1p[QQf]ƒAlffEՄ(Z[V9% c&wݕkq~ð*{aO \x )9)LSv犝|ڢ}<JvlG5Zz++uIIRf/K.gg<*z_#˳6_g$-i^<wΥ^~lܹ{!ݱ_*" " " " " " " " " " " " 7g=0՞pK .CK9ޜJXAyhT zD(E q[DLb<\ o{ښPA;0xî%
Х 9vY\X夏sEoCVRLDdNysyOKy]jE.fl^L 3|&'ylu[`Uγ]-vJ\sZ=0!ЛPh%Z9r%z&JwHl~Υ0¹ݏ-Ϧ<Yu9C;7?o|l4'~ ]~5|H@t.W
_
Bv# K\biȑf\EC,S9fvBO|] b䪛^^
x+6Oe 9lC(Q>Wj cwz.|z.R7# } .12o 7 V\f.ڙs.g\i
S\ʦю i
270^ )}溽:8I9H|ܭ i_t| kOs9;uKRS5 sl7iٌvW" " " " " " " " " " " ",,(
l?+"TiBf}ò YO#;ie%]4s|_E!GZ4
}"? <64%ץBfڣ ә<uWz9 4j=M3sƬﱣЊM[ϹKa >S;bs%xxd6\7 -MkB\sW9_=%<ݱo8\k8 _NwS=쭃
3b?kϛGIn=c " " " " " " " " " " " N{TlmMG7-"/.jCZu JyUy]e:
0?_3v}~[76x:993VV.rW\OzzZ sZh#-.l!:Lt-2xy,zDcSvA;T !
إi% >s4ƞBܥk!m9X/wy*+=bz ,=q.iԘ`E] B9vQ;|c^UCzj w|ƣg g|ܽ%g<]ED@D@D@D@D@D@D@D@D@D@D@D`@\.MI9Lzknz=Iq|\yt P"j}['e=umY6t&&߮yzҐ"c\\R5##'=0~
.<
ByqI<}
X'-t!TI}ٞ>,<8r? mc >jUI' I-I $u$-߯ /]'=җAΖZw{>މhkDEK-'d*s1[_t J:|;AE"ʖ.fܵ.J2=[T墴
_6rc]4[~'Ƨ,
DMz#25[}UUUx_)O{_.ϝb3.ǃ
?ϣ]Ξq9KZcOE JR*' 㝇̅''\ey)6ӫ4یi''gV"OklǻZ&_xjND@D@D@D@D@D@D@D@D@D@D@ )m\̵xjROs<"c+=̮92VsT*mxd:]po5v
z? }[hW BSh.ӟW6ʽ ~<pI[j37|tǙ=99ϵ.^i_,gXΏ ;l]m
\ G<2Mbd.=:gR e=bzӳ!zfzc3W#>c>lE[5mlWvkLDχhŦ*k<XQV Kvh-*ru pyy bc 葴5Vf ^'7߁ym==2Vk^mMO $.(hXBg|XsVnYðGLM| e'25`_x U*p()G[S('mĬRE.n=z+GUۍ>ʡ-: 5Vn CGmw"g;CZp! z#A} MEɍRED@D@D@D@D@D@D@D@D@D@D` u7{jk<@+.ņ2D23?<u!ȳ"L<ejvmj Q;6>cSS.
<֣[g+։mA"kfBcC]]1)"_>7Q6`W\s鐏57eشRJzdR)6t3DfY>9{9p9O /lº`-ɾb>1Y89g4٣.ˋÏ~׃= 7V&
DaL)dՖdX s{\VZZl7Ǧlxx
=6,k)vI:R!76[sc؍voSҦ烝kࢯqdHim^w60t軤ZHs Źѓ M]6tmʘ+w1hUa,aҺ* o/X3ClWy:vHuxƂe _Qg˜B9WBe%Lj|eeo
O)ߎ\.+sEŅ.?ׯ{NwJcc|Gŏ( 47}E;tvm"6d/ r1,a #" " " " " " " " " " & ef\|V\ i=5펠 QK2'&kqaut "&^N\˾o6YIq?OM q{=O%Eֆ- r,{diqq<.֖ 髷wuL6몭Byޜ~ȴs_y畫 5){#d ;㩎| +]>~պHkR>7
LpyGM usVm
z/AHoA?QOSp***WeA|+ncccv%%t555>wͺXO?Z"t5ƈ~G <xp5zw=m@n</M
hI
ѬV3dt+[S>l-, ~(ͣ]- [esȴKc_YQ#FSv@ltd"̉JR4u5UAƑ{ۣ]=v -j&\ʖ \ξ+XIa 9rǖ c?{ea3/^ k :d'|V< =}V28MVD,'v
b¥vwg y 9\7CLI!ō_.^Dĺl^v ѷLjw6 s 9o]ڥߘ^9RD@D@D@D@D@D@D@D@D@D@D#*j]\+QEc.oxTܘ cKKJlɣYa~pB+*pvkg$kjC ٲ E.~Cؑ/Ic{|lvS>ʲ}s)t0_jb6wq
|ܴmՂGKMw晋9j2Dm~~{tw; y>W\fg.ܖ5y> "ڍ:lkk/5wqn|$g-{DDv2w`}먻6oE-_haYq75*\R}PB{l,.nKr%mq -E@D@D@D@D@D@D@D@D@D@D@ щ.e SV=/% { |c| 'vIZPNM'nQ㠰=π
52o}тC(
'S6>9.|9cۢc> t>O9VZ킐-8dg/y3^ hv5oEv%{#] sa-@f:WvHna;DILUA[egGRJt*: a{ʕPavOOhV>_y}n[ˏyNUA/qcM[ǜHZo1㓤!C[X{`/˵v^v Ej%zd>siwxt#Q3u Hqsהyx0>s6A9F ] )+K-]s{etII;| {-{KJo#µwUj2+YO9 &u/^겍HVD(I3deX"l)ɰu/#|OD#GB͛7ƍAFAK{VQ{웱̄v﨤" " " " " " " " " " " " x²Mxl]UZ۷S< q"Ksyz9Ԭْ"nkr$TN mL?4j)̻{}tVιu__l$)ѨOHSD,QHd!ʖQT)RaB=<|rG
U+RjkkCOݑc_/>wKD > rzZ~&q!zَ;bE!18D 9{ u9;K"gG<%s!_R4H>GrSCu+6vi2= xX֖z_{#Vv]D"E\E"7\A#aE"MIW|Cq,>/ht,lEVTTG۬Cƹco2.)g۲^'r;WE@D@D@D@D@D@D@D@D@D@D@D`?ҝJYI<>k~Fcg=rvY ?=˭B-DtÁ{,svufpR룓\O+kk9s'@d7K>K#0,++ Ea?"icd+K-۠n|iaˋȤ#,QfD@D@D@D@D@D@D@D@D@D@D@D`7Hy[avMelssK6zsʦ<6Y_YRRh]
HaZX瑴U5+$-nk)pش57Y~D0v[ |HQ*ѲQ.(3D4l0ol|i9>yC }H\J }le1=HWD@D@D@D@D@D@D@D@D@D@D@v3,e#F[Xkn&{XU疳(i G5 ɬoʷzJ
82r DiS tqNd*] 6%ٗ8-ii4ĤZ>wjvڮ" " " " " " " " " " " " 6˽y|*mnUr(Zm?wUUevGκ]v
<sӁjm
\Ц쑣VWk cjWuӒ=Kb ԄHS$LxQB-/Rlll
zP2g*팍 9bmmm 抍s&犥>(4f,7RbGuE@D@D@D@D@D@D@D@D@D@D@D`yvcܷh#z8vjGxʲR+).x( l*++-reV[]g,*A\"?Ik\SSS644htj-BK])u!Mr]v-D-ʕm̥%]+WExOݑ D}Vh}dҘu*" " " " " " " " " " " " Z*H~op&6Q6 i JwO[3k% ZT_alv
=qmuq;X04#AO"tHW$E !Jt+iYO}RJd,:ڍ6M˺jhy<A$.7$*˗;HY-/-Q!2m& }IL kmmNN ut
uv}֮NIKCUuvJK> ~A=hnxг2 <-w*Ѿ K%K
GQ"FKKKC}-"uHR"lѰ---AKZeS|Eƒ.B:d"dYO$,c` rDV Bq(*" " " " " " " " " " " " EJc1;nQ_UVZ~ֺ<lkk_UWW$+dEEn"?)uʂ̍E"5H}GDe=풺=_K-}ERuW"Zq:Wggg #gY/B8ǪuQ>SVd9@-g$hCiA"]y!4)˸. Zy%5^\ l7G}LdlԏuY>mfڢ~^v }N !v[zQoi'j|]$hׅigU4n3n'. dF\&[>K" " " " " " " " " " " "HycIݻjl ͠6D@D@D@D@D@D@D@D@D@D@D@D@D@D` $hIUD@D@D@D@D@D@D@D@D@D@D@D@D@D`3HnE!" " " " " " " " " " " " " AH"" " " " " " " " " " " " " A`3Q" " " &l ᵲr TCD@D@D@@^^ZqqR]} ." " " " " "$h v!k%iuulmQQZCCUTTlE7jSD@D@D@D@D@D> H'8&" " %099iAVVVZMMww
G`611a/_fP," " " " " "u$hZΘt:mMMM!`AA٢"" " " [A A[^^ ^ 288ޓXED@D@D@D@D@D` Hn9D@D@01yPJ,sIᓮCm& 8 IA{p D@D@D` Z9Hm\XXhD"hUD@D@D@D`+ 0=s1 <$hqR-0"Wfgg0> " " " D7 5*" " " " " "A4Ֆd@SgmG21kt:eaPx/lID@D@D 7y@]D@D@D@D@D@6&Us" " " " " " " " " " " " " " ڵhl2 MD@D@D@D@D@D@D@D@D@D@D@D@D@D`-km+++k}""` =adɷS'K|f&6Meӂ 4tF U_ۦ˖K9ͻe[>zaO}6!&hqP)+W*? [ ǣ>E`|'VB4+ԲxKM[_.m
my)mydK[ZBN~"" " " " " " " " " " " "{ l Vd"-90ѳ7e9z 3SԽ%bS9Je]H3fKf:$k I xħT*en ,HGS|
<|\Pp? ,7*B`ffFGGJKK><=`jjV'r`TD@D@D@D@D@D@D@D@D`}jb}M }
a|f=zWI;88hmnnnMi겗%VRR"coիW\¯{묭ͽ:ن}.]dj{ꩧƍ//6== ?VYY
U"FFFZ[[!OΝ;g o~Y? znC _?='x"aC&evG '"; \vǬ쿞12{/y^h4jE2NNN& .ؘZ"gϟ? h_ء]f===4Ω^WF!q611-Ry %&pԩ c[Q~ m= +p.ѵHV7G
?zuuwv]D@D@D@D@D@D@D@D@D`9B#+}f?mА٤/2 7__ofeME)KTkmmj^Oo_e G ydNv[>G92Uo7~ H\ij73)c\={ֈGG ÇH ax
Mn@ 9rLR'?;yQA#QDIuz">f!-(HǏG9}MT|UUUSHf0<qjtlr'0~ ~{_5'>a R} D\?hr`wʕp q$s^;::=-ܮ" " " " " " " " " ;</@.30G͔G=g^Ys933$-oyKNT$u/fE m ;-f`` D
---Alu79B/ݼy3iNAtK_dOww"KDq\hf\ mĺ C2e)K\q m: ll) }"H4 T版 /s}Cl~;"z96a 3϶d;k NY~!4:
}13LH˵H]xk^c+b9̙3FT8ac _B8lg, ~rwE˿ D9O&5?x|g8 >p !kØi[d17ɞt <566~uqp - V Ї//yBBoj9O~AS?\c ^\?ѼXw9>YD`\w+fiڸ2ݵE ~u U!,D!Cl"2 #P!H A[?}; Ia8k%k_ZD
↺F.?Ab!ʤ . x!@7q?xKⒺ /c`nY"">%y%łlF0iVAj?sΑ)a,%z!M=q t h<.~Gzd22p0
) [.vaa089~d%'<d~T+_J^ʵ II86H# _C.%WA~S
L\O~A~s c/Bۜ߫FDsL\פ:я~S~o$>9'}f"[96u{{{n u A"r/߷X`ϵŵ cqs!lg~&Zc"Yr^7,DlNN6-E@D@D@D@D@D@D@D@D@v6 ڝ}~4:$g_ͺOzKٷ'k>
JAd+r"H@ B)ncA"RV$erBA/}"iٟ:$\{6BP#1D1*? E 1.JLe[<vd
D|
:bܹ
X ǃtc|FPGά%F/c}_
W~ :o~WIѹ[
b|ePÌLD*Q'y - @^&BN5_5 @ IDAT.kKk GZ"9w:<.E5N{AۈTƝK.Fn~;vF}gSL:f> 76RyO+ {y˘y9ks\[|W,{wyKqv [V8ZMΏ3 *?x{~@A>l$%Xq1ƶ$hwD@ 2\54կ5{]E H!"HA hLG$CB"
)/}KC"
قt
H F CVC"Ef2F""NB!jx/Q.EТ.+^H7"H{ED HEF%mxI 8vƀ e!q# Z(Y8qܰ=Q%Ѿz# }WФ%f1Xe/{YXO~睾䘹noxBdi!9'k=Dpr&yMi+rIy /~w¼֘ɴÏ(:mq~TÜ#"8^*g1 Cl ۸(1wLWʾ/ics2f(+Po j$aB}V"k5ۿ
__
:i# HH(WKG@v3X7OjSOg\qIm w $ q=K e=bidT#!8-b"}AHW$
mHRҝ"
n\E&! )#K$0D~C */be܌cA~"$z~&؎ L$'}(Y8^ ُqYǒD2N
ǏG.lҤ \36RrqSN>x M$ ]q N\2Nd+"Hu &y<tO[D"?pmsN;W{ĵ@\\o< IXhx '?> z7Wr?.Ïg;{e.pߚ0&pm(h\W!uþg|D ST|*~1>я{>}1]Qڢ=cO" " " " " " " " <iϼ<㸽mIo?XP";zf@F6fPT" saĊɂA R(AE o_ ̿D$9 %FhRl= ҅H>"nNQf6؏~VL0%}>H1|G~ه 2>i7ZvxE!{D6c HR"v?r9 ÑwH'z$bԉ} ~>ӟt̾+
#K?ҏuG qOJ^5[,ÙRp p|i
"6ʽxB*tϑ.g-pqDrMp=SANd Xsx8w\& cd_&r7zى8nD s\jv+YDGP
:1?u=&4mq<}c>ÖB*iǓm'Ǚ" " " " " " " &$I<8#gK\$? xf,2r%#<e uCY^8y?Ko? q2:+ߣy*}f , C(^:D-cx bC
H SXM$̟I (Xؗ?\E
!hcQA>Lډa%UYC A<~B:nxg# Kr|q]\RW<N/s"o>#zwcJ|86 :a@=X? 7CM,m%\ӈMAR~#o29d{cLng=%}{eT3<'߿x sf<
}3\ ?;B ?wx묵 (ת" " " " " " " V̟ypƴ?IЃ0Eޝ+$S\7z!*3ϕs@f0XC1n f "vD@v< 7da8W+I(>$U+(RQf(h؏y%zvQ%z M{HQ#HUK.BIa HY{A1,R}zuhcsGGG#~sRc!r~}ꩧ#Z3L]k c^Oxz$-}'Q]{#Ǿqlu Y,D3_?=yOuj8NYyy1?|@~>Ant,:!c=sm^ 8/G<2k(`'c"b.̣K+w=.D2sv7mϧ>)} E-O$V~k^z7zǡ" " " " " " " {@f~~?o<K{+܃ϩT 2C&v}\<7,-z'<ٌ"AՆ!@|?0z 뉔C|!(D !kL۠$ E萖M,$HORW,D "H L*F.!xw3a '?C!?BE*\bDXkI-cM& mQ?Tp@"haM%=#HYLM0yv%oypna;.x=og $??wppxӛd{Bl3/sֹw?I(rرcbƈz$&\)>ZklqiD"^U
BVY=;whߏ|dcçO?\?c <
Zq7}M]E@D@D@D@D@D@D@Lgf>K\j++Z~|1*ER툀C">P퉐D1O$&FfG`>r#M^9H]A"whHYP/}KA</(6dq X)a1 -?IC>D"}6т'N±Gl9rI˘ub, /!<#cD #ɐ^Q!O:x"6,n)gR֘c#jo}k;%k}{#z)a9k(ٗk(o!F
cx¹M|^i;9no|2Q?(dHq̍K*q"a? R|[
9~IW >TED@D@D@D@D@D@D@v"s8Srܛo?}<1K>(A/"+ 0 B^نD F!H)H1+_5c_Gc"VYGA,!H$#2 !< ۈCF1~gHz"q|_-?AuB.#ɐQ U_U!q961)sLḩD.cϾ<<H(k?Y"S0n>O<g QH10 xIKgÊhqm?q[ ?^`$jI-9&bk-
sr#}`G}#m#1F11BB2 ;c }7,}mp Jt,>i+>Cxqr&9 b -E@D@D@D@D@D@D@D@D@. ڽ{nud" OHL!GzX C"{1JZT bqD R(Xֱ:}HSDB$jo!ØB6(G@;DGH;
tx.4 #2F$$y-Bc dѥD\d5F #H'eQa9b sLg
b\ox9w< #>R9~9WHZvx0ɱcLx;u9'=3WWZ.Dw"I7 1W("BHq |qN(DK#>|2|;Ar}P+kxF=\DqEJ4;s(7b 7pFzd={ x.TJ'Ft'V-m<^Ϊ(" " " " " " " " "$hh " [M P O tQx |A "Q #.XvqEyG$dd<LH>"}! ;dDbd\c ޣ-9)O a G_q,m!xKrG")pmIᘑD?xN
u {zz^4j1 99G~!e6 \ED>SEe? fT'Q+_JQyH{W" ߙ3gBa2Òm#yopA
ٯ}k!11X5
w2RZ.q9gD3]z% Apy?po<M "grR w$5FƐk 韶[/9H'.{m}}k>RtB?D努%bg=cfƖk|kvsmd=mg'.4-KY X G
"}'>d6"$noxξs~hݤ&/bIM{s#W!u3s9QFPI_ 4)x;BO2SHL pƇ ? \}s2.~8ADْh_ H\ 1O߹
6i?Q8DfvND@D@D@D@D@D@D@D@D`g1F DQ.D9!4Q6[.uV "(wvCf"xxM<u[qm(+PJU)k"t%
ڏ~.i;</y/HI/ %̉Ї>$*{59K3Ѻq }0T߇d ƈ %ٳgCt*/}i~ @0IVMH-Qe
c,}ӟL-" |шYxd7ǂwkooB'O0 7)ݨÿمsJ ~ÿ C?ǖ>L; s`2e2HZ A8kGGGCg fpzɇ< 2YC8cDkädN\;HtWL1~<5) i#q 2 6g?]擌rR"UD@D`?@V^{i LG>HTM ^ߒ^oܓ/>|-mbZwvגA [O(9bw,X?3ғq'ĿW});ZmB^8xb:㗼%<!sI'χ}HÝL ِvo}k7<y1.Z$nRD@D@D@D@D@D@D@D@D`ݹ掑]zz{{0jyLzH()&y;RP $LJٗDݸq#\ Ee-12.B//9ь㴝LW6GFFش"" RF SܷS Kf%}Ŷ72n{P)GG![nQHZRU
6[FÍ̿\4\L}~:_16!3}+mdɃbt<$FH%ҕh<>p_x< q|!K$.)1*Y%BX P#pI I;\(#mia L4&B K4N `i?؏{ Vnm#T|uX2o/FX\'6m߲ngR5g z," " " " " " " " "{pw Ǟ -ѥY$xDЗA,0iK-P1 ly( "zY3 ]]]!&ERֈWX XH|?x*?kG"HC@k(D.A// Jd->qxXo'{e/YJ{5<< I}pE1B#!vh!7FEK-uC(qQ!CNZ@nX%
2k R3J[=[,l#ّ9EC.BHJ==\` 3KHXme.]朥 rim]Ƭ"" " " " " " " " " " " "~ؕe1 W7>w[ uDl}JD)R|M-W)3)2JE": r6F&X0Q,!Pa"sAlOllB9/m /_i%qnOE@D@D@D@D@D@D@D@D@D@D@D`c1k-]Wljf. Ç08{
[B@vKnn|!BׯU"PDEn@^Q\%J J*dA"_){d.K^N\%.c >Ƙc}.2u"" " " " " " " " " " " {g=Ev9?V2,c=WV،;c VR\"kk}^j{fַgpP\xF#taa!Jjah%a%5υD=qD BgϞB+ Hi288R
q~ i Kq *f+Y%3gB.ْ^YED@D@D@D@D@D@D@D@D@D@D`ٯt }s'>^ ?NrU/ӗ Kvupؽ͘-m<mqKAki:95!
\3cS^+,(V+}7 -1x:儛qOZxg Fi%hw.Qf8k%i{ܹe'_/ ۑJlC:| xO /y.Y m%m3.R'Sb㸝%ǔ>D yn3y u={ž3|h >>Z@&5h#qFFN
d %Yov а695e#wRZ\dVw^p'/J;z՞;qsANN n͍>}fe
Wr;<R<o*fZ|5-eZ EvE|%2\qQnT Yk=6 9r$U}!KҽqFIrcd<Qe,_c{L̍2|I]#@3
K :;;x S
ի9 E0ٓO>;| pر^\"x+CG*B[Û j)8JVNmeُcMLjkj
u.kݲ3.`Ϝle} 9an_셞 65<Ź>sG Y_굸C㺙^ ϳ=I+A+a
7S~/)1fDiMpG7n+)cnl"JA"[ʁM_\xю ? nq ,٧_ġlq{l;.7~RD@v3utogQcK ߐh4rY?K544gO&/#3sz F
RM>*++ Y~-adՌ%ۣǁo {']tRZUUe/_ 0# F2ψvs'/M/,y<k:Pg Lي:}Y;y?O>r,HG{.H#mdX|#g?u.
¢Y 6%"
9{%}!:ϥ/Ҳ H" 'm* 7"ӧ/ER"V7)ܜr7
0{nU$?7Gniflmmm9S >B{ R T{u " " " OAxE
:A qE) gQ
3~*AXP 0 hJ-c>>g_J]L{DRp ؏\,%'NGDp 82^ vttXKK&unD-"mıeLͱG l ? .gv/Ѭn; ,]Dl^h(er 琴~8 -cἯUg<6)T_cI/=v
ovhHqW"܈DW"`͌$78)LI
pMvrrc}nfqCoܬCHZR-#i R!nV./ rG6/UD@D@D@Da/qg*" " " " y3K Ѧ 3|D(Y3 > |AaQB.Y%)o<#<c 3τ im&B "j HggE<xc) vG"H3G= GhG-{* A8q*+<R\] imS8?wUmϝg픏+6s1!V;y J>/%$qRY7Jnbx/M1rs.ܴ1<y2=uه,}g/M};::' c(&7\mG;eQN?'{&lxߍ< k-0Ƣ>D@D@D@D@ >θC#y ,A_6!<Ϝ9s|? \!EFYJ.m ߪ<3#gP! x Dν>{i995 k=.zۇfbUkn9n=5v~y9sc
]ךc I{!E[=r.<rGΞAκl0] nNtY<` m> J$7%.VntSf7I~KF:>#Yc'mR?RArd}rq|q\pUWD@D`7IRa<w1h" " " jD9D 쮣hE@D@D@D@ g<{;[}<Xs+ۨXjwfvϡܴ<KѣGC;qPqD87D}!x~_ '㥍<bY{.zGUuZMUeHA|{#={ca,}OϜ=c%r!د+bg} r#g{ `wW=vˈ+rmiTeXXr]'Zg&=:k=w6MD@@cę/%0V X<8!VV" " " "s *ys(.$%yB q?)l|
I4E+G*>ُb?$T l#Ќ([h\_x1cו+WB[+ ³bh Ԟ<[=hA$mC]=y%[վAOw|bn:Z[lίsv%9[qOi|X_{L>3mnI@D`?~ a~ *" " " "ۃU큨6
jSD@D@D@v.&B4Efa "Qy`eD< !b|&1")-KR#Ye م>b?mK~
Z[[E:r䈝;w.A fYGd/.☒}Ji&r@>>UVYOLjd0pn z$m^*ψ]J/ْG^1jS>_ 9{٦"F+/+q9n ;be.gR Qv}#u<" " ; 0Ic 9P
JD@D@D`]r @D@D@D@D`C;OLDd".HEߋ%6JyR"hB-yE,}'H:%vI-HZc]3"wll,lXf,F..0ǧp)#ăL 4r^Qloɤ^^ Ѫyy>MfqI.7-#i86ߧeRe{$KpzZ9[阏uىV摳dW<g:(]L P4t H I,yС 2' @gUE7s1e)4֑_Vbސ.D"c .ʣs oَYgެDfًm~qEie.;bE 4>o)O?R5շ{x$]rIG) Cx5fr%3ѳ垚yـ[v+:-" " " " " " " " " " " 5 YMQC9]c7isipBld% dϲ
zgYeYVV3O.|
/qc2̭qQEBԴ
]Ő:8y*?eG=
D V\oKW}t5d~3+>'_+IkLsJޜD$#A" " " " " " " " " " " " }E"B Fd"WQdR0wl[[[H-L˗/vh
iA"H)HRk-h˾N
r+~)|Ͱg-XD0㥰tDqU&
{?2,<epV{ QDf ?e;Eu8S?wˌ>T:\oe%V"k׳w"+|;*{pD@D@D@D@D@D@D@D@D@D@D@/()s΅S$ D& s"HblCQzDΒ^ ѭ b =A cKޗi<xψZ/)s%xGZwG=vӽ슝>{fo.."g]2`}CǓ,~mjzz.^q[b55NK%hԱkM U"[HL*ѳ1%D"M+**%bG
Q[!uNzdU)K}ں$EƘZɓ'_ml!
1!9.^{,=-
R 9sv[~^={'H'<rx7;Ke\bg.Pi)?L?GnON-V7D CI JZ&X^HZ&%FR7J[:HQD,r6l?cIDRh#Wa=zú9> ՍM^{}:NNs-v+="k<9ם5c?c>}Ku"gM
6h}]ʦZsI;|Ӟ]%ty ڽvFu<" " " " " " " " " " " @Q`"hfk(b >q}-W{>q?$1nmmrz.idu`Gs}v"rv&Y.Ң q<;`y+,Rv#iGFÂB;ҐcVv'~4&IK~^]O٪;qL[uKv͑8Ep/X]Mު]$G˞~gV^VOx:把r(Kۓ'|gwȖKA^ ?pw/9Z l!u {攧vZ
O?]Y^l^Dyggg=ͬY6+*} c7)O\__m8b+n x$;DҎٳzþmHL
-К}hՑ@M\M?{ dWR iFF(gm$ K &8`
ʔcgvp)S6lbXQ9g(MQ ]ݑf; O9O9pIdYVWUu-U jZsvˮq߾,#: 'EBq<S&M+, aiٖ( ihϬCM3kڀih 7$ H@$ H@$ H@ 5¹({iه}m<{.s6q xxmX`nXrq6v !Cuu w`hmi
-ÚO<)\hjg5is$ H@$ H@$ H@$ D T>xx\8zd,aB^;,,ͮZ %Ri'O 7XfOڍ2f&S±'H h$ H@$ H@$ H@h:~x055we k<rpګ&5iS'E* uSÆE+
-`% H@$ H@$ H@$N {V=uJjq!C;¨Q#%"&q%aÖуxHi٢0~Jbho(~$ H@$ H@$ H@KHgΆCiDZC8p"jz6\2MƎ F F5t}yiEO#G-a#C۷$ H@$ H@$ H@$pV
I !]{Ç^dB m Ξ? &N Fua{*L0Ǐn!wm,+eb-~kkkhni CZx -|/H ?vMS?-G9G675)}9o]Y{# H@$ H@$ H@>CT9{xbF 'ץ`˗Ln)WNeFUY+h;EVM%u qGlDu+F0$ H@$ H@$ H`` ƌ -杏\=$Eax o<jHo7CZ# :*~lk Ķ
/3B#ĸ--UaHuKhZ ɏUCCUt&AUtnڀ$ H@$ H@$ H@DK- Q>=lzpWL-fwn%0 dq/ ߓ|5 g!3A. H@$ H@$ H@uҨ*$ H@$ H@$ H@$ M@vp_G/ H@$ H@$ H@$ "^mS$ H@$ H@$ H@&@;$ H@$ H@$ H@zm/¶) H@$ H@$ H@$ H`pP K@$ H@$ H@$ H@H@a۔$ H@$ H@$ H@$0 (% H@$ H@$ H@$ ^$@ۋmJ$ H@$ H@$ H@hw$ H@$ H@$ H@@/PE6% H@$ H@$ H@$ nՃ{^$ H@$ H@$ ,ϟgΜ gϞ
UUU& 2$WWWwsyĹZ[[0vܹ0dMmmmݬy|$ H@$ H@$ H@@Yr||8W<Oukcԃ]# H@$ H@$ H@ ÇO <`-C͞Km(Kѝ~Q9y 6,ɂu輝MMM+A[ ڐ$ H@$ H@$ H@@^sWq`] s%ڮs$ H@$ H@$ H@$ "`;S˹_L>O+\\|X>+Ϲ$ H@$ H@$ H@@&@O &x8q" ;v,?>Ł 1bD?~|=zt͖+z#GLKƔ=jԨ..vM%q5'^=}멋sΥ444qQ17.Зn ¹m$ H@$ H@$ H@h) Q
a۶mСC9y0w$rwѰ~tnI$-
6lHv,YBI ݽ{wػwoQ,XfϞ],Rvii68kd11bF yX6`$ H@$ H@$ H@)~p5o ۗz;v$j" 9r$߿?x"z"_.ԔPYϞ=Vp uʔ)aŢe)O=`8ٓlϺ_!>:u* <x0y.]43}3% H@$ H@$ H@$ (IbDXD3ftxx艀I(M'OLB*}@h=~xKnx"22/YX<gIxRvkjj۔% H@N @ IDAT$ H@$ H@$' 7ɮ٩L OTBq=XMIx"Rכqd1F8e}&W.
S(cB3>h;}tL[OnS$ H@$ H@$ H@@%@g/ #d1^y٢xr0aK*R\TkiӦS}#vG |wԨQim֬<bsZiԞ$ H@$ H@$ H@K qܗF N+x5ZǏ XLP'NϢ+>9)/
!9B*#θqR}쐇p'o^[nK9q65.-O#mX$ H@$ H@$ H@}m_5_,XvN8NZjED$ Iѣ/(kKEA|P<ts(c<r6 >$|+$ H@$ H@$ H@:++e}0x<y2}Ο? 444$ڥKv9F|EX9sf-7bk1!bvJd>vg9֒b0yEE{}ZVוWy H@$ H@$ H@$0 < f}c
}:\x)ˇ쑊PV+^cƌGhcZbB%1blN|9ie˖o,Ԟ9s&yf omEWoi i2sk$ H@$ H@$ H@^q)w|S1|X
zPq2ݻShaVB #dvLjiӦAZ9C<NQ<%O1q DxR>,,".^ZfmZDẺT_l Smsȧ|dz2a$ H@$ H@$ H@"C{ƶ{©Ƴaʤaa0v̥}g_ m_:o| )h*&[PAHĖ
uYtɒ%c7۠;w&]cTYRQ 1؊/kfO_ʲ.v
Ƌ6w+ H@$ H@$ H@@d-mwS[Z/.-nK\^ʕWVr|{t1EaXmM^?vdxc57G53g ø ikS);eh{u^
cǎMܔǎ K"i%|-b6[LhoڴiI`œ!/\1*W =I1cF aÆ0o$bxݻ7C t g$ H@$ H@$ H{gwZYR; }-De9=lT-t>$16/D?wG4j+-slHCI^ :X
mу܅ eRFxaaѝ|ég #G ץc=3hk
cGLswї*soӧOOޥ7oNb,J>^PM4)2D~X] jE0,Ξ=;Co91)# Xn ~Ǔ$6bĈ2G$ H@$ H@$ .`>?GdIA.;3FG&g,KMd= Ų! ݡYCCC)G /zH38} 0rT };Å0MrWJu}rR n1a᩵[B-m
G$^vwϡ
;x$lٶ;.96,[4EZ}ODzOK1(vw =]^ _}~H"]Pˏ (3q$ - <~4Q E$." ڳK + xM^ا<2?G~<)uvvT$ H@$ H@$ H@ ,yyD GEଯO)sީ,Y~PL#2wyRyZ 2 !O_Ν;7ّvs86gѢEb~KKz1z7Yuj(SG
}ٍ[aaղEa3분FE6j<LiwhXq{8xhq!<+uÓ6uh6ki~Uq-ޠ\6LaaW~d)o]+o' ~里 ď%o馎2-ru
v
o>!͏'}utmyKP/q< #I,8p+ H@$ H@$ H@@y̱#=NV8weZF= 3;[1gOKs ǫ\s'#Qހ&mQ&EE,H L6'B'_hh
AP&vh7zT>cRȨ;zk> }QBoK8}A[)k"t Nge
O
[vzr 6`^hn<i#
'38a5ays ՝++T ?x`Ó_8> 8~r*W bT>9ùR~,F>O1 abS.J@$ H@$ H@$P s٣+Mg~ΝIe Mx"~q<@KٜEy9W+!i-Sюf 6gΜ$c6;zE!'} Y_}KTN<lyss_ӖcK kmE4z*s0 ZH;6:E9fDJQ##\녴(nڶ+!,Y.Җ/vkOg7m
{ l\߸U6njݛ6[~vR֕ԕ/pWʔk\ZNiޕ@˵Ujc H@$ H@$ H@#<;.Ɯ<"'[WZ#⁊'ٳ;8#X{]{Mfh5(M6.]mًMqs9hcʑȧ߹y\c ' 6' =hGq6z:'I47ҜOo](L:Gp=F0ˣ,b-;xƳaC\~.[<7ϥׇ#
'},c015i0PjK@߯ } ӡI@$ H@$ H@*N ڳ-
#r"|%!"8>vRY{DPB
xavHc}Yld.b+e˘>supkCxzm8ۂ=3gυ 13(V Q#(Ҷm;H Bz̍k&!
⚳^ =W.vBݽfho(~$ H@$ H@$ H@'ȊW,"!"fa#ʲ,&*.\i/ueAX\1:{آ8hѢC.e "+ݻ:#qI:^dQni Q %lHFIƅ{al6= #Ge C Dsxƾ59wqMڡaA}]Dɸv aC0~LX>̛=p<g3{L$ >H q}vI$ H@$ H@:L% 9r$ 'NH , )I85kV@o߾$!+"ƒD F,E>}zL&ehz9q<>$`Y /cDfz ۷oO"-/ul;mc73XxMל-zζlNn]8̘:9r :V, j+Ϟ|Tc\cvGbDOs^{fcϾ,aU<alX|a=#<g{Պmo H@ m;<<̙3'=n$ H@$ H@$0 T⹚WL㓅[0zf|!Y;|89Q#"愀zС$آ8˕n߳g&qyM\6xR<ƅw-4 ay' 8!#1,kN:)^0۪̌(zkL\H[Gω!cI{6m1tqcc{g7vӅl/54>z..Tx_gZwߥJzn;w a]܍bŊ( .'C
C˗/ f0G$ H@$ H`0@LE< 5jTSGīcB9;[DXCDe
q˞/-' ii\EXO{Iل3xbH/^$8P[nM9r@oq jO E,&O7GiS& Ξc(aM7#dtO^ /"mp F q\زsO_8;t01a^>̞5=q9[Yn uօ G o[ T>c)[zsM HXf̘.\@箒 $ H@$ H@ Ô0ĈIhEleތyFZbbG#v",!yy[EOUN&L$qI ^T^'ųƓrúx2&DdbbX OFكFȧdӣ({уvbdwS°(zzy<iXpswDפԆlF, ١UaRgW.[̜z -L /~!-ܒ ? ^< mܸ1))%1၄xPC oPo`u̙OHeD #acގ>6 wBYٲ X$b6)G{<,Ht<6$ H@$ H@$ @:ڲG+ެ̥!2WF9(d^<G >>sDleܜ u\\9,e8-}"1'-`q"2F֨e;ke 8b0uJ]Cm?F/ڦ xv=jDX<v/pMzipvkk.3ж
: Hx{;ė/|aj7ömRz* < >)/"-uVZn5kքM6%NАBÃ٭ޚ ֮] 8 |xXZzu 2C;?xzX⡉^!#ڜ4iR# 8ϛvϢ2u#H<J$b!>c x1 Fc:8a90 x@dɒ IcYrezK$ H@$ H@9sn8I03; $>Yn
b>B:aGcvO;טc^;{ <ە<ω,s2? }mslhmk &Z xfS8vDk 1,fLiQE-Md.-#t5gϜ
-%1皢|pBS9b8|U+W~H@ oy!p [;<I;H<4Ƀk"S|ᡆxۓ 1b0uZi{ͲC$5桇oQa ]ޤ7ڲm^hlEgk8 ; oxRDg}6=j9oۈψ˄D ytnѢE)C=[Z :y3I@$ H@$ H`NC漘ˎ1gΜ4w|\JG #cΌ$ݨObp`N:9qRn/ŖO^捹bK."-7ΓϼyR
5Emª ¬CxMZT)q勢Hלk)v~g\7U9_Ӳ}0&,7;^o_J@[)ڑ$p x@H$`CQEѐ}<@YO2< F"'yx!$ HCoy{'?IJ.>-S˛g$6(<|~Qvy;
63[uw/e<! #/<]aYO>`>a7 {<&AH> rX ބ~F M$ H@$ H@H6mZr 8{0cEN2׆CEgN9=;>sh!. ء nT+C$_n q5 czsO_ä_vg?]zHC{UKnԨqǟjքV.Ha;ӿ1# =v2۴-w(cYs6êkbִ-c9k7l¢OځzMhoh.!CÃF
\>9!nٲswygzK
nZat)t u͛f}_?l9Uywb>v+ ӟ4y2 7%?a
L<<-]tix^ %$1*ôZwuW; r/~/})w] `$X J0g\
ýEv$ H@$ H@@0$"dY 9DUR>G e;>ǥS(PzcSW8c07Ifq0 8۶Lm 7]{G-z. uӧq6yġω
'Ú(.75Ź 1p6Iqs }}ư.-.]47Ko\ht,@& rxW%f~5bf>ᆷ- &B+N- ᐷ%;^< k0,yB$ /a Lu}B&beM h Y`>#+v61b09t>G3 ut/ H@$ H@$N9">#?s^+הq3yٖ-YL[7Qmy6"펽D=iW.^q]t9*ƭa(!C¤rP_73z^a%CXeG8ZτMėE1#|m&KK@< B(" =DH>qlFb1*sŔ yRzry|PŹ\0r/o,Yq˳_qg&wV>"#fVە6$ H@$ H@`
)4ןEp/DQpXM|`ahij ynqߥOgo
sa'V,Msq^zHX=i[Z-¹)t#_ѓvTٗE
!1C@@Lk? Xn۶--tOzO=T@ wqG((Y%nB_|8ry/g/W<l%>fqY.Q>)w"T*z<|'^EԎ$ H@$ H@q gei|۵Y4r0q0i0"F 6}9&Z^
[⚹G禰svqayaaXMun 7jdX2nAÆ;R8E3Immi ˗ԇQ{ɜ@H
*: H`@7o^Xvm И i}XD=},,%1V^ ;X2uuuӝ;wٺ7 $W6"c Z֔DʱmNdiA4'Dlua0L=;c$s^HScӮ$ H@$ H@hAeCsU|3IFQ;,,a~k9*cg;W?GNǰG:abǏ הsfK pǎ- {ًϜ
{d$N_RC";$ \e˖5k$3]dIvӦMIE<`̙3'yh"=C,bO<[A6Rk^G7+R~GL
f=Ye|ɰy$".Xbf4L`EuvwĒwaܹn /"00]g9 H@$ H@$лWüN8EQ`kSvR(ro^>}H{sa羃m`
Ə
7/_ל w+ߖv|L]l~ 7-"-ۣ͖bق0Sj WL+%xie$ [5yMZ'6 Q9|p!Ύ*/x ¾} ;[}<HCunP C"P,9 D?ry.D^oi7e[wbS1a6zk?~|hhh(7gym@ [Vxի^q Y<iLs{W:aO`gDZJ֞$ H@$ H@,0מ$J
xTWǥJpBc(rQ߭+ |FEO۪vc$ʎ9<A hG6Gwc&xW-wk' HNӟ4<IDB x̾%/ K.x@${
>`HwQn +bK!)KÓ0|r< r>9?IX7:?Ɗ}\`qtM/P+j,|K=_ < ޜ s D_ݓ>nn'Ҷ$ H@$ H@@er1Iĩ8Xz%dt\ S|q}hik
vc$ȕK緋q~KߥQ#k&ms\Ƅv^d~X0wVKz}ӵ9*-)ح͗x
]]J` c"a11[g}Ώ|#7EƀxݻSiqƅ3g&!b ^?&LD u'@@J;#bu[s>!rء,#mS:&3^ѕH~P9W xg.穏x>B1lDy$.ϋ!xz-mJ@$ H@$ T :gϞ
[nMJ3ÖW_2L |sfl0
8fΊ.9np'r͙d{7҅83+
V+> :~x/
r0e*bk8q2l۵?LϙϿ3gυ'EgǕ.9Hߥ ߓdì
Uă6k
!M3{|qx,6 D!1 "->b_lzMI&'v 4? udv8CC]]]Z5w4,/C Y~gm<VJ1FRQ[[& H@$ H@$ H@7@V%ᣡj}ңWQy8jN vW;,
e+!}| kzT u|ek1ᒗ-O^I#|v(E(.5'ZYG@QlaIYy!=9+ պ:RQ۷= H@$ H@$ H@Mz0!
gcѓQmwH_]ǒc c:=*v$5 דp 0} =Q2-=kWh&. !:'wzbڔ@o?m~[a{9:
oBm?^Uk ̖a8,n;$ H@$ H@$ tN`hf>9GBh3Wܺi1ZaFtJE+iFzDE ]Q;dَ^ I? m{ |?қ#0ah[[YڡPm _ $ H@$ H@$ T ڰ`0wJ-o' K)ܕ{hS.#E㘑.q.-5 vfۢ Y<CkwH[E1jh Ų|hڥ?$ H@$ H@$ @6":7 _gm{;*/UZt. sn%0
HBmډS٪ty!jq(VU?J7I@$ H@$ H@$0(kوvv| Htv{=% Hhjj
[l
7ͷχӧOWιs3ghĉaݺuL
gϞ-krǎ a]1}KN<y]رca۶m&1qsaSnc$ H@$ H@z.I@DO|{
wyg:th&$N4)\_Ȕ {,o{[!$
.&g?ٰ~ַ5կNf\p!]>&fȑaԨQo߾| ̘1#<<?τ#F
'O~BbE>'üyooge ;vlXre_oVx ^p&c?~¸qʎÆ
8ϵ~sȑOM6w a G?Q{^^tt H@$ H@$ tB@0fK@:D@,
_?? Heuuukp''I [nD$ԩSNE?;w^J5k$Gb%g7|s:U1 u[[[^>_s
˖- /p[Ϋ(گZRL{
kM,s)__Ku̙駟N 6IC{ꩧ³>WAyʽ/No]+V?_ҵpM76 [0'w8fJgwԩgϞ
A{̘1#3^zux_}w4͛C}}}C?|p=/$ H@$ H@(tvp] H@ :GH?x#RĨ
6$1nKeC,
a<L GBx|nNZ<Bx>I)|ի^<@(8Jm'8o| h#/bˢ]-D9' [.qᵯ}%ެKƄPO}*Uް0{ӛ` _Xrg͚x N_-
O5b$,Ho~×(ɋ1vgҗC-5Ã!0E/J(-OXb<SaIx #sf~0ĸ =qRkN|O" cxEFڥ -:߱:V$ H@$ H@$@[Iڒ$ 0]%?D%V֢EBE^CB߾oL"wZl ovXxq>' ݣGvXyxix"P ѣlV&$2FD^9Y:DRƅ :nOw; <H Wʝ?e~[ց%2c rѢEɫx%#}Ke}0˂k^;G8ēs\9x x6vh ;8qb*9-^xZ ppS*t z(VO6C/g#|S`4կ~5ڙ
.-oyK@߄ƫKUg VExEC P>|x^|+_ K,I- >'~pHc$ H@$ H@$Pi:U$ H@=H>zjⱉIZti8Xhh|$!z!f!+w
!B#n!."d!^Q lɛۈ[.^zG$$qqڶ ǒgO<o=Ky^MH^▵I7nܘ;DY;Hk"Fn-%]wݕ[<- 2}͢jns0'uv:cG 팷)N6 u{]*yl#"$ð4QOڻi)">5}S.}MڜY^@PEԬx_rNxq̵G=uyI 1{$ƃO}Êz:|{?,{>@-'=̙Sii<$ H@$ H@@w(ve% H@7 a=ITxS\2fP|epFy_a9gdç-M>Ј ؖOO՜_%!B(B%'} 9!!P#D&G<5,!P~Oxc"W& 9S:&\;Ύq|Cpx#jE$/<nG(gFE<~Y 닠]` cW$"v:7*} o}[4?`IG(˿Lc<]Mmmo{[Z ׃\ 2;K5+\CAh~Lc'nofknۭ$ H@$ H@*A@! H@%NI^uSP#Hrh#x"PCF8k~ma/elCCE|-MyYfMrېq=9(k*$`ǧ%"/
Δ%y%#zeLcHR$M:5 WKؤ\3!vwfD۴M'"В(1أxL M<v} N ^<˱fe,\?
F EЅ?ۄ>"T3˿t*6l{qqG4ۙk#Z# \ޭ$ H@$ H@P$ H@lqΝI << Єg%%B. E Es IfԡZCM"r6 }$q1 Z ć\&oinS9<kĽRBcq3`IcDGt;>=/ xɄeܬ8E=5Hh]<? !v]KõuiA.ɇ'!|$q.֣ e8Ή5uO4ÿN~aʔ)Slq3&U^ g=ۢ 61fx"2ce/{YW\_|Fq ~0L7!k(®4>~ ]
+c$ H@$ H@@\>+U)ڑ$ H8H@Ѕ'b}|el% )ϥaCbKbE˯|+i}CI h*(-% ~6 /[*f]bLKסѰJX`<z iӦKsa0ECF{GR(i} Mܩzfͯ}kI\)F`FP-<gnjx 4!"lb 0҄MP(7 x"3b͙3g&1 !|,_
ܧ0!p u2b[E6O*, a_lp/ZlK }1I@$ H@$ Hh+IS[$ $pw#4-b'?$}KBƍQ%"ı(^x|~N"b x;?Hkt%ǫoDڡ<@ZSLЙ@5PJPvul}7 ʾoLxG|_$2fطgϞt ӵS>v'ݕɌP\#kHjc|q? K|>; s|6CkwQnS> 1^Dc<F6^w_ϵ9ų5/3p$ H@$ H@ [4Kor6 [xy@ >|t5h/gb$ H@l"*ޏ뿞D0 Y[Dd8)˹0B+ަzk@'VZF<=Ss KkJ*y˳&}DC>$x)ތx,v& J茧\R6$"=I ! Ncx'?I6-B"^΅s>wޙgl\}0E'B"Oݢl?H be\űN^wq^
r=Dc-dØup\Kb##ۣ<ו#܋0B0\f,.by H@$ H@@oW742!0_>$m?忕x!$r*]P-G< H@@ &'a\x(@@cÜ7%w6aϳT{oZ\^(_)a+Y&ޏӟtw
݄ GZMmR2{쎱߇ ;v$hK_SyRTlq5yM??&hj r۶m 5 <p vb\Y,w4/eK˔ 7Rcu $"rs>I`}_ Ə Ž'7cB|E.zG?J_G,/ )5F;x|V\kfޥׯ K@$ H@*g^Pf}c? ]1~ Hy97暈m T r Lsh$ F G E7</ [ s+) ^iA{^,7,V};Y<]vh3?炜cUƁ"!zປ_\Ű9-qQ1AKJgVPo6ѹ4aN<!^f oy[/ţ[#=w;|3 ַ >1 ;veG aiv(+` mÍQ"s+ԡ : ֭KЈҬ-r @ IDAT ka94x 绀m^mo{[zɀi y{^??%a룇sWEV$ H@$З7=/3dfncyc'ۀ
p y& d|ODL]%ZՆ$ H@D Q
lG#
އӧx䡁)?D?aB YyD4I6 f.6F$4-6 5>XlXJԥψDqZlD +w֭o}[0x{%.x:sͲhNy UZ*9thIhIexҏI <ޥvʋ\9f\ KYDSdÊ{&_b42ן=/"^C_%z SXN] '?Ź<u7OuyYo$ H@$ ]\W|8Vr:#Pmg͗$ A{M-B׃>''HD)B".ꕆ'FCX:q-&@!aJ~6<b+6s7Y',fwx{2 !Tߟ8"]Jo% hѢKYƙNJ 1}$>$m9Q!\/~1PvY EEe+VH,k2tf|+1 /&)ùWfDgΜ֮]<Y`Em=#㍝Pdl1 K_R^W0 ѣG!>l}W"T`>>}{Plg$ H@$0H俥K $w@N\v3h$ H@7 b {3qW$-၇iO+ arrl{/\+6sY} _l> .Baw=s2 iM_@Hbe C%x[2b#eLeDI,"`N J"(c~&|>hӛ
Z,7*᧹V\{ە*Wh7.k~Nb5"? x7+鮻JhEE$qz P x"r}+_Ic|?kUY֢eg6^ɥ*2 фiS:
& H@$ H@$ TmjO$CX0/}K@w*b ^a.!N!z!eE)B ^WuIʕ&D4EG/'. S!+<,!P"TS8\ G>T/xAD1G Iw &oN FHEh$]zp' ,O~2<66w?#Y&]?N<X KE$~&y,y hWM<W*5z, /kr=r }iӦu\c`uk6"7y|DlS0?nc9asÆ
ic^b;|=[n#\r.V$ H@$ H@&@[iړ$ g$+~_Ma\YXً P".t ?h}(b u4D CУ?x/ڢիWr\pa?Eya}ܳgO,_*T DܿB]?ORbZ.e.~*k-4;7%e ء ^\ $!of^H7
I>}.y"jN7S8k!_lem# ~xX#\⽋8 Z" rޣ ^xp=~i1>
Ȍa/Ξ=s⹚' #26-אu&[|m9\jF;5(O& H@$ H@$ TmjO$CrEBX?䥈$c G $"* !v8DS&)\/ \(I> Es FތE+9J.ڤe/*v`H JE8y>ń,DcOQ̠X}YhDGL@DD5SM k/|! r-<;A]:lpM 8ab7."yg }x&^c~Ö>W l>1vP}+~/b96>=gΜז: 83SI$ H@$ H@E$[
ڎ 8I?O<hmmI1#ČxZCSsVZBK,4!я~47v!tq3 Q VB #eA|9oQ>9TBel+@#rE[]'uN̎ ;$ ,Bti(˺wLݼ,b5e [Ä;9EdTD,`#]-qChEd ! rोM$[5 ޥ9ZÈًcT^_kllLޯx;NF/=ϺHÉcA_a$ H@$ Hw7'щ%1O|"<cofem~ٚc>ej:kqZffxsy& d a1~;vĥQ=n}WeG$ <(28?P=&;{Fw( DדMKؙMjY[.6Yߴ.3 .] gg}}ě/yG̽g[ś6\?l>\zû3$tcqt5ٶ[ H@$ H@$ ڞM H@@记ԙpu-ݻv- n(ڮng:V]I--.# űS=[ H@$ H@$ s{^iW$ H@$ H@$ H@ $@; /C$ H@$ H@$ H@&bUml .\aweGq'Z[%~YZZ[ZCkkpҖ[cE ;, H@$ H@$ H@
%P\ tc T\墶47f8:Ĩ;H[$[ @e6Bs9 ۖ$ H@$ H@$ H @8~t8ul0fT;ft? rڪ_8aذaaСa([t@Qn> lss|!l9f;UK$ H@$ H@$ H@@ZKF5lھ3ݰ3& V, gY%F< hMMBU刑#CMMMOW Ae?{28^j8755?$ H@$ H@$
7OwsrxyΗ-/=i/b:y=bY:+-?x6< ߪ!Uaa\[NUчȱ᩵©SasA,:ZTӧ뗷c<VFoA;bqX& H9+RѕyN$ H@$ H@:#p6=}a*E> ?~|3fLg;)pܹѴdI6 N**OY"^)]p! =z4E St\{АFqYbGck6'Y8]M v8aKcHi3gBKNcpy0n0::]En7~Yxlh3jd6e5ۿS=th\P*̙9rY$"-) cWT'wݔ$ H@$ H@$ H`@@p;vX =zt=ꮨݻS" De˖#G۷'Q.D ^ӦM ++Ç]v%1I cǎMu>w7dG*+6&z4Gy,Qׇ Mwlר:
ԵVňMaaxgL n^8:Ym斸b9w!4GNkW+{67pImw'yG(W
3MI|g;^يb~[9[K{C% H@$ H@$ H@$08 PՊ:2zHe)&'"mg LQi+JmO[ }ڲeKhllL4iRgCb8|Qo߾ut Qq'NM6qƕK+x^8!jl!̞5=X0TEЭIFݸmWxz0|Xm}P_73ܶzi7l
3N
#kQoN7 Ξ !ai2iB=_v:\9^aHlBK=sz7Jv*#ۄhH$ H@$ H@$ H@n ih6<]pa
1ާx"|N2%KP1" '"URxbƥɓˆLΝ;Ábqaƌ in~"q1!-ݸqcp3s̰gϞdq\&іqر#^:wl059vFpNx[TB/\h
6mlstՙ뒟ܺWꪰduNe(Ƶtc(w(ZeŢ0-WkB֬ls,eX>eR5
nvX$ H@$ H@$ H`xɲ+krvi mݰaCIRg͚Z_9`*O&`W䅋x"#" #{YKr #( . A R_M9Z1 +sWt9y>aKHυ脛D҆˧EA*̞1-=j9QSsuj{qcG% c'U{ic%a鳜
֜qQ=v2 x͚1%,[7 Y^A7M9I@$ H@$ H@$ DNB #p ("!l"?~x
s"/BkQ W.+%DT֯E;wn!i?{ruiG?'L>,QDbD2?\[<!v.^b5Ó1D#´]5]|u!Ls[\og7Qd
Q9p8{իF]@mxaM=~Eq6
q}ݺ(rIu~dKc[A ^J@$ H@$ H@$ N Q,"!rr ZB#r |HCuI-eM־Eܜ9s.)-)Jf+xϲ>-ur9O}?Y8| ߺ3<ל=}^ϥ}eL F
o;_=4ϝ aZ) 9z"6Җ=QM+5i%0; O=948K{Xܺ Hm=-J@$ H@$ H@$ F !!5f
WL<N9OB ={v;Gؤ,b'ĉpXʺxrnʕ ޫ˚iƔmm˺xDS kkd2y\5fMvgzN-gY E+Q#]43cѫvƻpi0u=5Q`>$~V ̚n& >x/WE6% H@$ H@$ H@z (k"z"[.y6+ GC<^|DQ)Sr|<lYCԩSuf a=U"#=ZLH9-*,bkccc?xWe<rnݚk
oܧ@+[w'rl[g8[naG{hN~Eq}MQ=㚴Qݽ`r] x=ƚ6
5ԍﭫ8=܋}h{mH@$ H@$ H@$ ^ xG3f$SUDNOY^xh8ZLR\6lkCCCkɓ''L+oe\#FHb0YM?S|s k#[=myi ^hNXx~/ijgMkU\[vK8|!kt)7{Tchl#kla,fkk@;$ H@$ H@$ H`@$iӒJ>"(:sB4)-^$lyϼl.y"R䗦\/Cݲ%/uSH^<s Lb x
>F]v?n Z-ú
[Ƴ2q6"G\`vXtQl;EDFC¢ys=i0[S]fQC^nk8xX q钤$3lXM?gFXdA4فhud$ H@$ H@$ 2"&TۓoEݿ
<f̘P SO}֙E<_7.Ps<^x[N$%/# ;v,E^dIZ6[Dc֦}'S?VZQ {{MƎ ! iH :m N]s- ^ 㚳7-kg v ê]x595^в% k8<i0rSMF!w(N,UI$ H@$ H@$ zȑm) 1.&ewܙP\s!v۶mA/U#+K-][ֿ-=K[7oNb*zĉ'E &WaȞ{ |#ajbxN7*L21"Cl9,7\ F
b(i[DH~I <@ gΘעR i;:S,cVI$ H@$ H@$ lj]n]N 8HT<X):uuuaӦMI%1acHZ&qmiyg85͙Uٮvv-\]`Tm
/
x/l/8 5ݰ6RifRIq9~:|WIy;{ι ҖÅ
X$F6YIΝ cC#d>z9/X=ڴ_ ho]0wKg%ɑ=͑7\Ⱦ > ,c#waqɞ<{a
%Q3=jOD@D@D@D@D@D@D@D@D@D@D@ ҵ!?E"+RAJ5K,0w-###!:6=sutt4qHR6Q b!EN.WQ7j&cGZ垞mkl c3ٰv泋~
ȥf-:lMUo=^!;2nyb}nk|qo.KGAҺ=^'r)rAWuy{!ͅ
o{'|psW$&ҕHY beQNt* >!=E"hُe_/b^ʕ+9u d[D"Q&wjP'a;翲nS.6'&w7 =g/9˼/ښ*g{j}}Þ< r(c,175ںx`zV]?}<!hcvJ8m*/qvlm6g,477~reFuYuY)KVT7`vq(/ol䋃/AK-" " " " " " " " " " ' ԑQ;1'ǼS4䱹Xm.SOAr^ l,s~ Zzv}; iMy 79qlbfv+2:{:HťemO=.왧AF}q57*k\do#msnO? ˮE
xv*l/n5mVgn-~r>aZCD& mp}^nC5ʓ'OBps~xX&O~|y
=g}Cz=qo=NyъڃG#VZ뷮 [#`ܧ 9{TR\.g][
6-;~>.iYKs<[8+c\C[ i綹'%#\3k̂e5;l&+m,UQ9f 4 m||<Lom /Ub~xrׇ?dR/gؾ&OrՓ. 'N{,fqP~)Ԗ!kk>촇 mmfO_MzZwFѭ 1{dHk<M
ŕ[9rS3~鼟 |Rh ;?FҮz\f`]f B9o,Zf쮭SOxb95Uh%f5M~+-˾y.S +0fӖWY YxX"@c;E&FNMMᙔHS$( qL $kGz1|HUbBAtIDDx͂hΝ;!6ɻr?}^xqo&pB]D@D@D@D@D@D@D@D@D@D@D@N:Q z klSՕ!..q tΐƈy?_ie%~ 8@P`giwznkN5Ow<}}EkiB&N\9Oa6eo٦7jZ4e++[snM_\EDm|`ayuYZR%ÄtD|"_z-[24F^|ؼ] ҕERH ; @ >|ܜw%r]]]lKA{Q3d |ԋVj"u<F"_cv8Z1<)w8yυ q;63;bK<rG9y$i4c?yv!;f+;* 7{Jb(3C슭sʖ[IE+;sݬGѺ i]³_ Yoi$8eٙ
K:#RHDK&^,IIENNn(.jkkC|Xi X}߽{7X' f܂%17y >d@AlcnܸasssZ"PgvsvgMN؝_^` W\XEy
t 38M[]۰cVUYf_^hUk8o;قvSO>Vī<u|塚oذѱ3#x Y!T%g?sE_m`E}f?Xiy+ɅQE5K'ʤt%}a?ѧD<::v}}}Q/w}/8酛<9t0 p{8 gvUb$ϧ ;Uc=]glRkokW
{dݚ?m=Z;Vnos[v3\ArpsްtDΞ,)tso4kÿtAJlZQu,nÿҴmLwd))v)ɇr|D>~8Dٲ # <yd&ۈ%ԩSyg GB ڤB:icY,X
GÖ́D#Z{=ND@D@D@D@D@D@D@D@D@D@D gDUUUor)97ʊr;)kw=%rrBvw{M=0ϯ3- mLA}X{04>+Ƭ~j7W/]_}J*=mrieoG~sچGxT]GAF:ܹYcˈPRG'`3-w]h-Y-#LI QqeDnTs^ݭp#a^ơ"" " " " " " " " " " JgGGaZmSNj lmm#V=&ѧ!nmzEl {C+Q Ir&}Rᑴg%o6igۚԱ<fwv, W]xa5Kyᒖ @Φ w[z֏Y~EL+1Roo2 Z͕i>j[-U(ڷϿ$%1Ҕ9_
YI^r,27ik+u_H"L?nd rwz'mw}g/Bh_:^0 8u~1j {r$6v[泼vj=NGvy:tVrv@ASUIGj3+t^|ۦGǦ<Mo({==q)Okٹ!6;7j- =ï gϞƮ^-w'B%ݾ8(ѸZa?w\n}nuho||rLG;E@D@D@D@D@D@D@D@D@D@v!qFR, "Jmmk
6=3o+S fR-:;Z]Vmx-j w
#nh~ā b OQ좵Ҥ .UbZ#3}>P;aGryDGf< r֣hmمp / r%&
9ONuImL{˷ kdd$Dƾ ۶6kjj*JxF2¹mSxxx u hW>}*Lsp8
|N |-X F3]YYn-do* Dڪ}t84-- 憧7_ 0l7. B"*<ʶ^k V!#hsO`_ 'u/QWR[[* ?Bz䙙Um]ܡP&|[ '&&$hw" " " " " " " " " " y Ĵ ?m93𝞡mPE=;JKR>Wk]x Xr,<A63x#<>'l)lOm/-ѷ%筬,]ɤ±禍n73!۵aX"PwjR?6 8eEE]x1^YYc{QR7Aσevv`u." " " " " " " " " " @Lk%ٟYGGGx~-{}W@ ڐCZ |'Rz| S&rOnXf]1XeG=eCR9%=%2mE
V rcn[*guu5}; ''' <1_Bn ?DjRkg/hYBTn,}D-~m1ܶ." " " " " " " " " "Pr_eHo3_wwo_|#Nd
ڷ!W疥}kgbŅ+բ˄u啣r]n:;"Q.//-..Z__;7(# Bj}}mD0oA2+/v fڍp)pUUU 2W|1>2ks Sf2Wn=${Nʏ9>-" " " " " " " )w_E<ok7"iO$<VOӡs#p2-szt+bv#c=XpK.MKm3s!2<! ƍb͞ZKnd((v D #͛7sZ*3NN2zsssA+7== ~w^kOd0[ZZύ#?nϟm%" GG{I~=C߷_iϞ=|AvvvtgΜ3p8H'Iqe)sϦH=sKT n닖BԺM{)<G¾x"tX X]] #0BAȌ6,24J]ưSk '?_TpNw 28w?c|%
Hn8F 344Xt E@D ~P¼;ǡE@D@D@D@D@D@D@DS'c#'?߷ɓ'at i˔|<8H'O"b<MnEY}>lnåG `\[Y+Ȣ@$rT<g!E"HdĄMMMt ?D랴|ɾʷ?m[ Yk?QYYYe[&bcpp0ڇ ~i
Q ?+WrIe8j^R scQ" " " " " " " ")yvWWWx^ ̔ ޑd|UIm}2C6 L?
ѳF˦+<uٲVB$A
ͬe^ѹ
L)Yw="rS&ͻP)2}QD"n}vBgc/Pwb5_,>Ɣol#1Xui.2(4.b ]pIwLƤm" "p?{H%wIڣ
KD@D@D@D@D@D@D@~$3g<[gDl:NWv 8 'Oк8et]<eftj¾f7gƙmI]z J5OmCP
ypҥ j={$ /{ɡYD遉FeS8 )\7&ڤB u#r;cx'4UD pb^m~a"" " " " " " " "p|ܙ !#+fggI%p-&YRH5͖lsi6& ZiuG" uvqNaۦaL ^TMw |Gě
E~rr2Y`%/ic-===An]<gWdRh{nBc˭:р|I"6D1y9cEfJp<i)IOD@ ? Ϗp.yG9%" " " " " " " "3[^Od
ZDky6sOq<mrO[٦A{\Ua=Qݝjv~ѳ3 뙓-Bȍ )˼<G.K kQƇ縡!#6eG[9Y-4.%M0Sa?%یHBc;672hטqKT.빅klc6a"." &ϽǼ
[D@D@D@D@D@D@D@D@D@>.)h0+qA]͑͵[ mKږuq]R%VrkƲVk0,7^_ZvfYI_
B ySID62_-X$(yE13 iP;#Dr
D*Q9ܹHQƳSm& ) ߿ 6?l¹ИGn|vGC" " " " " " " " " " " " "hAkr+=}ٲ8G.?Z*b*+Rꭤ+ Wv6gGlmז rvi+;sRU^ m ((,9|7Hle ىݷӐb]ER1ԄW *'8^$6v.t@1N$Nç=gde8h'[В┕6W|.im#iK'EKwx:| aoL~g2X9l<E#[g ]kYǴSvx.D(}@J>A[Ng~)Td\RbdZ؝ Y*WWWCv˘2NHS\'7Sy8co [Jedmm\_ɻ &+aSgڣEKH =%rvm̍-TɳfnF.u;K7<~9x9{PP툀@ Ѹ9D"eWlؖ9G,m^*"$pE!hi
1z OsZ܋^IUQ]ۗ}TY4[iז9FB-I PVVGdJA
L#g)1z6-wsAjXUUU`bwn3~G}TZ2J*<ݱ%=c٩G>m.Nffţc]ĆT[|nڔߐ*TZ7ȵ&" " " " " " " " " " " G t eY5Jٸq^|g[1\6| T) AxlI]=quO]<v{D-˙58jm[yclT oNd4㪈 $PH~OQCK-j*Uҵ>XɦGBE҆V %f ϛ $@4_yNvI,noӂ <Z>$eq $" " " " " " " " " " " " "Pn6ۢƤ' A Ղ8^(J @ IDAT쉀0|8 gD@D@D@D@D@D@D@D@D@D@D@D@D@D`O$hID@D@D@D@D@D@D@D@D@D@D@D@D@D H~8C " " " " " " " " " " " " " {" A'L$" " " " " " " " " " " " '@*ur^l#-+M[[߰|| |R ⊀Wؼb#/mf~N75XV(+GkEAU{" " " " " " " " " " " " "L&Ҕ9mv{mlfm@UT[!JAw aG.E@D@D@D@D@D@D@D@D@D@D@D r_3 (ߨ[|嫛^veyuFG'mrfβ̾WN3~ڏn OҒ
UOoJlna =Rr"i Dn7[[_?*dr|i h|
d| MٞFb *" " " " " " " " " " !@4̌Ά*++1\Vlѣ/.X^^n
bi<x+ XorEI{UUUv̙ UTTXsssc=h٘o-ثIG.ye%VQY-immJJJ.t{OغO_pi;26agۚ_gfK?u%uI= 1 e$z Z e?HneucKnM_-,^
%ƺe|}cÏ˰/M2^w똣 8yDd"Ƣ<E"3 -tf666f/^+h_|E > 5یbIxi +O62251 b{{{=ò G /c谞ws\߳~s!ҵ[[B=ۦK!"n皽UW٠K{5إMKozt~e. 3sv{= u^iލ
tOrM6U@#~w9C}`i.-!\~vPNM KuidpdҖqQ[7E}$rI/ n*" " " " " " " " " " "P ⒨V"L---VWW"*HZSޒIE"Wڂ,MԯLrE& rvee^~ 6lgA˸+/U f D>{,lg iKD|2>{N!^lɮ]wVs <gõw9{C{؊G~~] 똲~fzZMM #sS4߾8D{0̺l3|fvj#_p9;Ć =U ݺ9e|UV|I{`hQ_a]>Yo*?b _YDl~u;i \MAV7F!!-MMM '6&*X"aَ\eTOmcJdP֤9>il^"k)E ^EJ"XL&ʖvf" G,,s K$-Ѻl?I%f!Y9^I{9ژu}Qw <q1kl6{iyu Inc=vn!W356xVW(.UG iX
Z.QV")6o߄ND@D@D@D@D@D@D@D@D@D@ދ Ϥ۲G*V^UPsv"oiYDpPꍏ^"gĴ1>EynYFs<}06֗|TE(63R7FEK˕q/Rߺ ]'[Y[=.عޮ!YCC]]qLǷ%kO{ М ?rG z4⑳.gd( 9\ee ?F[.h?IO |Eb3`Db (;o߾ H-Lƶ|H7L__diK _!YxE V Slx!eqp|nx|13Ma[Y}NWQ; moqޮx \֦z꠫ؔ[3eiO}#<uwM\Dže4 _ k嫞E-"A[ WQ " " " " " " " " " " " ΅E&ѪRIa %ioooQ]4>1.mE&BKD?>HT{qE+16foKme2eK_
,繸h?{h=%4NY QZ[:ާW10>{K#/]mjf~R.O[)Ѱ^gyy%4Mfڅ얜+*9 Z(@@|"+A"O S#ӨK`y!<c:a%
A#caXG;B>ٳ ^植%_!x_z"pmgΜ ǰ ?~l]]- b<!_8G.gcZc9i/xz-!SWH. Q#/s*hׯg](?I5{i? v%g ƃv\wYK N
!DaJ4'O(EFȐGG10BZʜw
ʶ(Yy
7 Ŷ SojjFFFlff&Z cA"3^}KnLi ύ۽[h<'aٛw ӌOְYkR8V8
>\`Hk<쑴s_SS3>'[H啵xyeY^<cϻ 27X%hJ<D@D@D@D@D@D@D@D@D@D@D@>y" ;>>8 ,mccvZcd /E"l'&&B㉰E|D"RO>
qvttD/3.E<#re "m1[O^.-OkX v9ѫjyYGӾ-tק%G##l#ad / ˖HkL:*r味)ga-A{8)" " " " " " " " " " " 24AKz`E"8N`) fB4FFQ;c{-T1,s rv}}=p<bgHY2T`EϦ- g_;.sAΖ<YDjw ZYi ƆSG)b
EOٳᗖMyc+ =} m5!1rj¸%NF6C" " " " " " " " " " " "p *D`s":s6WD(xx}pp0 *(]a mKa"Z [h\.s_<6J(j֭[A _z5uDS%h%{>6QLNyZ.>3r27 VV^NsXN8Iw\n;v1:i+m|]ƕş?R" " " " " " " " " " " "p $,TD2o,b]XX2D"y={+Ƭ#cYoiiْs"Yi3Yk?Ի~ܹsa\KѣGcʌ&6ϟs<q.-EhnZ.Oq8,i[KG2[r6RgQ/q]㩨M/Yu>lEEyrs.KՉ|jaVD,(-|=}tDZDJ Q
<! hp6W& yqz|>p>Kf d99KcN}vOG;/{)᧷l vZ[]iyZu\Γ蟏OG|ܗ,Y[\;£g;[u/k[6лp0"f;;;#HN$& _WR#\- aI#<== "[~"Yi7)~ rM
i|ҥ/Q דr9 Y 6y^~s;I#ًW6:>a |y߮^siW 6ܼ<&{ e<ahi?7J2Y~=c7nyzm1]M'O $Ze"eBE,#8(9_čhq=Ga!?dvn>yL0)ɸc
; kemfmqSD?x[juŁ^+MXIi=vr붴jw} = rvs?*=s:DmN؆KکVޮv+uV$h|D@D@D@D@D@D@D@D@D@D@D@>y1^(f IL#@1u@ r^
S7w:6Ye)V\/wܢ--Z\qy\=v|/۱\c"gIk<|L|O]uHg/C$gsHYIk ?iչ HܺG6MxT⊥<o:ҽ,mszj\Z EOA}{VVW<U1?0r< j ]|PhgwgC$kv.מ(AgT(" " " " " " " " " " " " GEo]]3sVPktk5ZuMTV ;9K,rΐ9Uݒ.c{jf5[c͍>n aݬe\ԚM Y<1"%hoH ԣfzZC)ro7g.=7ycZG#oYKm9|z<rb^Y[ʅ[ ǣc>' $9咶:Z4V?jZD@D@D@D@D@D@D@D@D@D@D@D@ޗ@MUww)k HR,/,zZ㡧.gGzZcW味=r`_HioH-Azxt,DzPM{f}= ay\K h " " " " " " " " " " " " " o`Vs{ɚnqyŦ\.>d( }=!q|r6A͍I槌ݴK; DzQG+AE@D@D@D@D@D@D@D@D@D@D@D@D@M
uvqN77ي2˃=!6ָPz”mk1Dfyyv VUY-qۮh<" " " " " " " " " " " " $%.;C,ĝ}f >&2+~@&yXa%vy)
9iK," " " " " " " " " " " " GAԿ+6>9m%L6celݦJJRyjk#^]ξɸ9iS gl ;"A{!@luVg/lbz-Xc)ÇY Ipetɩ=O\ft5{5ml 2m-gljj?Hi$ fi zApW" " " " " " " " " " " " :% WuzH-\*+es1)A[WW&" " " " " " " " " " " "p Yyy!Ç܅ =aR%8< 2_J- a46E@D@D@D@D@D@D@D@D@D@D@D@D@D@% A.mC! A{(XըK@]&"" " " " " " " " " " " " " BPZUEO Ju k82$"" " " " " " " " " " " " H@~/--!<yX:G!;??ol6 ǰS >cT01nƜ~ve2=nKӲ# A{G 11{={u vd"q٭[lee%/myyˍHݣ566fn---o]Ow||&''mmmJKKFo E@D]?X"ѳD"f)#<Qw|X.%%%A#h N
Z"߿ eK ێzOD@D@D@D@D@D@D@D@D@D@D@D`H O( I bhV"
)9u^di ڭ~_Dɾ|cᘃ,О
ѳCvww۩S%5sLw{E@D@D@D@D@D@D@D@D@D@D@D@N ړsH3VNMM/^)
633!-뭣4ϟ?+&rhSgφ>vAbbL K[aܹDz?kf io<r:"!{ƍؖv 3Mgg9s&ԫ璔{_D@D@D@D@D@D@D@D@D@D@D@D@ u=hR'Rh ]CVVV Q~"]c4,=|6DR_p!SrAbJ`ڏ"IX#YϜ7oW^-~ؽ,_UU
!N 8eY"yIbZI@d^2j!ѳQz TMhD|ƂTb9YVV֑XyIX /Gb>}H]B10iٖ,9Y=ΙHa
2{0vf[, @<'gͬee㶸 c?
~
s'ayŢa#_yE "hTnZD"nso|hOŋ!ÇCD+ 17ҘhY/$-ѱIqhK
ks !Ea(#1$64\h]D@D@D@D@D@D@D@D@D@D@x3e
ϛeϥ C羳 y Y$yND={?*M \5 7b#GA1O+B(Z/HW"5T~ pnԧLTl`m.Be_
"X#wy/E;5>," " " " " " " " " " ǝ Ϲó|x;6
ȤeǓxl+nLE6H?E>C;/R~pqWL*3yƟ#y=nv',7Cd-m#RF|Q?Dن=n,1Kd;R ϵ|TD@D@D@D@D@D@D@D@D@D@D I<K&ȉ{Y8d;l-^,{I2˟yu=;σA^"m0bA2I8::6V3* pЛ@s<Q'?v>^xWrF`NF"#<~a ԗ'su!>_?#E" Ai]:[ sIYO
MĄuww;D:]K+ѱ|X AI}"[GNq| 1y!6^zNm7NfH_aǴ pMIAy tCQ" " " " " " " " " " ' cvz
= ڢ ~D"7yU__oHQdӧOCd-/mɉd?HƑ O|Qq(ɓ tʴK}֩Oda.P|gϞs #Coݺމ cO}˜c'3ׁl=1}' A{LEKHD"S[ZZB'*˗A"aǏ ch+X#6
PA>| %QɂDܲ K{eC51 e|ǗwGd1,xp!"k@ M`˰s Bsrrr;z5
ZDBh"h<R# .ϝ;8e?QN__}Cӳ&u؎0&B6vʛ|O,b l;suuu䩩 Y1*" " " " " " " " " " " " '"hO;#6Ϟ=kmmmR3 (? b X%1i}I6i4ʔ[SSGꫯD([=uTog|˜_v;(hrJQ80VDًFJ6һL' 騣h"#XXF.W,lOۑIjM$o,h<32FΑW /}ed2q>\{PcR;" " " " " " " " " "W< x-NRL8L;!>(
Eq$4ܭESdԧnwڿӾd_,n]uGE@D@D@D@D@D@D@D@D@D ~&,nmC|
Jū fG66 z'I'.EF@.q: "_ D55/8"" " " " " " " " " vߙ22[sOќϺ.ti%d|]h.z A{?>`.uE9cD~ƿt(ɴa8| 5/S.i1 i?8wcz9XYbaZA{.t'
3*_1UníT[{/" " " " " " " " " " dc/Fllcf}gմG/Y?JC-?
.jc$_j0h?hMTE`b6 8 s?}m9[UmٺM;2<@]٦,/Xznt˝?K-,Zտm[t[ M8)@rښUU[Eyy\}r K G%d|X6Sm=c_ثC[uA4uYB[QyK ,O=}d{|n/惻P`l67ѳ|r|'.d39n
=kkmKz6֏VW" " " " " " " " " " "p lYQ6Uis5aa)SyWyOeexnОn =`ىq[^YrlA[ZZkQ~k R/wcl?Ywzq~gaye"[aQ^^f6=3g7?ĴԌ-,7/ZCo/,k#4I#A{R)" " " " " " " " " " M^6i[U"i׃AFar,QuNHԦO{,\Z/u)iW+s{AՐ2~:0um^oܻƱrsL7
]yc>>Ob_XثOO.s.zhMSiKScVWSe]9RbOp?csdV퇈4.}e2PW[}|! !?9I5$" " " " " " " " " " "P.2YpirY DB'$6]*_WyX]nlؚGZJX/;cqqў?n
N>m
F?655Х횚촹9 q\ԏnwXobb"WDkuu={۷4ϑ{uh%a2G[p aV^Vϱl](B 9;;QTg|v~{Mwi#cSL6 K?G'Sk]:gU.i(?_b_^`u|.}.Vg" " " " " " " " " " "p| EU2͍OEVUUy #zf
zZ>߯ p,2vKKKŋ f\#$(i ^w799oE[GGG/_ c{uy啧Dw/Y+Fe#by!/^D1csq~ uڵ'i3~]g|Tz:B_4r{.qb|¾Jne.9]{9d몭캋z`\MN}q킏rrscbl*<}3Q] igVoED ~)2_cLavi>*" " " " " " " " " "px>Y2E(Bj{aG-~9xv̋z;]x<ϠgffB$*===&Hڱ-PM'AjD"sP/ְ/9IO伈ES/D?c%ӧŸ r?00zr:ƶSUl.h5_.<_ܸrtJ"Ϭ-ww]xzJs3ީvjRZO166>>kxxK˂:q"~O4`Zjjjzg/Hvl(ʈ:|y:u*C}2"J~ɝh!"k9"2y!xKIL96ja"rgn=lB:(Gy66df|3jE"Eig "7M; !ԧW^m?+]"`yNPU__v-10&,iisݻw8q u?pN$ 3ʣNoܱW7ID÷?Ͼn mOVsњ5>s٦gl??|WVgk[
9<œSG>qnn<tk wa & #N _b/o&|,//ٳˢ*T_~ ˗_L\Iv|.]|>%ė#6KFED@D@D@D@D@D@D@D@D@@ʟU-3K/-/?M"lNGQt+ϢyL!kƳj"d)<w~ax U\q'Q,>Ƕ\ȱO< AHgΜ szH_Rq$+dڊca<#Җu "!ESbGx ז*ٺH #c.E~Ukmn,\jOc|@7>UOoLaۻ.i>ϯ\|\O"g~!ikr=?#a#A{B/q E{n`t._|ʕWe6vvhz.\!_*" " " " " " " " " "12b|@0FFqq#=d;ϩd3lm#L;;;ëjO%[єAGX<%-㘨Go #IRg[?nc 9 (g `iI̍#Y砖sGҮ/
R!vy:8sI+ct9{}{1* >sM
aq&TڑX'O]' Fl睛 `va=.%Pl_" " " " " " " " " " " Uh3i)Ϝy #RG@<f 66J>z(DrL5ϼϼ,}qQReziF 3>,ѵD6
cd\ԏO=+9{ocS mk==3>d_vN77n_bØW5{
HڡGan܋{}N0yy
T6͍uܵ}9Q$h8_"#)dȫ*DT`N#c\ yHS$'"9\)HY2"c$pg{=
VR3Hmjj
qJ-utt#Ji !K~o}D>~80&
l?&ʖ<HYƍ4f@ x܊ZG_MگRYki {_^VOm CV JYn}lˤkb?{dkv/-w,29]H :bu " " " " " " " " " "pTK"DslFytT ~s6t">lybv+{1h y2C~ǻwrO]O.[E$%kDF %ҔB=SHU;w.},e:533mhA|2 DlX/60ٳgzYc벘~ϣ/>e|W-,g:ښ+EÉ9>u8HnN. gn=7veu? x0v䬏_:iOkzc=k[)+ 8x8"* Iʏ`B\#x4d
o9+w!CԞO"Mqİ?{?/X{S+ɼXqEga'9 - 90w,WJ >[ epn: A8%Ɣd]_z5D" 㡯w? q]q}ƹ=q痭ѯ\sd454u:|EI _:4s.zc
<y s [yh,'}Z#" " " " " " " " " " C لB:IdT<^On1ю:7 mq#e
v 7bmi}{^/_[MEٻu?p o||<#|oGMK`mL5LwĿE
`YFIgTMFmicrO'-/:<< v,KQRzAEY˜Ŝ9>1mmuIiK,r+>lc`G4׳}{ٖ6U˞C.~j\_>#[^ےAҽ#MlS}ymк:Hk> j^mߑ b7x#
9~a QFD@D@D@D@D@D@D@D@D#@ yb
bPDWgD rzs<i T*QF{+ |n܂tC"Ṷ11鿑<;Gd"hC"_D2W-GlCv#r<}O!ʕX3z겍xx
!vi}<8~Γ1uX8R!.Js
sZz+rr6ϒ U tӪ*lpV<c[J8rq,p؋]!7NRpDw+ˇ(ƽۡL
& ݎ~Gg( Urvo0gD #\{-<}26o3KVi;V؊G.ޘ<Z4~ F <#g\W\k |iG+ѩG~Il]ZZ
c>/U ?$orJxO.m0,Gs )E?|0SuȘIZ|>=h_]hqצgޜGhiki}>Fqd~<Ƭo[s[QQ[ޮ1|}J &"l:t܈%̵kMt8_T7w 7na($\v֭p#W6䡧 };Pi]D@D@D@D@D@D@D@D@D }GІ xƋ^mx36jUu5{3EXzs YIpוRs})[ל}D2N>Fv$/Z?sy8
No9_m800 ss&ڗ / =Y%:kWS3olkv2njBvݸ5d=߲ľ-P| Yʷ_4>wmQ8#A{/a
*7B&&A}'L&Md=/Z Qc{ɺQrMn8ڥ$
y˟{Ipͷ̍˗ǩl!Y> =Ss:趕ՌyE,YG$w]XgD @ IDAT ̳pN<:#/Y3|@,
[҉]XX<[|=G={: C$Op,~rj˔,ycbRb0 ؑ㾖o>l gNOlѵNzg=l ܯJCT{(//ڝOcӮ5U.ܽn1 bpN(* xetMc?mj#% C4,_S6qěl\OY oLDN.X13 n}zb"spd*Rg< dAR?>;Y{<>>y֞t߭Pb] /c'2Xr;ѥ3 qQ;_^$ |S=} >t{2;]Ύncߘ֟=uZ+[?XX\Z -\⟕+3"+ tNc9rKv
QƖoH .lG7 7χtƱG l#.s yɡO/cc!iK"w8zߧq^9c[s >Wh}y_{lg{kp2MzMNwK9&umgYddKl;ߐ JKsBPT UM^Q)^At5P@f$IwGYd5-#H:G{k^{kϷVQvڶ-%M+ ˇO`ٕGNEymV%mM<_m* A_0/lLst.!O簘E\%tLM|(#Eey?84
S0P80J:_e&/" " " " " " " " " " " A b]t9!#q]֪UA
a٢(b朦g_:bwOgjmyi۶oV7'! t*=6I{"h݊JÍcy(x27='+L5+m!bÞ y(zСpҥT8K600[GEPƒ:be(\{z#Vc)
m$/I|XFN08<lQ'0ڰ 2{iIX0O,% ^ZKA
.u
uqj榍 sAz -=/ A
DTo fANHy<pYmDB?{l-g3 Ǣէ2VbN9: 6+<X <֭[ɬe닜#",6~ʕ=+,a6ְ%ʩESrfav.{ycx.Ng> VD@D@D@D@D@D@D@D@D@D@V 0A(
"gl;C3%G}e 04ڸl-iub ۚm8$Ca_22S:0- NKK P sҢ" (uիWa:UF Coڵ Pۑ#G{(n t۶m5iIC%Oc9 z ta1yC;x)윚j,1D^;|pChLi/SB۷/5(@@c`&ձtL?|u{>Lkya8[[D5gC~VUQnwM΄z(AH%3LjaIoA_ ?¢X+X""""b݉c;Fu]SjUUUp\|# p0?v 1{/6S?@8ˆ~@Oh?)z{S9;w.LZֽ8-u
"_Dqy9X! = 3{SN"^9.,zGe-.*#7 Z-6gw6#̽-i zA_yIHAj-I]WqB'Կ8Z@r â5#OTI&9ukM%Ƀ.2<Gb2u eGݹsmmmSx<]@fϔ;vsL= =zʹheL [dS'\'0|\(3Ȳ%EA
c#a utl%2\ZF(
bsI"0-Af;tYgvb}vL4tiSV!v-6fw=vJˊm ֶ)7仓@Wp78Vln %(b&-aXb oqn<#S']R$ӧOG!70K <=.rG|D o}Ry[X,i2+2. Y&2ԗ-J'" " " " " " " " + c ?~ܚR c~ <x~'~bjfx 3
oxC/]PYjjW٥a B{[-7ڷ]U5+3?gׇG*ivڧB r"lIh wQzu۵*ZuUm˦)L+@[5g~FY8V2x+ 7?"=Sbщ-!ǬCTįnXJ*n!9ڵElsSS#d"xR6bJR CMcʅa W6ڍKrX+;Vr" " " " " " " " " Og}~^W U1ӏ/ږ-[fh|'[8q~w~'k>3կ~5&
1F[KKK2x*Jݏ?ž~ kNھ5T_ajʣ`؎A`9:nk~] KمԤ îw [Wްw}- ft,ggL"0pX.s>AgK5s?`7ÏJ,K&yFjVǵb'9TKڽm[Ϝ ^hsޕM{K
FI9
#."p#5a@r^zxXvb P -&S2ɏ/\YMɓ_*0 <}̙,#2S@?#Nȭ}=y" " " " " " " " " Cq[VngWWA3e9Çݻm߾}Vlڵ|N<i_WG u1|3q !~P---'HeDQv,LeCZ<Lm<n (;?d߳.8{#Ů
ܚxrZ072H,Bmuy1luYI,'0̓A0h
uVVRl.مm!SОd v9luuXth2ȓݧ,-_@uU>< O܊|xxG]eY>h\p2 a=R?R|x L|СhJ|@
v\%|4 7lǽ|Ύsl^goF@c)}QDhzի `}.5$rgcň } ۿh˸(cCőO3+3
ekͪ2۶҆F/űʲ(dWXv.\a Gƨ=_?Ю;هޱ7Zb!teA
CǛ G;Tg,_{>Wn# ׅ K3?6fNJ?¶67Cҙ#fL6l敥; F2!E )h#bHÀ+q!`qWH>$@ź0?PO!P%i ,w4q:2p:Qn%y 'sٓޭI8e Gּx^{1m3,=c{.Q\`X6c%؞y8fXߑ#G~ ?E[ݹsg #dT?qLIW~Wx 1ZRs=}J3}4셳W잍VSQj=ׇtπ
E?d 20jyݖ8:\c6t31-SX,X],J*glS\Յuq#'Y%o߲1Y;%3, O9% vqyEi|h`݉PΥ~ U{zzJ p\>^d&GΝe!
{yOtԏgraKuYP> i29# 8>Xz E %3qA_c{18=1aG>+c=f?51&ApH}o XY z)LWayi=Z l Iׯ. `4 pXw65ت 2
w?h_yӞ|ng,>9xNї^貿(v(XNswbU"p/Z 䖞ڥ9W NDD~@Ȕ~<Ӄ||`-)"$q:89|CDIO|֖2bA)a^9%4`/=c:# f`c]x-ԕ69>~")~ϟǚF 0 "
qcCg\?A {_ >qF,e0HK /Dz.ϲOXey5ׯkUyݷvZS+wS ꮯ^e/w\Xw(rFًOM6ۧ=PF 5N pYc:Z9X(/,T7wH͝k35ضm[U {`Ȥ/`ؽ{FZM:CA}M@ LL]R z*4Æ.X8DoC eףHLlnn v|DUE@D@D@D@D@D@D@D@D@`o aҎKMx+o|/yjD>)wحlg7rKs:9;*gS= S-
'zPp`7azBIAT
AAɝmj2hcvBhP^Rha&B}p #sm
ȉ@H/R# Qp͚5sn&b##b*) XUǛ6mLSw?.&i{:ǯ96Sti5ۋ0)mް% b;Dm>xWu:h/" " " " " " " " " yzǞ1w&,OO ycd̾[aq#-ыQd*kWn vR}; M &.nXL[Iw, nG7ug+Jݯj~%浡J@lƚc:O}۱ WD@{gS[l$f
aN`dw+Q
GZ{j:ǒK=ǴSO7Y:08 Y_-" " " " " " " " "ts=\{zzl]ъ69ƙϸ Xc]zהJ<f{gOOb|792 k.wͪ+r{Ma}`T$`,ްK;]h.2{ !U듙D02[ aly(#̅ڹRܜ$0r.q96-BMyL`1ҥKẅwU{77^1=:|SS x]}6A2mWˤ1+>JsJzk۸:6 kچ81B.ke5,7)wpkc/ok i]Mإ`M[f?k_{3Nm\}챶c__yV (Rb,W|H=,`
c֞WrLY"'" " " " " " " " "4KQ46~c֒}en|Yv\b'g[Fr;zU䃛,m'a¸>mb7ګw7 $_Qׇi'GqO hWBw<l+/uYЈU!vʀ}6Z( >
ˍ#"$.-. tLq|t!Ҳɉ,>`Qo>hZg?A˙w}ǶfM T7ykfO<؟&(?֯aJ`jfXPa V֨jW X\k#ȕ<.\ iU~]K-).Ңh}[Y^l%ADi((+)(j@(UdF MND@D@D@D@D@D@D@D@D`i `NX o~;8%h}{$cYo>٩S~~;Ί 'dx]ī7G'zzmnƴWnomӗ~6Lc< DI57vҠ
ጜ,9 K~ T| xO~2Z"}ƻ6 ]"///F7]3]Fj+Kݯ,f+Úgs쯞:f;W??X֎Uv?<ioZIt v<(g/
a0
wDݱfhl܆Ca''" Y'0zPD@D@D@D@D@D@D@D@D@D@ ,n/_~[~} ~?8-2V9s'k~C __4Wl{X4ڛ7ڍnTO EO_\X n<NC\[YDq^{㚍QS-3qī>Roni8%radR∀x] D`4XQ =z !NG<<<lc2{ӛ GZof `<Hlɳ-Eݳg
ӧ0oOK\ ,O4x6{UķNpuW5ck'"#v"
w#4̢`·B[-T:k;ָ :{# )2%ɓ/Xc٭[Fa5Hַ//FYGؖ-[c bcJc֠X7e.q/
1rEej7 `[ڬ<}Vog_ZoUeQ$ >ag߰lG7a}wf}H=yr#&zonѰDm(8! S+Yqh{_hbϞ ȹGzlCqI?L9}x={-kXm{$IE!" " " " " " " " " "l0u?lCCCm6{fzliۉCٟٟ'> {ꩧ쳟=LCީֲ7n Ξ=-g |(bU|$===Q]jU:k gIQ5Օ[yiu^ qkX]j +Ra{Po~pqKXc7Tۃ-s68ǐ23~6µ! &g<(>c_{+4HVIm 8Ϙv
{=" xXɉ@:\;70 s" !/$O=& eyr" " " " " " " " " Gi~~jjj "m&5Xfo1qgg!w߾}:[w644>{W^m>hpw}cǎi`BϞ >swv6VɋaM C],ȉvǷOVk۾M5hPl_jaøl' vulBuzfsaG`K\Tf~.oyؘbܙq,'I#phAQyH<t|H%20K ?z [hXS3\ {Xݲ1ǘ ~~g6/Xn]rtuu7hw-.A?XZ Xf M yI]NޱVY^֍EDIDXËhO'nãQ˷=-%%% (1xamhWJ] =
'6NJ# رcqz~vQ G y > P~U+ 9?1vС۳g 9r$G\GGuuuEvVE@D@D@D@D@D@D@D@D` 8`̑#u\8`250`oX5 ~
P [/Δd*kAzft(: ږnaoh wƏ$@;_J" `e˖) Wu)?Qǃp[KKK| Y~}ru܊h;jL5<GtDֹ{M7r_D@ V~%8K(.XגqƘ|k'.S*TUU٪UbXKhҹ@ .ҦIO,|<~c$#" " " " " " " " " " " "?~6]% vqy4L@
j[S Xou>o>Ҋ@$fJJF`xxFGG˧KND`ݼy3UVVdQQT<#Qw&:
X(hFWv;{544x6D0vObɈsUUUVSS3%ى'b ;vXccc,ҥK6666yUWW[iiT^ GPfP+_X|܍1H
cL-2vab0i%VV\hVXpwÙ_ڄծG'y< . .^EJ3g֯X^r%)5 \|4ԩSzj+))mӵڿ[.] |uuu뭮.X;FY.P" " " " " " " " ˈ c̬cEE2j6qqUVe43׆
lܚW[]eKWig%ƄxxA5[I3BΚN% yy3eA(y
CX_Ǐ'DV>( -P XcӧO֭[c::S-uwwGK`Z05~c'iА=#QM!" " " " " " " " yE1Hf1 aʼjRTHJls.mնsc%+aBF[ 0;62d
0^3 Jw܇rKK@_#A+) fc|@7Z[[[@@%+;{&X""2U磘{(pE}ȩRNLߜhϞY f" " " " " " " " "p 1c lǘ$rw`0cwƚ=yg}*7o[yeU0-B칬V<qpl@jdž@\bh
W[
ʨ,qVthW_#*"Ln۶-N]?@WmX"nٲ%ZR+!J .>X3BT>HǴLqU-x\& %1 0~,1*LD@D@D@D@D@D@D@D@&d1` ɓqIT(10d͚5ql^ Y?Gv5 c7_~ٞ;W
N ] 'l]ei`Ϥ_$;'qxdN9g zː۬q} x^b@W`y<X"8FQc7@; +.>~0>[Yޑ>eOXL^V&yiZ2^ϝ;g/^Zv`
F\~9 0Hk1F 9:0l7q`- nPmO <oϞ`ݗlt<,36ܛgK؞&ײ&p9z6p}f{ޤ-N>MLqiI?PGw&3ll<\ӆ}v0 iuJh/Oak7@ϱh4ָa}@:\Ktq2
<|i\'6ׯ2 " C|
];\Hj]A#
kRtӥ;?[y"cN}߾}Q-]픁 XCWkl>I+'" " " " " " " " "0; =֮]cl0J{umqVgwg qv
Ƀ&Ư;[A>:1>#
K RdEg p t{
2Pqtqԉ{0][6FYbUT+AԭUSiƨ i{Xe6nic֯ϊ;:,T̞
*].{tׯ_Cխe ; $:\\wwwdD</}]Y~ɅPxPPU]Kvkjj~Dh^L0C>qD\'צź6K0[T>" " " " " " " " " " ˇ 1%/3^͘3QS6x9Ӆ[~tgϞ83䙰3cr))]<L%ͬQl@U<c.fD% "?Θ2sx,LAu:{RkBT,͛#mJ˭q{=Sn?o
òPvݍvT 9n5U6[.\q <i{ЖlWw@dWV./d `qy-tX""PrPvɽ]^^ _+"^K8ʅO/(tX-iJ'" " " " " " " " " "20q'%̌7326HKt1}Y1jƯSS<aǑL
1>
0F!mkL50@eZsh1JLeB87G(4omۂf ku!c;ƫJK lnhݷ3vd{ȿ6[,\g G7lg -4 Gl9ѱq;i 칃GvԸ.s3'x1%. Y֯nE:Ѥ(AW3gϞS2ɦàS߹sg(̽K>L3ӧmSYR /L^ 9&>xp,'" " " " " " " " " " w#2X21c툙YcmD.2 M\UfdGƩ|Y&NxcL]FKHKlq:M 67n'ԙw6[^G1EAAb4rf=u > 4d ZY1X jҐkKsY ]=6 x{. };!GCs/KGOY
+$f.S wUZ8u swx@ O<; 7N8tқ7o/ :`RرcǜIh^$S'AL[ KY^xp,t===1>Ht.s,^E@D@D@D@D@D@D@D@D@D@@KΦcqeL9
Hq1{0"aX2>^GqaU¸603hx7FJ8f&M!c=K<ʣ:/ԙ<ɛ:P?ꌎXK^ߕ ;u֞?x,NVA^Njq-cu?dW6؞6bUutt<;ttd9Xξx(}1}wǛڮ-V^V:ctyj\2ˬ^*_й@x8c/ 91u;|& d%fԕmGM
m>PPh txD@D@D@D@D@D@D@D@D@D` 0Z4,v#%#7m"aXjr<s.xݖi{t`onav<L`#(ftEX;WcɊ 5E@Ee|է*FDuqcbVL#XaZ⚚3/~qsCzĞr\čW?{$9i/aƍ(0uYE<]Sf 60=79(V/^`qE& 0w^ֿ'qscg t{)[u^|$.X. M:]~y'_YhKMXسEGڇiB9^ůT
X"B"D@D@D@D@D@D@D@D@D@D` -mVp'wmyK ڍ8M, ^V@-8q
>A u2, N.յV=2?I WQ w?&b)VKs q1x6Ÿ%_^0ƍ6-tLUL: i*4sQo6gy[HK]=h3 ѰKO"Җׯej b6=VX eӆ7˓jccqbnغ&%%saZ 0#+
z
Vo%{ ztt8` z:{wtX 9r$>X&;p=e!ξ+Q(ge^Bu5,//Di4e~
D}~Ϸ>J/" " " " " " " " " w%P^az̊&[Iyk?`WTPla70A
VrN YK<Jlxv߰
pYPTǐG-9xXbX8KX=cԌ?ojj #2fyƵv1m&OݻwJ$J #28e1`j .:8yP<ۣK9oذ!I<hkRw |,=7Ă? L |"9;)z[6Q*4B°nu6H{j_(rҷ7 'lV[ݗ#'
SPGM@w] ]_bVYE㤃Mut>m*/^ tXQ[: NzrL0 G S8nwɆ <,ER ^D@D@D@D@D@D@D@D@D@M X؍MVX H[x];ch< dy ]s "ڥ̆k$WspYK,Y1bfKf=9nglZV0nU,k2lKK5c3Ot c<<ɘ8z o߾=֕soY/QC`L ZFӕ{k/k=q=iO Ή+.g ؿ*+5\KRtt_uٿ5\!{1W8 *ϵ+ e0 )N,RJͽklkD رctl?3%s3e[{6`ħL;y1e| ͖w&xܹ3<fYya`%K8-a< $Pq'ڍ_U|7Ο4+
%Fkم,Yy#xVڅ7<a_D dQdưSǹ8@)cԈ#\hsX8cФ%MK^Pqs?nE0t 3MzeqOzfcy9|7nX.KF\v#GCOA5gS[\KlWӶ*V8W]Vp-KW,-[GWx{ Jus߹=X2F$~ xGNǟS//=^&&=/ÇOY;$ xX6̳Wgsi|r! kb^>r" " " " " " " " " "tUkX?j%G%BBl$L-ܰ:8ưoI\qqrư3q/31c==ihɋ-<ocp1IqjOٓ+X){&ǏЊU+We˖h9/#"@T闩M;S iOtءc'mFq4-Q֜ݱuݹ-k^otXqQhiרrۅ;ƽt]|Eq'Pr6yceo5LM=tt[nsTtnJgLg96:V 8lwɰ,6I~tLis?nNi;*F9Iv}%eQi
vaN+l|ϊ\`i`K'M Lַ֣u]7n 4IDAT+cƌ#8k6c<;#bJܻX9cqg g^iYC lō8L5,oj]}gdfdͶH^ R/Ը>, H^Ƃ5酞+JS ?5&ۿ{8 p]ϴwؚGvڅcI˚ / : ֤
K=t 7Lk| ulr_w1U)x訙?S3_ y"O:{!^F^6:3q)?xeeOp˃ {]''" " " " " " " " " I2~8eizv#<g1K _PH#wՂ=6,d6,DFƲXٻ@cw+X.bC' ڧ )qi ƑS⬕n=ԛs~ [fMA\%>X?Z % euttDc0gk֦{^Cqho}mmX`7l<XWvnba\: ̅L>Kḯ7nXך7`㣓K>R~QUYa[u9lRv˔@UB @Hs!;V_H ԺHC/ppK&N'4ټysl uacqskerY/x{Q !" " " " " " " " " 0ɘ.cEn(ǂ0;͍^D0͚Þ1aDI6]Ĝ.M\;#v =z4E:1&#OL/S oڴɚq=Z@zDXW)ï;.bգ,bb?]g 1:sgǎ q
Z^YKG 6S͗
3mئ
mg:lsX,c۶6ہݭi٥n+? 6gW0YA;yӪWW-iZ(-
:t.5x6Gz8Iԝ20bKօ &6x8>)0M" " " " " " " " " "Mw8909q1z5^`[R% n,m cnM3a33%*#_M04☴ וe{ Y\UI#f Xvm tq6al` }u.xf/qn :b f};Şg·O[K>r29;ݲv[8y^:|zх&> ׳bahIܮel$&i/L%y0t
=xڋB@¹(8B3ΰwYO<dPTxQELƜkmmFUQ<%=לmz {s9ҳm9p@SaR6B,2ԉlNe H v=0!mn"V}o6=qvddٗ gCs}M{>:\X'9u
qwS ^D%&`+D_yq$x3,/M"gLJֺxZovA~n51pooo.I){z,"~#.]Xj I؛tsǽNeĸ] [y^|DhJ5oZoܿ;WtD}0 sS0 v ^9jL/YA_ ܿ#3OV%S /0eZq1wuuٶm$f
PD@D@D@D@D@D@D@D@D@O"&cX,x=Wd't4o3x82ɬK^/Yv2dx.^\S_6cv%*G{yY[]Uak&͵iƭ{1r8y:ۿk{{:W鏹FGG\pNwGWyI]l*Ona`F#*BOݻ
)" " " " " " " " " A2)L/>Ӓ6(˸2ίW:ϴ,[ A !py~jXjWʊ.]OwۋվIXݭVW:'Xv7m\Đ {!X^|
a$;bg;.vf!z|Lv,vq!"3EȋK/j{W _=qZ3 X IaoW gqXƕSǜ]bR{A `<u5mksc5k([ xFsFeC-h=,g_b@X+wӆAnuӧ-»q#tH=Et:(@GU[x(;S+Ȟ_;1%~bwaÆ;^3pGN'?iO=T GvY _f?Lt4iZSҹ|3fvm?e/ <1M-.B]+n
lMZ}6o\_>|ִag^+ S%߿B$.6, r)reHb
___ {c;wZ}YP#D@D@D@D@D@D@D@D@D@D@f$Xr :tȎ 9bwq&8>n?c:3nX[kve
[)kn\oa56Z%%ֺecHSlϽ|.v8b7GF%[UVj hf5@ %"@ǚڡz{w.Բ_z1'S wժUQ% 3|1ar" ,ܴz]|QXYZ5|?M5n>[uoMmIȜ2gRc Y W>9>Lo#A7nFř]# c< 'LNB K5Ua*608dX6mazf u4Awl|̞}h-
~myi9$Ny2^xI4y|i+YfM{{{Bٓؒ矮sYn#1<<dEťVȇ([ MN]2:z3֔>4|ȉ| '=}J{d*Fw q:'"pn/=~|`}Q&}ŏ̋cē<iho&xi֏k^i'yf'r!Uec[sKSV}p[Wжl ;xڬq]CY|< 9T\% $x %)yc%}10% ͝}O0ݮ-ig~K0W˹ރ~/gkϳ¯ KJ˂@~I (G9<(Z>D@D`9?oJ/" " }ûw 9 -sV+5&F 2(3 3F~~L {?ts7k@Xh F%j6JC* FnQVZb[7qʪ*ʭvigʍ l Vf ֭)j^K˦J/5:G رclhhoG @Ç?6Y'| 'Εc i[kkk̇gKK ?~<L7o 6cjllS '5֭3gD Ν ckAmm={vO|ªcZ`*e'c[QQ1jʢ ꁟ~~wy[~}eWÆ
C|g7n ߴiSŢE ? /^onn]t)5~z g1ٳ 0WN\T?kBp
xfR===S~EC;hyvwwǶ lp0 T瞂31 qܟz·USS1˽ӎl~V>ld^r" "0 ޟ~>y)dB9$∀L"}y .Yqr5uX [2<8Cqɒ"
.صT2844A\Uf\Xy<Ը6ޏ-fCq//ڍW`њD`q С-#(q{8{^_
{_b8I?b(DŽ#{|{ 8䏟ϱI!C~ϟ+8K=E~ԏpI>rɇ8Cy ?G(8OwGχv=T?ey )~&.6 ~>?h3I?q(䓌C/u?YR
~
a/'" !@>DZ,4;]e)X.wHGmJ(w]d3 Ćs?n%,!>~<\E%P\ gԽz>~0q5mZ-[~asFvrW
D aaNhOJ+N_p.Q#O;I ፍS'cAɎc/?3I `&KN;ɖlk0ɶq[-&g利19S O>~fX9f>zTD@D`0S ~)'"0xnx~xv`fVZ,G}W>O7o8<.cl~qsca~<;`XƋп]kl,,qKR[SW n'3b"w 3 `.Ϭݢ->ewN;vE <ppO==^w%^&疣?ڔ佒\$ _'߂}ʳSM+s;$é пҧɉbwL!ˁ@M.+6msv< 'uϻ065d84ku`VpK䖖ڥW ^t9^81wqpc{c^V#1(<lo}/2D?L1-'" %7?Wo" " "043QRI 9rwRJ&y0f=#%o7p S7'Cô_ .Ni*e H]+W ^l:ؙ^xH=>X b{Zߓ.|L1ӳ| Lgu%T%D@ _^^BUZD@@6//*D)yv8tK-y3~+cZ Ny C|9! va*W /R?KcieJ 9yp?^V*-
?jdcg} ۰R-"=}GU9DXV*\D6䳣o\仓'%'c_qҟ?oe$Xhr) /Q?Ə`>8B.~pOKxϱt>gQtQݛ[B@\T4F3CrҪ@>>o[" :7=8wkT{X<]?o+]%:qӭ a>ׯK>O'7rq"''Ϲ@xEIg =>r7L?2Mw|q8p P!zd665 =ǝ),y^~X x6x֊
,Y6B&I Zԙ.랳PU1''l}yE@D@D x]^ND 3
ώ ̌JŽϳx+|y8|<>q{Ozڋd5;)eJɓ6<<l0y{'?GM^jgΜVQQqG4!sv
۾}եa3+KE ֳ n% pq<?" LGmLq<>>6<m>dZt " ềD8BS4ysͩϼ3T"Bw \!}d 5f0G9ݯc=Cln8<iX<hu^ċܹseCCC622PԽqVVVqO'?00`QM
~ڵk1ӧdZz#677Ǐi'SKY)sˑ0X<.{6 UH τOS,hD5ɠ]m F(%'~CM@'?{17B@fxvxfۍc9H%c|>N 'ss]-%Ӻ}9E@C@mv8.\@0˗ww[n* 9)y`:4yc iӦhˇu]8'HIqS RcˉJ%@_la1&Z3ȹ:B" yEo yUyUVD@D ߪwGByUX@١g.*2 }8s:֎xg<a /ݞ09# vX]It.\`'NvXƶpi_+sƒGmmڵˮ\2eqvژyHKLk g'Si`~Oy9c6ELC;?t\[135NŊ96E<{'.3ώLT Xg2V%"އ><n%x{Wҟ k/"0$. e+kGG={6Nk\^^n۶mbwL[b9L ᶪʎ 92ŋ#-nSSӴt _ߒ7k40s zQ^:97[<dHg'RTha EyG(űT@W_I!| ˤJ$5沼jg8=5w-ET{XLE@rܸ9U :k;~xE$=bla= K,a;~ZI,k< .krl
4555Sx10.R m)n"Y&nx.MkM8{Zs l's^liي'B{
C-3/uKfw EQ')`ڴ
nwI" " "a/'"vGfm{D}l_ty2 qix '$X8hmƴ8J:kc:bwxG %5KZ°eԎ8;88E=-V7o-[L;<KyM-@|X>Xv9%
{)zPO1u :0<kBqRޯ+爗K wIr"_^.Na.hY- 9 ث" GoSWD@D@D`1=A[e,<78v>#;+q\L{2|di+ɟd$jy_H=˻5Zbׯ/vDׯG?V1ppIݏhKx85, F`{~8( #!#nj|?
G??=uvbG=3i]\]eO;|]14BfjiέZʮ^M!nuu'mLCzX.בz.SG=k
ua}b,zki' M{tj .5;OLU$m3 EV*[o9X VND`n#߃scRbӷ3$Ó~Z~cWڞgǟ@흝@6T ^g|XEDCd-XSNE?B. b!;sgQ/SGZ'Bn25H1+"mee唵j2MO|OBE#bJްpB[B 34".8./b ;7Ŝ w_l7O>m]]]Sq]>\f}b֔Y6fZ7L x?3T+ QI OD`y_7,.oS9 3gb\ cL,5,y~%{ =?+gVGxnI$Η2NOnj 47~c:*7MHCE#;B7lwgK9aA
E4iZBEdcLf.pA͖(RsE"tsNfو0]bX~epe3(- I@L{7nhoo(LJ<dezshb;+ }6r^<y9X|(t.5 I -gll~hd9#ws.~"$pb
S#FAD$(z1io>e陚]6ځ%
RbS J۱~Ef#Oؓ'O`cL[jkYK Dj\7`]{2iț2/ג
+ilX{bX2 J/]։|$.,i~ED:G?:D={DKW/]* Qg4<ԅX2 3$Ɋ;kGDD0=qDXͶZS&B*\'E{= qiDl%?i+su )2㈋8g,87# ѣn˜-9Xh9~O?ΓϯU." " " " " " " "k䭸" ' 3\q9 atⓩ|Y7Ce]X"rrnӦMqc&!BeRsǎ z{{c[b+V,`;qsp?Ǟ: suibO<o?iuVi;L̹XLy(\r -ju:$LLݻ" " " " " " " " L@D|TF@J^=)֞.βjUUUI\g G }#*Q"G8zkR[DPf`uNJnEd$
uɆ^w_iS2,- i3uIuxwQsɰT?\;tҴuiӁyXD 2yv[rWh
I5$b ֑L$B"LK(&0u/ְ +CEDC(gC%-uADmkk&!+SNE1uWi
ۂU+hO-;c1?e7nPK8&' cġpq-Ydyڵkq:dl~LX&x===Qw1?ǚ0\&}.vݦ9gvjD@D@D@D@D@D@D@D@D@D@RHD<UDZU0o CDC^\ˣЋEqR"qakX],wRvΝQXM9^CYK y(7[z#uqaD]siXR72 panu$ճKzN<OzS'3-3u>!?oW2" " " " " " " " " " " " $N +&"B#bmۦ*J"łѣxQ|L#bI Az=sL:6D]6Epd
]5qXĭ0*2"-B2u@%<I3_Gٴ)/("4B C@łr#aD|tmM֗u2֭X1諾\pOG~Ihu'%*"&B""!" B!" pX"9s&
CD$jaA_JŊOI"%pky1
2V #mkkk,Dip]Y\˔Lˌ/\A<hB'S.SoQWFޙxHy b}bzq=<Gmrk0o.y+ xb>V\49%rSis b!~m 8DX/Fxus>%1Ex8G8 v""Hf(
ODڳ2}
0B Y HIdF#`H>0$ aF/Bh -bI7gҏ L I] I_r ?/))-4Snʁp ^`^a_b_gi?/ p&'pߡ<eI%ezܽuHOQ{;vF @ @ #볙 "+M=Q1ϕW$YipW {)|ܺu٦eg\a2RX̭l`n\s ~X__GvXQ-3N6:lZ :Mh M6wS][[pns,wifR<۰cm/&@ @ @ ̺_|-Ղj;?mǕ}ώqQ;z3E*:!w^Sm37^s<O6̈osYMXkNK @ @ @YP=ggiSbsLϜSMa6Ϥmfe] @ @ @?
XI۷o7o~'zrnugBk]I @ @ phOp(!y^l
OQjX @ @ @ O@ [ k @ @ @ '+0w @ @ @ ̎k @ @ @ P=` @ @ @ ̎k @ @ @ P=` @ @ @ ̎ktsssvj8q;2s n:f9n};g ɕVyn$ @ @ 0 > ctKw\9wkcT`~~<}\zxbh\vZyYy}~ >4ӧO'OʧOʕ+WJϟ?7GÇVtRIC|Ŧww\pu <xP`Br~i9Ymmn;^&O<g,:q=HԜɗ}$ϰ8묬&O>G:Nm cH 8F ?./_n85K?9k]sNm_]]-xqC7oޔ&~uye?~UɸH_ޫF3.]f:N S⣎jǣqWjJ\WHI _0ɖq)ga!cv7'F @ @ #߾}]_!5Q1ϕ{f 3&vS4q
|SkyeI5NuSj?SMq,m0N2ŨlTZ~Mm~\#ӎ?~G$N49stq͙ɓk:yl;?ۦ?L;qo01?q!9L NLqJmgqrfiskm3:u|e1Q:'q /yuIX˹ @ @ @Y@^xwo,.732{N#@ U ES?t:G;ޝ*R? o3X#@ @ @ Ltzw%]i&V< ڻ*}5 @ @ @ +@;]_ @ @ @ PS @ @ @ 0]馗 @If @ @ @&y-VvzIf 0y}
Yj @ @ 0}lwMޣ}W=$V5<8&Y9- @`:mY @ @ @`\kWWBcU666rqF? NrMѶݲnZ]kǛ1&Oqaa N@7}qqmO9q @ @ ̐@a7"2LL IENDB` | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/angular/bootbox.min.js | /**
* bootbox.js v4.4.0
*
* http://bootboxjs.com/license.txt
*/
!function (a, b) {
"use strict";
"function" == typeof define && define.amd ? define(["jquery"], b) : "object" == typeof exports ? module.exports = b(require("jquery")) : a.bootbox = b(a.jQuery)
}(this, function a(b, c) {
"use strict";
function d(a) {
var b = q[o.locale];
return b ? b[a] : q.en[a]
}
function e(a, c, d) {
a.stopPropagation(), a.preventDefault();
var e = b.isFunction(d) && d.call(c, a) === !1;
e || c.modal("hide")
}
function f(a) {
var b, c = 0;
for (b in a)c++;
return c
}
function g(a, c) {
var d = 0;
b.each(a, function (a, b) {
c(a, b, d++)
})
}
function h(a) {
var c, d;
if ("object" != typeof a)throw new Error("Please supply an object of options");
if (!a.message)throw new Error("Please specify a message");
return a = b.extend({}, o, a), a.buttons || (a.buttons = {}), c = a.buttons, d = f(c), g(c, function (a, e, f) {
if (b.isFunction(e) && (e = c[a] = {callback: e}), "object" !== b.type(e))throw new Error("button with key " + a + " must be an object");
e.label || (e.label = a), e.className || (e.className = 2 >= d && f === d - 1 ? "btn-success" : "btn-danger")
}), a
}
function i(a, b) {
var c = a.length, d = {};
if (1 > c || c > 2)throw new Error("Invalid argument length");
return 2 === c || "string" == typeof a[0] ? (d[b[0]] = a[0], d[b[1]] = a[1]) : d = a[0], d
}
function j(a, c, d) {
return b.extend(!0, {}, a, i(c, d))
}
function k(a, b, c, d) {
var e = {className: "bootbox-" + a, buttons: l.apply(null, b)};
return m(j(e, d, c), b)
}
function l() {
for (var a = {}, b = 0, c = arguments.length; c > b; b++) {
var e = arguments[b], f = e.toLowerCase(), g = e.toUpperCase();
a[f] = {label: d(g)}
}
return a
}
function m(a, b) {
var d = {};
return g(b, function (a, b) {
d[b] = !0
}), g(a.buttons, function (a) {
if (d[a] === c)throw new Error("button key " + a + " is not allowed (options are " + b.join("\n") + ")")
}), a
}
var n = {
dialog: "<div class='bootbox modal' tabindex='-1' role='dialog'><div class='modal-dialog'><div class='modal-content'><div class='modal-body'><div class='bootbox-body'></div></div></div></div></div>",
header: "<div class='modal-header'><h4 class='modal-title'></h4></div>",
footer: "<div class='modal-footer'></div>",
closeButton: "<button type='button' class='bootbox-close-button close' data-dismiss='modal' aria-hidden='true'>×</button>",
form: "<form class='bootbox-form'></form>",
inputs: {
text: "<input class='bootbox-input bootbox-input-text form-control' autocomplete=off type=text />",
textarea: "<textarea class='bootbox-input bootbox-input-textarea form-control'></textarea>",
email: "<input class='bootbox-input bootbox-input-email form-control' autocomplete='off' type='email' />",
select: "<select class='bootbox-input bootbox-input-select form-control'></select>",
checkbox: "<div class='checkbox'><label><input class='bootbox-input bootbox-input-checkbox' type='checkbox' /></label></div>",
date: "<input class='bootbox-input bootbox-input-date form-control' autocomplete=off type='date' />",
time: "<input class='bootbox-input bootbox-input-time form-control' autocomplete=off type='time' />",
number: "<input class='bootbox-input bootbox-input-number form-control' autocomplete=off type='number' />",
password: "<input class='bootbox-input bootbox-input-password form-control' autocomplete='off' type='password' />"
}
}, o = {
locale: "zh_CN",
backdrop: "static",
animate: !0,
className: null,
closeButton: !0,
show: !0,
container: "body"
}, p = {};
p.alert = function () {
var a;
if (a = k("alert", ["ok"], ["message", "callback"], arguments), a.callback && !b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");
return a.buttons.ok.callback = a.onEscape = function () {
return b.isFunction(a.callback) ? a.callback.call(this) : !0
}, p.dialog(a)
}, p.confirm = function () {
var a;
if (a = k("confirm", ["cancel", "confirm"], ["message", "callback"], arguments), a.buttons.cancel.callback = a.onEscape = function () {
return a.callback.call(this, !1)
}, a.buttons.confirm.callback = function () {
return a.callback.call(this, !0)
}, !b.isFunction(a.callback))throw new Error("confirm requires a callback");
return p.dialog(a)
}, p.prompt = function () {
var a, d, e, f, h, i, k;
if (f = b(n.form), d = {
className: "bootbox-prompt",
buttons: l("cancel", "confirm"),
value: "",
inputType: "text"
}, a = m(j(d, arguments, ["title", "callback"]), ["cancel", "confirm"]), i = a.show === c ? !0 : a.show, a.message = f, a.buttons.cancel.callback = a.onEscape = function () {
return a.callback.call(this, null)
}, a.buttons.confirm.callback = function () {
var c;
switch (a.inputType) {
case"text":
case"textarea":
case"email":
case"select":
case"date":
case"time":
case"number":
case"password":
c = h.val();
break;
case"checkbox":
var d = h.find("input:checked");
c = [], g(d, function (a, d) {
c.push(b(d).val())
})
}
return a.callback.call(this, c)
}, a.show = !1, !a.title)throw new Error("prompt requires a title");
if (!b.isFunction(a.callback))throw new Error("prompt requires a callback");
if (!n.inputs[a.inputType])throw new Error("invalid prompt type");
switch (h = b(n.inputs[a.inputType]), a.inputType) {
case"text":
case"textarea":
case"email":
case"date":
case"time":
case"number":
case"password":
h.val(a.value);
break;
case"select":
var o = {};
if (k = a.inputOptions || [], !b.isArray(k))throw new Error("Please pass an array of input options");
if (!k.length)throw new Error("prompt with select requires options");
g(k, function (a, d) {
var e = h;
if (d.value === c || d.text === c)throw new Error("given options in wrong format");
d.group && (o[d.group] || (o[d.group] = b("<optgroup/>").attr("label", d.group)), e = o[d.group]), e.append("<option value='" + d.value + "'>" + d.text + "</option>")
}), g(o, function (a, b) {
h.append(b)
}), h.val(a.value);
break;
case"checkbox":
var q = b.isArray(a.value) ? a.value : [a.value];
if (k = a.inputOptions || [], !k.length)throw new Error("prompt with checkbox requires options");
if (!k[0].value || !k[0].text)throw new Error("given options in wrong format");
h = b("<div/>"), g(k, function (c, d) {
var e = b(n.inputs[a.inputType]);
e.find("input").attr("value", d.value), e.find("label").append(d.text), g(q, function (a, b) {
b === d.value && e.find("input").prop("checked", !0)
}), h.append(e)
})
}
return a.placeholder && h.attr("placeholder", a.placeholder), a.pattern && h.attr("pattern", a.pattern), a.maxlength && h.attr("maxlength", a.maxlength), f.append(h), f.on("submit", function (a) {
a.preventDefault(), a.stopPropagation(), e.find(".btn-primary").click()
}), e = p.dialog(a), e.off("shown.bs.modal"), e.on("shown.bs.modal", function () {
h.focus()
}), i === !0 && e.modal("show"), e
}, p.dialog = function (a) {
a = h(a);
var d = b(n.dialog), f = d.find(".modal-dialog"), i = d.find(".modal-body"), j = a.buttons, k = "", l = {onEscape: a.onEscape};
if (b.fn.modal === c)throw new Error("$.fn.modal is not defined; please double check you have included the Bootstrap JavaScript library. See http://getbootstrap.com/javascript/ for more details.");
if (g(j, function (a, b) {
k += "<button data-bb-handler='" + a + "' type='button' class='btn " + b.className + "'>" + b.label + "</button> ", l[a] = b.callback
}), i.find(".bootbox-body").html(a.message), a.animate === !0 && d.addClass("fade"), a.className && d.addClass(a.className), "large" === a.size ? f.addClass("modal-lg") : "small" === a.size && f.addClass("modal-sm"), a.title && i.before(n.header), a.closeButton) {
var m = b(n.closeButton);
a.title ? d.find(".modal-header").prepend(m) : m.css("margin-top", "-10px").prependTo(i)
}
return a.title && d.find(".modal-title").html(a.title), k.length && (i.after(n.footer), d.find(".modal-footer").html(k)), d.on("hidden.bs.modal", function (a) {
a.target === this && d.remove()
}), d.on("shown.bs.modal", function () {
d.find(".btn-primary:first").focus()
}), "static" !== a.backdrop && d.on("click.dismiss.bs.modal", function (a) {
d.children(".modal-backdrop").length && (a.currentTarget = d.children(".modal-backdrop").get(0)), a.target === a.currentTarget && d.trigger("escape.close.bb")
}), d.on("escape.close.bb", function (a) {
l.onEscape && e(a, d, l.onEscape)
}), d.on("click", ".modal-footer button", function (a) {
var c = b(this).data("bb-handler");
e(a, d, l[c])
}), d.on("click", ".bootbox-close-button", function (a) {
e(a, d, l.onEscape)
}), d.on("keyup", function (a) {
27 === a.which && d.trigger("escape.close.bb")
}), b(a.container).append(d), d.modal({
backdrop: a.backdrop ? "static" : !1,
keyboard: !1,
show: !1
}), a.show && d.modal("show"), d
}, p.setDefaults = function () {
var a = {};
2 === arguments.length ? a[arguments[0]] = arguments[1] : a = arguments[0], b.extend(o, a)
}, p.hideAll = function () {
return b(".bootbox").modal("hide"), p
};
var q = {
bg_BG: {OK: "Ок", CANCEL: "Отказ", CONFIRM: "Потвърждавам"},
br: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Sim"},
cs: {OK: "OK", CANCEL: "Zrušit", CONFIRM: "Potvrdit"},
da: {OK: "OK", CANCEL: "Annuller", CONFIRM: "Accepter"},
de: {OK: "OK", CANCEL: "Abbrechen", CONFIRM: "Akzeptieren"},
el: {OK: "Εντάξει", CANCEL: "Ακύρωση", CONFIRM: "Επιβεβαίωση"},
en: {OK: "OK", CANCEL: "Cancel", CONFIRM: "OK"},
es: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Aceptar"},
et: {OK: "OK", CANCEL: "Katkesta", CONFIRM: "OK"},
fa: {OK: "قبول", CANCEL: "لغو", CONFIRM: "تایید"},
fi: {OK: "OK", CANCEL: "Peruuta", CONFIRM: "OK"},
fr: {OK: "OK", CANCEL: "Annuler", CONFIRM: "D'accord"},
he: {OK: "אישור", CANCEL: "ביטול", CONFIRM: "אישור"},
hu: {OK: "OK", CANCEL: "Mégsem", CONFIRM: "Megerősít"},
hr: {OK: "OK", CANCEL: "Odustani", CONFIRM: "Potvrdi"},
id: {OK: "OK", CANCEL: "Batal", CONFIRM: "OK"},
it: {OK: "OK", CANCEL: "Annulla", CONFIRM: "Conferma"},
ja: {OK: "OK", CANCEL: "キャンセル", CONFIRM: "確認"},
lt: {OK: "Gerai", CANCEL: "Atšaukti", CONFIRM: "Patvirtinti"},
lv: {OK: "Labi", CANCEL: "Atcelt", CONFIRM: "Apstiprināt"},
nl: {OK: "OK", CANCEL: "Annuleren", CONFIRM: "Accepteren"},
no: {OK: "OK", CANCEL: "Avbryt", CONFIRM: "OK"},
pl: {OK: "OK", CANCEL: "Anuluj", CONFIRM: "Potwierdź"},
pt: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Confirmar"},
ru: {OK: "OK", CANCEL: "Отмена", CONFIRM: "Применить"},
sq: {OK: "OK", CANCEL: "Anulo", CONFIRM: "Prano"},
sv: {OK: "OK", CANCEL: "Avbryt", CONFIRM: "OK"},
th: {OK: "ตกลง", CANCEL: "ยกเลิก", CONFIRM: "ยืนยัน"},
tr: {OK: "Tamam", CANCEL: "İptal", CONFIRM: "Onayla"},
zh_CN: {OK: "确定", CANCEL: "取消", CONFIRM: "确认"},
zh_TW: {OK: "OK", CANCEL: "取消", CONFIRM: "確認"}
};
return p.addLocale = function (a, c) {
return b.each(["OK", "CANCEL", "CONFIRM"], function (a, b) {
if (!c[b])throw new Error("Please supply a translation for '" + b + "'")
}), q[a] = {OK: c.OK, CANCEL: c.CANCEL, CONFIRM: c.CONFIRM}, p
}, p.removeLocale = function (a) {
return delete q[a], p
}, p.setLocale = function (a) {
return p.setDefaults("locale", a)
}, p.init = function (c) {
return a(c || b)
}, p
});
| /**
* bootbox.js v4.4.0
*
* http://bootboxjs.com/license.txt
*/
!function (a, b) {
"use strict";
"function" == typeof define && define.amd ? define(["jquery"], b) : "object" == typeof exports ? module.exports = b(require("jquery")) : a.bootbox = b(a.jQuery)
}(this, function a(b, c) {
"use strict";
function d(a) {
var b = q[o.locale];
return b ? b[a] : q.en[a]
}
function e(a, c, d) {
a.stopPropagation(), a.preventDefault();
var e = b.isFunction(d) && d.call(c, a) === !1;
e || c.modal("hide")
}
function f(a) {
var b, c = 0;
for (b in a)c++;
return c
}
function g(a, c) {
var d = 0;
b.each(a, function (a, b) {
c(a, b, d++)
})
}
function h(a) {
var c, d;
if ("object" != typeof a)throw new Error("Please supply an object of options");
if (!a.message)throw new Error("Please specify a message");
return a = b.extend({}, o, a), a.buttons || (a.buttons = {}), c = a.buttons, d = f(c), g(c, function (a, e, f) {
if (b.isFunction(e) && (e = c[a] = {callback: e}), "object" !== b.type(e))throw new Error("button with key " + a + " must be an object");
e.label || (e.label = a), e.className || (e.className = 2 >= d && f === d - 1 ? "btn-success" : "btn-danger")
}), a
}
function i(a, b) {
var c = a.length, d = {};
if (1 > c || c > 2)throw new Error("Invalid argument length");
return 2 === c || "string" == typeof a[0] ? (d[b[0]] = a[0], d[b[1]] = a[1]) : d = a[0], d
}
function j(a, c, d) {
return b.extend(!0, {}, a, i(c, d))
}
function k(a, b, c, d) {
var e = {className: "bootbox-" + a, buttons: l.apply(null, b)};
return m(j(e, d, c), b)
}
function l() {
for (var a = {}, b = 0, c = arguments.length; c > b; b++) {
var e = arguments[b], f = e.toLowerCase(), g = e.toUpperCase();
a[f] = {label: d(g)}
}
return a
}
function m(a, b) {
var d = {};
return g(b, function (a, b) {
d[b] = !0
}), g(a.buttons, function (a) {
if (d[a] === c)throw new Error("button key " + a + " is not allowed (options are " + b.join("\n") + ")")
}), a
}
var n = {
dialog: "<div class='bootbox modal' tabindex='-1' role='dialog'><div class='modal-dialog'><div class='modal-content'><div class='modal-body'><div class='bootbox-body'></div></div></div></div></div>",
header: "<div class='modal-header'><h4 class='modal-title'></h4></div>",
footer: "<div class='modal-footer'></div>",
closeButton: "<button type='button' class='bootbox-close-button close' data-dismiss='modal' aria-hidden='true'>×</button>",
form: "<form class='bootbox-form'></form>",
inputs: {
text: "<input class='bootbox-input bootbox-input-text form-control' autocomplete=off type=text />",
textarea: "<textarea class='bootbox-input bootbox-input-textarea form-control'></textarea>",
email: "<input class='bootbox-input bootbox-input-email form-control' autocomplete='off' type='email' />",
select: "<select class='bootbox-input bootbox-input-select form-control'></select>",
checkbox: "<div class='checkbox'><label><input class='bootbox-input bootbox-input-checkbox' type='checkbox' /></label></div>",
date: "<input class='bootbox-input bootbox-input-date form-control' autocomplete=off type='date' />",
time: "<input class='bootbox-input bootbox-input-time form-control' autocomplete=off type='time' />",
number: "<input class='bootbox-input bootbox-input-number form-control' autocomplete=off type='number' />",
password: "<input class='bootbox-input bootbox-input-password form-control' autocomplete='off' type='password' />"
}
}, o = {
locale: "zh_CN",
backdrop: "static",
animate: !0,
className: null,
closeButton: !0,
show: !0,
container: "body"
}, p = {};
p.alert = function () {
var a;
if (a = k("alert", ["ok"], ["message", "callback"], arguments), a.callback && !b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");
return a.buttons.ok.callback = a.onEscape = function () {
return b.isFunction(a.callback) ? a.callback.call(this) : !0
}, p.dialog(a)
}, p.confirm = function () {
var a;
if (a = k("confirm", ["cancel", "confirm"], ["message", "callback"], arguments), a.buttons.cancel.callback = a.onEscape = function () {
return a.callback.call(this, !1)
}, a.buttons.confirm.callback = function () {
return a.callback.call(this, !0)
}, !b.isFunction(a.callback))throw new Error("confirm requires a callback");
return p.dialog(a)
}, p.prompt = function () {
var a, d, e, f, h, i, k;
if (f = b(n.form), d = {
className: "bootbox-prompt",
buttons: l("cancel", "confirm"),
value: "",
inputType: "text"
}, a = m(j(d, arguments, ["title", "callback"]), ["cancel", "confirm"]), i = a.show === c ? !0 : a.show, a.message = f, a.buttons.cancel.callback = a.onEscape = function () {
return a.callback.call(this, null)
}, a.buttons.confirm.callback = function () {
var c;
switch (a.inputType) {
case"text":
case"textarea":
case"email":
case"select":
case"date":
case"time":
case"number":
case"password":
c = h.val();
break;
case"checkbox":
var d = h.find("input:checked");
c = [], g(d, function (a, d) {
c.push(b(d).val())
})
}
return a.callback.call(this, c)
}, a.show = !1, !a.title)throw new Error("prompt requires a title");
if (!b.isFunction(a.callback))throw new Error("prompt requires a callback");
if (!n.inputs[a.inputType])throw new Error("invalid prompt type");
switch (h = b(n.inputs[a.inputType]), a.inputType) {
case"text":
case"textarea":
case"email":
case"date":
case"time":
case"number":
case"password":
h.val(a.value);
break;
case"select":
var o = {};
if (k = a.inputOptions || [], !b.isArray(k))throw new Error("Please pass an array of input options");
if (!k.length)throw new Error("prompt with select requires options");
g(k, function (a, d) {
var e = h;
if (d.value === c || d.text === c)throw new Error("given options in wrong format");
d.group && (o[d.group] || (o[d.group] = b("<optgroup/>").attr("label", d.group)), e = o[d.group]), e.append("<option value='" + d.value + "'>" + d.text + "</option>")
}), g(o, function (a, b) {
h.append(b)
}), h.val(a.value);
break;
case"checkbox":
var q = b.isArray(a.value) ? a.value : [a.value];
if (k = a.inputOptions || [], !k.length)throw new Error("prompt with checkbox requires options");
if (!k[0].value || !k[0].text)throw new Error("given options in wrong format");
h = b("<div/>"), g(k, function (c, d) {
var e = b(n.inputs[a.inputType]);
e.find("input").attr("value", d.value), e.find("label").append(d.text), g(q, function (a, b) {
b === d.value && e.find("input").prop("checked", !0)
}), h.append(e)
})
}
return a.placeholder && h.attr("placeholder", a.placeholder), a.pattern && h.attr("pattern", a.pattern), a.maxlength && h.attr("maxlength", a.maxlength), f.append(h), f.on("submit", function (a) {
a.preventDefault(), a.stopPropagation(), e.find(".btn-primary").click()
}), e = p.dialog(a), e.off("shown.bs.modal"), e.on("shown.bs.modal", function () {
h.focus()
}), i === !0 && e.modal("show"), e
}, p.dialog = function (a) {
a = h(a);
var d = b(n.dialog), f = d.find(".modal-dialog"), i = d.find(".modal-body"), j = a.buttons, k = "", l = {onEscape: a.onEscape};
if (b.fn.modal === c)throw new Error("$.fn.modal is not defined; please double check you have included the Bootstrap JavaScript library. See http://getbootstrap.com/javascript/ for more details.");
if (g(j, function (a, b) {
k += "<button data-bb-handler='" + a + "' type='button' class='btn " + b.className + "'>" + b.label + "</button> ", l[a] = b.callback
}), i.find(".bootbox-body").html(a.message), a.animate === !0 && d.addClass("fade"), a.className && d.addClass(a.className), "large" === a.size ? f.addClass("modal-lg") : "small" === a.size && f.addClass("modal-sm"), a.title && i.before(n.header), a.closeButton) {
var m = b(n.closeButton);
a.title ? d.find(".modal-header").prepend(m) : m.css("margin-top", "-10px").prependTo(i)
}
return a.title && d.find(".modal-title").html(a.title), k.length && (i.after(n.footer), d.find(".modal-footer").html(k)), d.on("hidden.bs.modal", function (a) {
a.target === this && d.remove()
}), d.on("shown.bs.modal", function () {
d.find(".btn-primary:first").focus()
}), "static" !== a.backdrop && d.on("click.dismiss.bs.modal", function (a) {
d.children(".modal-backdrop").length && (a.currentTarget = d.children(".modal-backdrop").get(0)), a.target === a.currentTarget && d.trigger("escape.close.bb")
}), d.on("escape.close.bb", function (a) {
l.onEscape && e(a, d, l.onEscape)
}), d.on("click", ".modal-footer button", function (a) {
var c = b(this).data("bb-handler");
e(a, d, l[c])
}), d.on("click", ".bootbox-close-button", function (a) {
e(a, d, l.onEscape)
}), d.on("keyup", function (a) {
27 === a.which && d.trigger("escape.close.bb")
}), b(a.container).append(d), d.modal({
backdrop: a.backdrop ? "static" : !1,
keyboard: !1,
show: !1
}), a.show && d.modal("show"), d
}, p.setDefaults = function () {
var a = {};
2 === arguments.length ? a[arguments[0]] = arguments[1] : a = arguments[0], b.extend(o, a)
}, p.hideAll = function () {
return b(".bootbox").modal("hide"), p
};
var q = {
bg_BG: {OK: "Ок", CANCEL: "Отказ", CONFIRM: "Потвърждавам"},
br: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Sim"},
cs: {OK: "OK", CANCEL: "Zrušit", CONFIRM: "Potvrdit"},
da: {OK: "OK", CANCEL: "Annuller", CONFIRM: "Accepter"},
de: {OK: "OK", CANCEL: "Abbrechen", CONFIRM: "Akzeptieren"},
el: {OK: "Εντάξει", CANCEL: "Ακύρωση", CONFIRM: "Επιβεβαίωση"},
en: {OK: "OK", CANCEL: "Cancel", CONFIRM: "OK"},
es: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Aceptar"},
et: {OK: "OK", CANCEL: "Katkesta", CONFIRM: "OK"},
fa: {OK: "قبول", CANCEL: "لغو", CONFIRM: "تایید"},
fi: {OK: "OK", CANCEL: "Peruuta", CONFIRM: "OK"},
fr: {OK: "OK", CANCEL: "Annuler", CONFIRM: "D'accord"},
he: {OK: "אישור", CANCEL: "ביטול", CONFIRM: "אישור"},
hu: {OK: "OK", CANCEL: "Mégsem", CONFIRM: "Megerősít"},
hr: {OK: "OK", CANCEL: "Odustani", CONFIRM: "Potvrdi"},
id: {OK: "OK", CANCEL: "Batal", CONFIRM: "OK"},
it: {OK: "OK", CANCEL: "Annulla", CONFIRM: "Conferma"},
ja: {OK: "OK", CANCEL: "キャンセル", CONFIRM: "確認"},
lt: {OK: "Gerai", CANCEL: "Atšaukti", CONFIRM: "Patvirtinti"},
lv: {OK: "Labi", CANCEL: "Atcelt", CONFIRM: "Apstiprināt"},
nl: {OK: "OK", CANCEL: "Annuleren", CONFIRM: "Accepteren"},
no: {OK: "OK", CANCEL: "Avbryt", CONFIRM: "OK"},
pl: {OK: "OK", CANCEL: "Anuluj", CONFIRM: "Potwierdź"},
pt: {OK: "OK", CANCEL: "Cancelar", CONFIRM: "Confirmar"},
ru: {OK: "OK", CANCEL: "Отмена", CONFIRM: "Применить"},
sq: {OK: "OK", CANCEL: "Anulo", CONFIRM: "Prano"},
sv: {OK: "OK", CANCEL: "Avbryt", CONFIRM: "OK"},
th: {OK: "ตกลง", CANCEL: "ยกเลิก", CONFIRM: "ยืนยัน"},
tr: {OK: "Tamam", CANCEL: "İptal", CONFIRM: "Onayla"},
zh_CN: {OK: "确定", CANCEL: "取消", CONFIRM: "确认"},
zh_TW: {OK: "OK", CANCEL: "取消", CONFIRM: "確認"}
};
return p.addLocale = function (a, c) {
return b.each(["OK", "CANCEL", "CONFIRM"], function (a, b) {
if (!c[b])throw new Error("Please supply a translation for '" + b + "'")
}), q[a] = {OK: c.OK, CANCEL: c.CANCEL, CONFIRM: c.CONFIRM}, p
}, p.removeLocale = function (a) {
return delete q[a], p
}, p.setLocale = function (a) {
return p.setDefaults("locale", a)
}, p.init = function (c) {
return a(c || b)
}, p
});
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/resources/application-github.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.
#
# DataSource
spring.datasource.url = ${spring_datasource_url}
spring.datasource.username = ${spring_datasource_username}
spring.datasource.password = ${spring_datasource_password}
| #
# 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.
#
# DataSource
spring.datasource.url = ${spring_datasource_url}
spring.datasource.username = ${spring_datasource_username}
spring.datasource.password = ${spring_datasource_password}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/charts/apollo-service-0.1.0.tgz | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <o:YŬžW<v>]6Mub(hilH\~ aI,;qg93/#>oK3bbJI]vݓ#wO_IEw^@w4ԶH*"^t ~D!)g-מ}jw-+hL9ZK` tX0/}r)ЁRt: Uhd<J"
iQWKG
rgǣ#L!S;
E rߑ@#HEu;4t|>mIG;dKT2ұڀwOIݡ[ e,HK\-R }mk
kT/ ;v{e 9k,9.'> \* ?Z- @ۙ~FRbU5n$x26$RqildCWP &Ct"Bq\Q69h^Fv7E5E+(3ԔJ`Wf22s`L|k ^ ^ bs#sBE#и 1a̛ؕ
] d,]`%U\;wj0O{\
Jd*;|@% ˼nPB!"bjP,
3d(e 2(ߠOrIzxrr/m8F<0_98NR > S %*:#*a\V/vP0T([ p% cHm6/p4q]=gSd
C+XEO]n6C 1r3 QYAeIci jKe
О ? > -m3 mJk'p>Kq tS%V}4]X[Zf U)S>Q(;7 . c4I);>ws?PA xH}$WcڎV
t꿄5P EaD;
Xh ǯ͛O ^MU>LPA] 0>&ʾz hs,9 ѵ5Tmh+e yvҙzذXZjPR* TIxЛK,Z wt^&d8/3Y/(?9N|\ pJA@A[ "2 j3B}*Z#p ;ܩ 8eZ̅ݶbR .*$k oBB#KnNZyk>A<
J9۔MJ@WX,s[d ,E,h7k_,jt'ӷ -9Xu͓^MA-sP*}tR ܼt}${mhZ#zv='9doD^s{ LoT1<#v;Ocڷ (Ǧi);9 hyhDYNсW P0g2pL8 ւv2γK<oٔw̷vj+s+vu iN8MSu{R~g9N2-IJD̅Ha4 ӯj/5;yE ZVqXk8U[iR
2{~Y`i MV
U5x2
ObփZ6ˡᖢޕm 6rbv 7gͮK%~2b7UȈ2=D^*G*;qQCmrOU9mM m˭<S=Fi܍ S.l*E מ< }~ S4NNNJ n[I 0zyNRVng,z2oO.'N$y
J
IU+f=ķnvUgNp/ƨЮ
'rd;Uc
<*Wb UȒu\(̞wy-KDzʠ9@e/|p~\-tU6U6NoBZc
}06+$ >%(';l2#
B:4\}B F.{`> ʝ(}4wTMk2:^MgU$WW?t*5Bs</мZsbԯ\ڐ]AEC f} km( vDvFMˋ<])沙[" M-;bi
@Ht9 IwCVz̨:g+ aU7<52i.\,Ze\z˒"u^t:6,TS0,fS}>\ rϐͪ)_]i՟O >^ߵ48+%_0ė/o7xi&Yyu9 V$3B@R!wڟֈf[TcuR
PFVVX
aq
ܽEUv 5RJ]1 T0,6?*8 qWĭ k s-X
;8{)umILͪj.ziiVG4s{Kjo it{xz_6PH +)Ҫ!s @FH&lQ
6wm GQO(r1Y5KXHKy5t7$*a3kT0~\EEYDSBVT!xtʭُ{l¢Xldz)B,Pæcxn50cE Нd.J]<3.#yQ3d/6<c9-zݣ}9Z|"MgMR'vx4~ǼTjZ.ꭈvr1Vs7Җ:;-jd -Fϒ-M _ӽ?KŖ8WVyMC46SkkwqI ʲS'4 m]~U(IL3y}d:k1
YN3&_6eu~llMF/ 9eJV2$ֆM4l
wM(Em
{Tx
o?i5
\nbu)0.pw:d9 qUXp7E,ޒ J:S*AF1,S}|Q6
D e0: >_Bc8_ma=pffj D>eh[᧡H^Cx1
i:oLeGtߴc:?W9c%qoм.W WZl\ЉH呄7ҲC?,zH:p?[L>۵oo?r 3HU ^ | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <o:YŬžW<v>]6Mub(hilH\~ aI,;qg93/#>oK3bbJI]vݓ#wO_IEw^@w4ԶH*"^t ~D!)g-מ}jw-+hL9ZK` tX0/}r)ЁRt: Uhd<J"
iQWKG
rgǣ#L!S;
E rߑ@#HEu;4t|>mIG;dKT2ұڀwOIݡ[ e,HK\-R }mk
kT/ ;v{e 9k,9.'> \* ?Z- @ۙ~FRbU5n$x26$RqildCWP &Ct"Bq\Q69h^Fv7E5E+(3ԔJ`Wf22s`L|k ^ ^ bs#sBE#и 1a̛ؕ
] d,]`%U\;wj0O{\
Jd*;|@% ˼nPB!"bjP,
3d(e 2(ߠOrIzxrr/m8F<0_98NR > S %*:#*a\V/vP0T([ p% cHm6/p4q]=gSd
C+XEO]n6C 1r3 QYAeIci jKe
О ? > -m3 mJk'p>Kq tS%V}4]X[Zf U)S>Q(;7 . c4I);>ws?PA xH}$WcڎV
t꿄5P EaD;
Xh ǯ͛O ^MU>LPA] 0>&ʾz hs,9 ѵ5Tmh+e yvҙzذXZjPR* TIxЛK,Z wt^&d8/3Y/(?9N|\ pJA@A[ "2 j3B}*Z#p ;ܩ 8eZ̅ݶbR .*$k oBB#KnNZyk>A<
J9۔MJ@WX,s[d ,E,h7k_,jt'ӷ -9Xu͓^MA-sP*}tR ܼt}${mhZ#zv='9doD^s{ LoT1<#v;Ocڷ (Ǧi);9 hyhDYNсW P0g2pL8 ւv2γK<oٔw̷vj+s+vu iN8MSu{R~g9N2-IJD̅Ha4 ӯj/5;yE ZVqXk8U[iR
2{~Y`i MV
U5x2
ObփZ6ˡᖢޕm 6rbv 7gͮK%~2b7UȈ2=D^*G*;qQCmrOU9mM m˭<S=Fi܍ S.l*E מ< }~ S4NNNJ n[I 0zyNRVng,z2oO.'N$y
J
IU+f=ķnvUgNp/ƨЮ
'rd;Uc
<*Wb UȒu\(̞wy-KDzʠ9@e/|p~\-tU6U6NoBZc
}06+$ >%(';l2#
B:4\}B F.{`> ʝ(}4wTMk2:^MgU$WW?t*5Bs</мZsbԯ\ڐ]AEC f} km( vDvFMˋ<])沙[" M-;bi
@Ht9 IwCVz̨:g+ aU7<52i.\,Ze\z˒"u^t:6,TS0,fS}>\ rϐͪ)_]i՟O >^ߵ48+%_0ė/o7xi&Yyu9 V$3B@R!wڟֈf[TcuR
PFVVX
aq
ܽEUv 5RJ]1 T0,6?*8 qWĭ k s-X
;8{)umILͪj.ziiVG4s{Kjo it{xz_6PH +)Ҫ!s @FH&lQ
6wm GQO(r1Y5KXHKy5t7$*a3kT0~\EEYDSBVT!xtʭُ{l¢Xldz)B,Pæcxn50cE Нd.J]<3.#yQ3d/6<c9-zݣ}9Z|"MgMR'vx4~ǼTjZ.ꭈvr1Vs7Җ:;-jd -Fϒ-M _ӽ?KŖ8WVyMC46SkkwqI ʲS'4 m]~U(IL3y}d:k1
YN3&_6eu~llMF/ 9eJV2$ֆM4l
wM(Em
{Tx
o?i5
\nbu)0.pw:d9 qUXp7E,ޒ J:S*AF1,S}|Q6
D e0: >_Bc8_ma=pffj D>eh[᧡H^Cx1
i:oLeGtߴc:?W9c%qoм.W WZl\ЉH呄7ҲC?,zH:p?[L>۵oo?r 3HU ^ | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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-config-data/src/test/java/com/ctrip/framework/apollo/config/data/system/ApolloClientEnvironmentVariablesCompatibleTest.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 com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import com.github.stefanbirkner.systemlambda.SystemLambda;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ApolloClientPropertyCompatibleTestConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class ApolloClientEnvironmentVariablesCompatibleTest {
@Autowired
private ConfigurableEnvironment environment;
@Test
public void testEnvironmentVariablesCompatible() throws Exception {
SystemLambda.withEnvironmentVariable(
ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR_ENVIRONMENT_VARIABLES,
"test-2/cacheDir")
.and(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET_ENVIRONMENT_VARIABLES,
"test-2-secret")
.and(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES,
"https://test-2-config-service")
.execute(() -> {
Assert.assertEquals("test-2/cacheDir",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CACHE_DIR));
Assert.assertEquals("test-2-secret",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET));
Assert.assertEquals("https://test-2-config-service",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE));
});
}
@After
public void clearProperty() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
}
}
}
| /*
* 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 com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import com.github.stefanbirkner.systemlambda.SystemLambda;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ApolloClientPropertyCompatibleTestConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class ApolloClientEnvironmentVariablesCompatibleTest {
@Autowired
private ConfigurableEnvironment environment;
@Test
public void testEnvironmentVariablesCompatible() throws Exception {
SystemLambda.withEnvironmentVariable(
ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR_ENVIRONMENT_VARIABLES,
"test-2/cacheDir")
.and(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET_ENVIRONMENT_VARIABLES,
"test-2-secret")
.and(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES,
"https://test-2-config-service")
.execute(() -> {
Assert.assertEquals("test-2/cacheDir",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CACHE_DIR));
Assert.assertEquals("test-2-secret",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET));
Assert.assertEquals("https://test-2-config-service",
this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE));
});
}
@After
public void clearProperty() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| ./README.md | <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Apollo - A reliable configuration management system
[](https://github.com/ctripcorp/apollo/actions)
[](https://github.com/ctripcorp/apollo/releases)
[](https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client)
[](https://codecov.io/github/ctripcorp/apollo?branch=master)
[](https://opensource.org/licenses/Apache-2.0)
Apollo is a reliable configuration management system. It can centrally manage the configurations of different applications and different clusters. It is suitable for microservice configuration management scenarios.
The server side is developed based on Spring Boot and Spring Cloud, which can simply run without the need to install additional application containers such as Tomcat.
The Java SDK does not rely on any framework and can run in all Java runtime environments. It also has good support for Spring/Spring Boot environments.
The .Net SDK does not rely on any framework and can run in all .Net runtime environments.
For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](https://www.apolloconfig.com/#/zh/design/apollo-introduction).
For local demo purpose, please refer [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start).
Demo Environment:
- [http://106.54.227.205](http://106.54.227.205/)
- User/Password: apollo/admin
# Screenshots
# Features
* **Unified management of the configurations of different environments and different clusters**
* Apollo provides a unified interface to centrally manage the configurations of different environments, different clusters, and different namespaces
* The same codebase could have different configurations when deployed in different clusters
* With the namespace concept, it is easy to support multiple applications to share the same configurations, while also allowing them to customize the configurations
* Multiple languages is provided in user interface(currently Chinese and English)
* **Configuration changes takes effect in real time (hot release)**
* After the user modified the configuration and released it in Apollo, the sdk will receive the latest configurations in real time (1 second) and notify the application
* **Release version management**
* Every configuration releases are versioned, which is friendly to support configuration rollback
* **Grayscale release**
* Support grayscale configuration release, for example, after clicking release, it will only take effect for some application instances. After a period of observation, we could push the configurations to all application instances if there is no problem
* **Authorization management, release approval and operation audit**
* Great authorization mechanism is designed for applications and configurations management, and the management of configurations is divided into two operations: editing and publishing, therefore greatly reducing human errors
* All operations have audit logs for easy tracking of problems
* **Client side configuration information monitoring**
* It's very easy to see which instances are using the configurations and what versions they are using
* **Rich SDKs available**
* Provides native sdks of Java and .Net to facilitate application integration
* Support Spring Placeholder, Annotation and Spring Boot ConfigurationProperties for easy application use (requires Spring 3.1.1+)
* Http APIs are provided, so non-Java and .Net applications can integrate conveniently
* Rich third party sdks are also available, e.g. Golang, Python, NodeJS, PHP, C, etc
* **Open platform API**
* Apollo itself provides a unified configuration management interface, which supports features such as multi-environment, multi-data center configuration management, permissions, and process governance
* However, for the sake of versatility, Apollo will not put too many restrictions on the modification of the configuration, as long as it conforms to the basic format, it can be saved.
* In our research, we found that for some users, their configurations may have more complicated formats, such as xml, json, and the format needs to be verified
* There are also some users such as DAL, which not only have a specific format, but also need to verify the entered value before saving, such as checking whether the database, username and password match
* For this type of application, Apollo allows the application to modify and release configurations through open APIs, which has great authorization and permission control mechanism built in
* **Simple deployment**
* As an infrastructure service, the configuration center has very high availability requirements, which forces Apollo to rely on external dependencies as little as possible
* Currently, the only external dependency is MySQL, so the deployment is very simple. Apollo can run as long as Java and MySQL are installed
* Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters
# Usage
1. [Apollo User Guide](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide)
2. [Java SDK User Guide](https://www.apolloconfig.com/#/zh/usage/java-sdk-user-guide)
3. [.Net SDK user Guide](https://www.apolloconfig.com/#/zh/usage/dotnet-sdk-user-guide)
4. [Third Party SDK User Guide](https://www.apolloconfig.com/#/zh/usage/third-party-sdks-user-guide)
5. [Other Language Client User Guide](https://www.apolloconfig.com/#/zh/usage/other-language-client-user-guide)
6. [Apollo Open APIs](https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform)
7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo User Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-practices)
9. [Apollo Security Best Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
* [Apollo Design](https://www.apolloconfig.com/#/zh/design/apollo-design)
* [Apollo Core Concept - Namespace](https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace)
* [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ)
* [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/)
# Development
* [Apollo Development Guide](https://www.apolloconfig.com/#/zh/development/apollo-development-guide)
* Code Styles
* [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
* [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
# Deployment
* [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start)
* [Distributed Deployment Guide](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide)
# Release Notes
* [Releases](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [FAQ](https://www.apolloconfig.com/#/zh/faq/faq)
* [Common Issues in Deployment & Development Phase](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase)
# Presentation
* [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420)
* [Slides](https://myslide.cn/slides/10168)
* [Configuration Center Makes Microservices Smart](https://2018.qconshanghai.com/presentation/799)
* [Slides](https://myslide.cn/slides/10035)
# Publication
* [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo)
* [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ)
# Community
* [Apollo Team](https://www.apolloconfig.com/#/en/community/team)
* [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
* [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
# License
The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
# Known Users
> Sorted by registration order，users are welcome to register in [https://github.com/ctripcorp/apollo/issues/451](https://github.com/ctripcorp/apollo/issues/451) (reference purpose only for the community)
<table>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctrip.png" alt="携程"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bluestone.png" alt="青石证券"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sagreen.png" alt="沙绿"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/umetrip.jpg" alt="航旅纵横"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuanzhuan.png" alt="58转转"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/phone580.png" alt="蜂助手"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hainan-airlines.png" alt="海南航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cvte.png" alt="CVTE"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mainbo.jpg" alt="明博教育"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/madailicai.png" alt="麻袋理财"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mxnavi.jpg" alt="美行科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fshows.jpg" alt="首展科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/feezu.png" alt="易微行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rencaijia.png" alt="人才加"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/keking.png" alt="凯京集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leoao.png" alt="乐刻运动"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dji.png" alt="大疆"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kkmh.png" alt="快看漫画"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wolaidai.png" alt="我来贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xsrj.png" alt="虚实软件"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yanxuan.png" alt="网易严选"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sjzg.png" alt="视觉中国"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zc360.png" alt="资产360"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ecarx.png" alt="亿咖通"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5173.png" alt="5173"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hujiang.png" alt="沪江"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163yun.png" alt="网易云基础服务"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cash-bus.png" alt="现金巴士"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/smartisan.png" alt="锤子科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toodc.png" alt="头等仓"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/juneyaoair.png" alt="吉祥航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/263mobile.png" alt="263移动通信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toutoujinrong.png" alt="投投金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mytijian.png" alt="每天健康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyabank.png" alt="麦芽金服"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fengunion.png" alt="蜂向科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/geex-logo.png" alt="即科金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beike.png" alt="贝壳网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/youzan.png" alt="有赞"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunjihuitong.png" alt="云集汇通"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rhinotech.png" alt="犀牛瀚海科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nxin.png" alt="农信互联"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mgzf.png" alt="蘑菇租房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huli-logo.png" alt="狐狸金服"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mandao.png" alt="漫道集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enmonster.png" alt="怪兽充电"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nanguazufang.png" alt="南瓜租房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shitoujinrong.png" alt="石投金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tubatu.png" alt="土巴兔"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/payh_logo.png" alt="平安银行"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinxindai.png" alt="新新贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chrtc.png" alt="中国华戎科技集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuya_logo.png" alt="涂鸦智能"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/szlcsc.jpg" alt="立创商城"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hairongyi.png" alt="乐赚金服"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kxqc.png" alt="开心汽车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppcredit.png" alt="乐赚金服"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/primeton.png" alt="普元信息"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoskeeper.png" alt="医帮管家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fula.png" alt="付啦信用卡管家"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uzai.png" alt="悠哉网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/91wutong.png" alt="梧桐诚选"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppdai.png" alt="拍拍贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinyongfei.png" alt="信用飞"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dxy.png" alt="丁香园"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ghtech.png" alt="国槐科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qbb.png" alt="亲宝宝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huawei_logo.png" alt="华为视频直播"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weiboyi.png" alt="微播易"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ofpay.png" alt="欧飞"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mishuo.png" alt="迷说"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yixia.png" alt="一下科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daocloud.png" alt="DaoCloud"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnvex.png" alt="汽摩交易所"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100tal.png" alt="好未来教育集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ainirobot.png" alt="猎户星空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuojian.png" alt="卓健科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoyor.png" alt="银江股份"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuhu.png" alt="途虎养车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/homedo.png" alt="河姆渡"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xwbank.png" alt="新网银行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctspcl.png" alt="中旅安信云贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meiyou.png" alt="美柚"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkh-logo.png" alt="震坤行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wgss.png" alt="万谷盛世"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/plateno.png" alt="铂涛旅行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lifesense.png" alt="乐心"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/reachmedia.png" alt="亿投传媒"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guxiansheng.png" alt="股先生"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caixuetang.png" alt="财学堂"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/4399.png" alt="4399"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autohome.png" alt="汽车之家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mbcaijing.png" alt="面包财经"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoopchina.png" alt="虎扑"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sohu-auto.png" alt="搜狐汽车"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/liangfuzhengxin.png" alt="量富征信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maihaoche.png" alt="卖好车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiot.jpg" alt="中移物联网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/biauto.png" alt="易车网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyaole.png" alt="一药网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoying.png" alt="小影"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caibeike.png" alt="彩贝壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeelight.png" alt="YEELIGHT"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/itsgmu.png" alt="积目"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acmedcare.png" alt="极致医疗"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhui365.png" alt="金汇金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/900etrip.png" alt="久柏易游"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/24xiaomai.png" alt="小麦铺"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vvic.png" alt="搜款网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mizlicai.png" alt="米庄理财"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bjt.png" alt="贝吉塔网络科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weimob.png" alt="微盟"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kada.png" alt="网易卡搭"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kapbook.png" alt="股书"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jumore.png" alt="聚贸"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bimface.png" alt="广联达bimface"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/globalgrow.png" alt="环球易购"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jollychic.png" alt="浙江执御"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2dfire.jpg" alt="二维火"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shopin.png" alt="上品"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inspur.png" alt="浪潮集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ngarihealth.png" alt="纳里健康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oraro.png" alt="橙红科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dragonpass.png" alt="龙腾出行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lizhi.fm.png" alt="荔枝"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/htd.png" alt="汇通达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunrong.png" alt="云融金科"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tszg360.png" alt="天生掌柜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rongplus.png" alt="容联光辉"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/intellif.png" alt="云天励飞"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jiayundata.png" alt="嘉云数据"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zts.png" alt="中泰证券网络金融部"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163dun.png" alt="网易易盾"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiangwushuo.png" alt="享物说"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sto.png" alt="申通"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhe.png" alt="金和网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2345.png" alt="二三四五"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chtwm.jpg" alt="恒天财富"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uweixin.png" alt="沐雪微信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wzeye.png" alt="温州医科大学附属眼视光医院"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/10010pay.png" alt="联通支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanshu.png" alt="杉数科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fenlibao.png" alt="分利宝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hetao101.png" alt="核桃编程"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaohongshu.png" alt="小红书"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/blissmall.png" alt="幸福西饼"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ky-express.png" alt="跨越速运"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oyohotels.png" alt="OYO"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100-me.png" alt="叮咚买菜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhidaohulian.jpg" alt="智道网联"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xueqiu.jpg" alt="雪球"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autocloudpro.png" alt="车通云"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dadaabc.png" alt="哒哒英语"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xedaojia.jpg" alt="小E微店"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daling.png" alt="达令家"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/renliwo.png" alt="人力窝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mocire.jpg" alt="嘉美在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uepay.png" alt="极易付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wdom.png" alt="智慧开源"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cheshiku.png" alt="车仕库"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/taimeitech.png" alt="太美医疗科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yilianbaihui.png" alt="亿联百汇"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhoupu123.png" alt="舟谱数据"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/frxs.png" alt="芙蓉兴盛"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beastshop.png" alt="野兽派"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kaishustory.png" alt="凯叔讲故事"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/haodf.png" alt="好大夫在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/insyunmi.png" alt="云幂信息技术"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/duiba.png" alt="兑吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/9ji.png" alt="九机网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sui.png" alt="随手科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aixiangdao.png" alt="万谷盛世"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunzhangfang.png" alt="云账房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yuantutech.png" alt="浙江远图互联"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qk365.png" alt="青客公寓"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/eastmoney.png" alt="东方财富"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jikexiu.png" alt="极客修"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meix.png" alt="美市科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zto.png" alt="中通快递"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/e6yun.png" alt="易流科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoyuanzhao.png" alt="实习僧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dalingjia.png" alt="达令家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/secoo.png" alt="寺库"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lianlianpay.png" alt="连连支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhongan.png" alt="众安保险"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/360jinrong.png" alt="360金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caschina.png" alt="中航服商旅"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ke.png" alt="贝壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeahmobi.png" alt="Yeahmobi易点天下"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/idengyun.png" alt="北京登云美业网络科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinher.png" alt="金和网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/komect.png" alt="中移（杭州）信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beisen.png" alt="北森"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/log56.png" alt="合肥维天运通"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meboth.png" alt="北京蜜步科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/postop.png" alt="术康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rfchina.png" alt="富力集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tfxing.png" alt="天府行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/8travelpay.png" alt="八商山"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/centaline.png" alt="中原地产"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkyda.png" alt="智科云达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/house730.png" alt="中原730"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/pagoda.png" alt="百果园"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bolome.png" alt="波罗蜜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xignite.png" alt="Xignite"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aduer.png" alt="杭州有云科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jojoreading.png" alt="成都书声科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sweetome.png" alt="斯维登集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vipthink.png" alt="广东快乐种子科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tongxuecool.png" alt="上海盈翼文化传播有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sccfc.png" alt="上海尚诚消费金融股份有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ziroom.png" alt="自如网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jd.png" alt="京东"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rabbitpre.png" alt="兔展智能"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhubei.png" alt="竹贝"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/imile.png" alt="iMile(中东)"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/helloglobal.png" alt="哈罗出行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhaopin.png" alt="智联招聘"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acadsoc.png" alt="阿卡索"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mojory.png" alt="妙知旅"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chengduoduo.png" alt="程多多"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baojunev.png" alt="上汽通用五菱"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leyan.png" alt="乐言科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dushu.png" alt="樊登读书"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiz.png" alt="找一找教程网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bppc.png" alt="中油碧辟石油有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanglv51.png" alt="四川商旅无忧科技服务有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/waijiao365.png" alt="懿鸢网络科技（上海）有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaoding.jpg" alt="稿定科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ricacorp.png" alt="搵樓 - 利嘉閣"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/t3go.png" alt="南京领行科技股份有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mokahr.jpg" alt="北京希瑞亚斯科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/printrainbow.png" alt="印彩虹印刷公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/milliontech.png" alt="Million Tech"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guoguokeji.jpg" alt="果果科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/airkunming.png" alt="昆明航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5i5j.png" alt="我爱我家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gjzq.png" alt="国金证券"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoymusic.jpg" alt="不亦乐乎"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnhnb.png" alt="惠农网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daoklab.jpg" alt="成都道壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ausnutria.jpg" alt="澳优乳业"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/deiyoudian.png" alt="河南有态度信息科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezhiyang.png" alt="智阳第一人力"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shie.png" alt="上海保险交易所"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wsecar.png" alt="万顺叫车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shouqinba.jpg" alt="收钱吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baozun.png" alt="宝尊电商"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xbnwl.png" alt="喜百年供应链"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gwwisdom.png" alt="南京观为智慧软件科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ztrip.png" alt="在途商旅"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hualala.png" alt="哗啦啦"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xin.png" alt="优信二手车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maycur.png" alt="每刻科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bullyun.png" alt="杭州蛮牛"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bestpay.png" alt="翼支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mockuai.png" alt="魔筷科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ct108.png" alt="畅唐网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jusdaglobal.jpg" alt="准时达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/izaodao.png" alt="早道网校"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ovopark.jpg" alt="万店掌"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/funstory.jpg" alt="推文科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lemonbox.png" alt="Lemonbox"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/polyt.png" alt="保利票务"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chipwing.png" alt="芯翼科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbank.png" alt="浙商银行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbyqy.png" alt="易企银科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yundun.jpg" alt="上海云盾"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaiaworks.jpg" alt="苏州盖雅信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mengxiang.png" alt="爱库存"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jidouauto.png" alt="极豆车联网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ipalfish.png" alt="伴鱼少儿英语"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/iqboard.png" alt="锐达科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/koolearn.png" alt="新东方在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kingcome.png" alt="金康高科"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/soulapp.png" alt="soul"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezrpro.png" alt="驿氪"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hc360.png" alt="慧聪"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/21cp.png" alt="中塑在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/goinglink.jpg" alt="甄云科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aitrace.jpg" alt="追溯科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/moqipobing.png" alt="玩吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cassan.png" alt="广州卡桑信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shuidichou.png" alt="水滴"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kuwo.png" alt="酷我音乐"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mi.png" alt="小米"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mvmyun.png" alt="今典"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/visabao.jpg" alt="签宝科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inrice.png" alt="广州趣米网络科技有限公司"></td>
<td><a target="_blank" href="https://github.com/ctripcorp/apollo/issues/451">More...</a></td>
</tr>
</table>
# Awards
<img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/awards/oschina-2018-award.jpg" width="240px" alt="The most popular Chinese open source software in 2018">
# Stargazers over time
[](https://starcharts.herokuapp.com/ctripcorp/apollo)
| <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Apollo - A reliable configuration management system
[](https://github.com/ctripcorp/apollo/actions)
[](https://github.com/ctripcorp/apollo/releases)
[](https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client)
[](https://codecov.io/github/ctripcorp/apollo?branch=master)
[](https://opensource.org/licenses/Apache-2.0)
Apollo is a reliable configuration management system. It can centrally manage the configurations of different applications and different clusters. It is suitable for microservice configuration management scenarios.
The server side is developed based on Spring Boot and Spring Cloud, which can simply run without the need to install additional application containers such as Tomcat.
The Java SDK does not rely on any framework and can run in all Java runtime environments. It also has good support for Spring/Spring Boot environments.
The .Net SDK does not rely on any framework and can run in all .Net runtime environments.
For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](https://www.apolloconfig.com/#/zh/design/apollo-introduction).
For local demo purpose, please refer [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start).
Demo Environment:
- [http://106.54.227.205](http://106.54.227.205/)
- User/Password: apollo/admin
# Screenshots
# Features
* **Unified management of the configurations of different environments and different clusters**
* Apollo provides a unified interface to centrally manage the configurations of different environments, different clusters, and different namespaces
* The same codebase could have different configurations when deployed in different clusters
* With the namespace concept, it is easy to support multiple applications to share the same configurations, while also allowing them to customize the configurations
* Multiple languages is provided in user interface(currently Chinese and English)
* **Configuration changes takes effect in real time (hot release)**
* After the user modified the configuration and released it in Apollo, the sdk will receive the latest configurations in real time (1 second) and notify the application
* **Release version management**
* Every configuration releases are versioned, which is friendly to support configuration rollback
* **Grayscale release**
* Support grayscale configuration release, for example, after clicking release, it will only take effect for some application instances. After a period of observation, we could push the configurations to all application instances if there is no problem
* **Authorization management, release approval and operation audit**
* Great authorization mechanism is designed for applications and configurations management, and the management of configurations is divided into two operations: editing and publishing, therefore greatly reducing human errors
* All operations have audit logs for easy tracking of problems
* **Client side configuration information monitoring**
* It's very easy to see which instances are using the configurations and what versions they are using
* **Rich SDKs available**
* Provides native sdks of Java and .Net to facilitate application integration
* Support Spring Placeholder, Annotation and Spring Boot ConfigurationProperties for easy application use (requires Spring 3.1.1+)
* Http APIs are provided, so non-Java and .Net applications can integrate conveniently
* Rich third party sdks are also available, e.g. Golang, Python, NodeJS, PHP, C, etc
* **Open platform API**
* Apollo itself provides a unified configuration management interface, which supports features such as multi-environment, multi-data center configuration management, permissions, and process governance
* However, for the sake of versatility, Apollo will not put too many restrictions on the modification of the configuration, as long as it conforms to the basic format, it can be saved.
* In our research, we found that for some users, their configurations may have more complicated formats, such as xml, json, and the format needs to be verified
* There are also some users such as DAL, which not only have a specific format, but also need to verify the entered value before saving, such as checking whether the database, username and password match
* For this type of application, Apollo allows the application to modify and release configurations through open APIs, which has great authorization and permission control mechanism built in
* **Simple deployment**
* As an infrastructure service, the configuration center has very high availability requirements, which forces Apollo to rely on external dependencies as little as possible
* Currently, the only external dependency is MySQL, so the deployment is very simple. Apollo can run as long as Java and MySQL are installed
* Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters
# Usage
1. [Apollo User Guide](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide)
2. [Java SDK User Guide](https://www.apolloconfig.com/#/zh/usage/java-sdk-user-guide)
3. [.Net SDK user Guide](https://www.apolloconfig.com/#/zh/usage/dotnet-sdk-user-guide)
4. [Third Party SDK User Guide](https://www.apolloconfig.com/#/zh/usage/third-party-sdks-user-guide)
5. [Other Language Client User Guide](https://www.apolloconfig.com/#/zh/usage/other-language-client-user-guide)
6. [Apollo Open APIs](https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform)
7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo User Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-practices)
9. [Apollo Security Best Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
* [Apollo Design](https://www.apolloconfig.com/#/zh/design/apollo-design)
* [Apollo Core Concept - Namespace](https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace)
* [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ)
* [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/)
# Development
* [Apollo Development Guide](https://www.apolloconfig.com/#/zh/development/apollo-development-guide)
* Code Styles
* [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
* [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
# Deployment
* [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start)
* [Distributed Deployment Guide](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide)
# Release Notes
* [Releases](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [FAQ](https://www.apolloconfig.com/#/zh/faq/faq)
* [Common Issues in Deployment & Development Phase](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase)
# Presentation
* [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420)
* [Slides](https://myslide.cn/slides/10168)
* [Configuration Center Makes Microservices Smart](https://2018.qconshanghai.com/presentation/799)
* [Slides](https://myslide.cn/slides/10035)
# Publication
* [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo)
* [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ)
# Community
* [Apollo Team](https://www.apolloconfig.com/#/en/community/team)
* [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
* [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
# License
The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
# Known Users
> Sorted by registration order，users are welcome to register in [https://github.com/ctripcorp/apollo/issues/451](https://github.com/ctripcorp/apollo/issues/451) (reference purpose only for the community)
<table>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctrip.png" alt="携程"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bluestone.png" alt="青石证券"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sagreen.png" alt="沙绿"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/umetrip.jpg" alt="航旅纵横"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuanzhuan.png" alt="58转转"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/phone580.png" alt="蜂助手"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hainan-airlines.png" alt="海南航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cvte.png" alt="CVTE"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mainbo.jpg" alt="明博教育"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/madailicai.png" alt="麻袋理财"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mxnavi.jpg" alt="美行科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fshows.jpg" alt="首展科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/feezu.png" alt="易微行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rencaijia.png" alt="人才加"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/keking.png" alt="凯京集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leoao.png" alt="乐刻运动"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dji.png" alt="大疆"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kkmh.png" alt="快看漫画"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wolaidai.png" alt="我来贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xsrj.png" alt="虚实软件"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yanxuan.png" alt="网易严选"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sjzg.png" alt="视觉中国"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zc360.png" alt="资产360"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ecarx.png" alt="亿咖通"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5173.png" alt="5173"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hujiang.png" alt="沪江"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163yun.png" alt="网易云基础服务"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cash-bus.png" alt="现金巴士"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/smartisan.png" alt="锤子科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toodc.png" alt="头等仓"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/juneyaoair.png" alt="吉祥航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/263mobile.png" alt="263移动通信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toutoujinrong.png" alt="投投金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mytijian.png" alt="每天健康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyabank.png" alt="麦芽金服"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fengunion.png" alt="蜂向科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/geex-logo.png" alt="即科金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beike.png" alt="贝壳网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/youzan.png" alt="有赞"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunjihuitong.png" alt="云集汇通"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rhinotech.png" alt="犀牛瀚海科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nxin.png" alt="农信互联"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mgzf.png" alt="蘑菇租房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huli-logo.png" alt="狐狸金服"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mandao.png" alt="漫道集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enmonster.png" alt="怪兽充电"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nanguazufang.png" alt="南瓜租房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shitoujinrong.png" alt="石投金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tubatu.png" alt="土巴兔"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/payh_logo.png" alt="平安银行"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinxindai.png" alt="新新贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chrtc.png" alt="中国华戎科技集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuya_logo.png" alt="涂鸦智能"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/szlcsc.jpg" alt="立创商城"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hairongyi.png" alt="乐赚金服"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kxqc.png" alt="开心汽车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppcredit.png" alt="乐赚金服"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/primeton.png" alt="普元信息"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoskeeper.png" alt="医帮管家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fula.png" alt="付啦信用卡管家"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uzai.png" alt="悠哉网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/91wutong.png" alt="梧桐诚选"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppdai.png" alt="拍拍贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinyongfei.png" alt="信用飞"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dxy.png" alt="丁香园"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ghtech.png" alt="国槐科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qbb.png" alt="亲宝宝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huawei_logo.png" alt="华为视频直播"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weiboyi.png" alt="微播易"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ofpay.png" alt="欧飞"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mishuo.png" alt="迷说"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yixia.png" alt="一下科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daocloud.png" alt="DaoCloud"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnvex.png" alt="汽摩交易所"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100tal.png" alt="好未来教育集团"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ainirobot.png" alt="猎户星空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuojian.png" alt="卓健科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoyor.png" alt="银江股份"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuhu.png" alt="途虎养车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/homedo.png" alt="河姆渡"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xwbank.png" alt="新网银行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctspcl.png" alt="中旅安信云贷"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meiyou.png" alt="美柚"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkh-logo.png" alt="震坤行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wgss.png" alt="万谷盛世"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/plateno.png" alt="铂涛旅行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lifesense.png" alt="乐心"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/reachmedia.png" alt="亿投传媒"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guxiansheng.png" alt="股先生"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caixuetang.png" alt="财学堂"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/4399.png" alt="4399"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autohome.png" alt="汽车之家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mbcaijing.png" alt="面包财经"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoopchina.png" alt="虎扑"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sohu-auto.png" alt="搜狐汽车"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/liangfuzhengxin.png" alt="量富征信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maihaoche.png" alt="卖好车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiot.jpg" alt="中移物联网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/biauto.png" alt="易车网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyaole.png" alt="一药网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoying.png" alt="小影"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caibeike.png" alt="彩贝壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeelight.png" alt="YEELIGHT"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/itsgmu.png" alt="积目"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acmedcare.png" alt="极致医疗"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhui365.png" alt="金汇金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/900etrip.png" alt="久柏易游"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/24xiaomai.png" alt="小麦铺"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vvic.png" alt="搜款网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mizlicai.png" alt="米庄理财"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bjt.png" alt="贝吉塔网络科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weimob.png" alt="微盟"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kada.png" alt="网易卡搭"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kapbook.png" alt="股书"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jumore.png" alt="聚贸"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bimface.png" alt="广联达bimface"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/globalgrow.png" alt="环球易购"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jollychic.png" alt="浙江执御"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2dfire.jpg" alt="二维火"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shopin.png" alt="上品"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inspur.png" alt="浪潮集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ngarihealth.png" alt="纳里健康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oraro.png" alt="橙红科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dragonpass.png" alt="龙腾出行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lizhi.fm.png" alt="荔枝"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/htd.png" alt="汇通达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunrong.png" alt="云融金科"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tszg360.png" alt="天生掌柜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rongplus.png" alt="容联光辉"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/intellif.png" alt="云天励飞"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jiayundata.png" alt="嘉云数据"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zts.png" alt="中泰证券网络金融部"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163dun.png" alt="网易易盾"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiangwushuo.png" alt="享物说"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sto.png" alt="申通"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhe.png" alt="金和网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2345.png" alt="二三四五"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chtwm.jpg" alt="恒天财富"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uweixin.png" alt="沐雪微信"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wzeye.png" alt="温州医科大学附属眼视光医院"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/10010pay.png" alt="联通支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanshu.png" alt="杉数科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fenlibao.png" alt="分利宝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hetao101.png" alt="核桃编程"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaohongshu.png" alt="小红书"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/blissmall.png" alt="幸福西饼"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ky-express.png" alt="跨越速运"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oyohotels.png" alt="OYO"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100-me.png" alt="叮咚买菜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhidaohulian.jpg" alt="智道网联"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xueqiu.jpg" alt="雪球"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autocloudpro.png" alt="车通云"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dadaabc.png" alt="哒哒英语"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xedaojia.jpg" alt="小E微店"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daling.png" alt="达令家"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/renliwo.png" alt="人力窝"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mocire.jpg" alt="嘉美在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uepay.png" alt="极易付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wdom.png" alt="智慧开源"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cheshiku.png" alt="车仕库"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/taimeitech.png" alt="太美医疗科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yilianbaihui.png" alt="亿联百汇"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhoupu123.png" alt="舟谱数据"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/frxs.png" alt="芙蓉兴盛"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beastshop.png" alt="野兽派"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kaishustory.png" alt="凯叔讲故事"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/haodf.png" alt="好大夫在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/insyunmi.png" alt="云幂信息技术"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/duiba.png" alt="兑吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/9ji.png" alt="九机网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sui.png" alt="随手科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aixiangdao.png" alt="万谷盛世"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunzhangfang.png" alt="云账房"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yuantutech.png" alt="浙江远图互联"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qk365.png" alt="青客公寓"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/eastmoney.png" alt="东方财富"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jikexiu.png" alt="极客修"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meix.png" alt="美市科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zto.png" alt="中通快递"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/e6yun.png" alt="易流科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoyuanzhao.png" alt="实习僧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dalingjia.png" alt="达令家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/secoo.png" alt="寺库"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lianlianpay.png" alt="连连支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhongan.png" alt="众安保险"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/360jinrong.png" alt="360金融"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caschina.png" alt="中航服商旅"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ke.png" alt="贝壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeahmobi.png" alt="Yeahmobi易点天下"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/idengyun.png" alt="北京登云美业网络科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinher.png" alt="金和网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/komect.png" alt="中移（杭州）信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beisen.png" alt="北森"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/log56.png" alt="合肥维天运通"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meboth.png" alt="北京蜜步科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/postop.png" alt="术康"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rfchina.png" alt="富力集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tfxing.png" alt="天府行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/8travelpay.png" alt="八商山"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/centaline.png" alt="中原地产"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkyda.png" alt="智科云达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/house730.png" alt="中原730"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/pagoda.png" alt="百果园"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bolome.png" alt="波罗蜜"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xignite.png" alt="Xignite"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aduer.png" alt="杭州有云科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jojoreading.png" alt="成都书声科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sweetome.png" alt="斯维登集团"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vipthink.png" alt="广东快乐种子科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tongxuecool.png" alt="上海盈翼文化传播有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sccfc.png" alt="上海尚诚消费金融股份有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ziroom.png" alt="自如网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jd.png" alt="京东"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rabbitpre.png" alt="兔展智能"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhubei.png" alt="竹贝"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/imile.png" alt="iMile(中东)"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/helloglobal.png" alt="哈罗出行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhaopin.png" alt="智联招聘"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acadsoc.png" alt="阿卡索"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mojory.png" alt="妙知旅"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chengduoduo.png" alt="程多多"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baojunev.png" alt="上汽通用五菱"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leyan.png" alt="乐言科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dushu.png" alt="樊登读书"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiz.png" alt="找一找教程网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bppc.png" alt="中油碧辟石油有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanglv51.png" alt="四川商旅无忧科技服务有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/waijiao365.png" alt="懿鸢网络科技（上海）有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaoding.jpg" alt="稿定科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ricacorp.png" alt="搵樓 - 利嘉閣"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/t3go.png" alt="南京领行科技股份有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mokahr.jpg" alt="北京希瑞亚斯科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/printrainbow.png" alt="印彩虹印刷公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/milliontech.png" alt="Million Tech"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guoguokeji.jpg" alt="果果科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/airkunming.png" alt="昆明航空"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5i5j.png" alt="我爱我家"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gjzq.png" alt="国金证券"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoymusic.jpg" alt="不亦乐乎"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnhnb.png" alt="惠农网"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daoklab.jpg" alt="成都道壳"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ausnutria.jpg" alt="澳优乳业"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/deiyoudian.png" alt="河南有态度信息科技有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezhiyang.png" alt="智阳第一人力"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shie.png" alt="上海保险交易所"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wsecar.png" alt="万顺叫车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shouqinba.jpg" alt="收钱吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baozun.png" alt="宝尊电商"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xbnwl.png" alt="喜百年供应链"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gwwisdom.png" alt="南京观为智慧软件科技有限公司"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ztrip.png" alt="在途商旅"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hualala.png" alt="哗啦啦"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xin.png" alt="优信二手车"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maycur.png" alt="每刻科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bullyun.png" alt="杭州蛮牛"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bestpay.png" alt="翼支付"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mockuai.png" alt="魔筷科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ct108.png" alt="畅唐网络"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jusdaglobal.jpg" alt="准时达"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/izaodao.png" alt="早道网校"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ovopark.jpg" alt="万店掌"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/funstory.jpg" alt="推文科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lemonbox.png" alt="Lemonbox"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/polyt.png" alt="保利票务"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chipwing.png" alt="芯翼科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbank.png" alt="浙商银行"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbyqy.png" alt="易企银科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yundun.jpg" alt="上海云盾"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaiaworks.jpg" alt="苏州盖雅信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mengxiang.png" alt="爱库存"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jidouauto.png" alt="极豆车联网"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ipalfish.png" alt="伴鱼少儿英语"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/iqboard.png" alt="锐达科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/koolearn.png" alt="新东方在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kingcome.png" alt="金康高科"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/soulapp.png" alt="soul"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezrpro.png" alt="驿氪"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hc360.png" alt="慧聪"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/21cp.png" alt="中塑在线"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/goinglink.jpg" alt="甄云科技"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aitrace.jpg" alt="追溯科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/moqipobing.png" alt="玩吧"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cassan.png" alt="广州卡桑信息技术有限公司"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shuidichou.png" alt="水滴"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kuwo.png" alt="酷我音乐"></td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mi.png" alt="小米"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mvmyun.png" alt="今典"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/visabao.jpg" alt="签宝科技"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inrice.png" alt="广州趣米网络科技有限公司"></td>
<td><a target="_blank" href="https://github.com/ctripcorp/apollo/issues/451">More...</a></td>
</tr>
</table>
# Awards
<img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/awards/oschina-2018-award.jpg" width="240px" alt="The most popular Chinese open source software in 2018">
# Stargazers over time
[](https://starcharts.herokuapp.com/ctripcorp/apollo)
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/spring/XmlConfigPlaceholderTest10.xml | <?xml version="1.0" encoding="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.
~
-->
<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.XmlConfigPlaceholderAutoUpdateTest.TestAllKindsOfDataTypesBean">
<property name="intProperty" value="${intProperty}"/>
<property name="intArrayProperty" value="${intArrayProperty}"/>
<property name="longProperty" value="${longProperty}"/>
<property name="shortProperty" value="${shortProperty}"/>
<property name="floatProperty" value="${floatProperty}"/>
<property name="doubleProperty" value="${doubleProperty}"/>
<property name="byteProperty" value="${byteProperty}"/>
<property name="booleanProperty" value="${booleanProperty}"/>
<property name="stringProperty" value="${stringProperty}"/>
<property name="dateProperty" value="#{new java.text.SimpleDateFormat('${dateFormat}').parse('${dateProperty}')}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="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.
~
-->
<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.XmlConfigPlaceholderAutoUpdateTest.TestAllKindsOfDataTypesBean">
<property name="intProperty" value="${intProperty}"/>
<property name="intArrayProperty" value="${intArrayProperty}"/>
<property name="longProperty" value="${longProperty}"/>
<property name="shortProperty" value="${shortProperty}"/>
<property name="floatProperty" value="${floatProperty}"/>
<property name="doubleProperty" value="${doubleProperty}"/>
<property name="byteProperty" value="${byteProperty}"/>
<property name="booleanProperty" value="${booleanProperty}"/>
<property name="stringProperty" value="${stringProperty}"/>
<property name="dateProperty" value="#{new java.text.SimpleDateFormat('${dateFormat}').parse('${dateProperty}')}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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-config-data/src/test/java/com/ctrip/framework/apollo/config/data/system/ApolloClientSystemPropertyInitializerTest.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 com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientSystemPropertyInitializerTest {
@Test
public void testSystemPropertyNames() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
Assert.assertTrue(ConfigurationPropertyName.isValid(propertyName));
}
}
@Test
public void testInitializeSystemProperty() {
Map<String, String> map = new LinkedHashMap<>();
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
map.put(propertyName, String.valueOf(ThreadLocalRandom.current().nextLong()));
}
MapConfigurationPropertySource propertySource = new MapConfigurationPropertySource(map);
Binder binder = new Binder(propertySource);
ApolloClientSystemPropertyInitializer initializer = new ApolloClientSystemPropertyInitializer(
LogFactory.getLog(ApolloClientSystemPropertyInitializerTest.class));
initializer.initializeSystemProperty(binder, null);
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
Assert.assertEquals(map.get(propertyName), System.getProperty(propertyName));
}
}
@After
public void clearProperty() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
}
}
}
| /*
* 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 com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientSystemPropertyInitializerTest {
@Test
public void testSystemPropertyNames() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
Assert.assertTrue(ConfigurationPropertyName.isValid(propertyName));
}
}
@Test
public void testInitializeSystemProperty() {
Map<String, String> map = new LinkedHashMap<>();
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
map.put(propertyName, String.valueOf(ThreadLocalRandom.current().nextLong()));
}
MapConfigurationPropertySource propertySource = new MapConfigurationPropertySource(map);
Binder binder = new Binder(propertySource);
ApolloClientSystemPropertyInitializer initializer = new ApolloClientSystemPropertyInitializer(
LogFactory.getLog(ApolloClientSystemPropertyInitializerTest.class));
initializer.initializeSystemProperty(binder, null);
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
Assert.assertEquals(map.get(propertyName), System.getProperty(propertyName));
}
}
@After
public void clearProperty() {
for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) {
System.clearProperty(propertyName);
}
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/controller/FavoriteController.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.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.service.FavoriteService;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
public class FavoriteController {
private final FavoriteService favoriteService;
public FavoriteController(final FavoriteService favoriteService) {
this.favoriteService = favoriteService;
}
@PostMapping("/favorites")
public Favorite addFavorite(@RequestBody Favorite favorite) {
return favoriteService.addFavorite(favorite);
}
@GetMapping("/favorites")
public List<Favorite> findFavorites(@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "appId", required = false) String appId,
Pageable page) {
return favoriteService.search(userId, appId, page);
}
@DeleteMapping("/favorites/{favoriteId}")
public void deleteFavorite(@PathVariable long favoriteId) {
favoriteService.deleteFavorite(favoriteId);
}
@PutMapping("/favorites/{favoriteId}")
public void toTop(@PathVariable long favoriteId) {
favoriteService.adjustFavoriteToFirst(favoriteId);
}
}
| /*
* 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.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.service.FavoriteService;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
public class FavoriteController {
private final FavoriteService favoriteService;
public FavoriteController(final FavoriteService favoriteService) {
this.favoriteService = favoriteService;
}
@PostMapping("/favorites")
public Favorite addFavorite(@RequestBody Favorite favorite) {
return favoriteService.addFavorite(favorite);
}
@GetMapping("/favorites")
public List<Favorite> findFavorites(@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "appId", required = false) String appId,
Pageable page) {
return favoriteService.search(userId, appId, page);
}
@DeleteMapping("/favorites/{favoriteId}")
public void deleteFavorite(@PathVariable long favoriteId) {
favoriteService.deleteFavorite(favoriteId);
}
@PutMapping("/favorites/{favoriteId}")
public void toTop(@PathVariable long favoriteId) {
favoriteService.adjustFavoriteToFirst(favoriteId);
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/test/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClientTest.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;
import static org.junit.Assert.*;
import org.junit.Test;
public class ApolloOpenApiClientTest {
@Test
public void testCreate() {
String someUrl = "http://someUrl";
String someToken = "someToken";
ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder().withPortalUrl(someUrl).withToken(someToken).build();
assertEquals(someUrl, client.getPortalUrl());
assertEquals(someToken, client.getToken());
}
@Test(expected = IllegalArgumentException.class)
public void testCreateWithInvalidUrl() {
String someInvalidUrl = "someInvalidUrl";
String someToken = "someToken";
ApolloOpenApiClient.newBuilder().withPortalUrl(someInvalidUrl).withToken(someToken).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.openapi.client;
import static org.junit.Assert.*;
import org.junit.Test;
public class ApolloOpenApiClientTest {
@Test
public void testCreate() {
String someUrl = "http://someUrl";
String someToken = "someToken";
ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder().withPortalUrl(someUrl).withToken(someToken).build();
assertEquals(someUrl, client.getPortalUrl());
assertEquals(someToken, client.getToken());
}
@Test(expected = IllegalArgumentException.class)
public void testCreateWithInvalidUrl() {
String someInvalidUrl = "someInvalidUrl";
String someToken = "someToken";
ApolloOpenApiClient.newBuilder().withPortalUrl(someInvalidUrl).withToken(someToken).build();
}
}
| -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| ./.github/ISSUE_TEMPLATE/feature_request_zh.md | ---
name: 请求特性
about: 给这个项目提一些建议、想法
title: ''
labels: ''
assignees: ''
---
**你的特性请求和某个问题有关吗？请描述**
清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
**清晰简洁地描述一下你希望的解决方案**
**清晰简洁地描述一下这个特性的备选方案**
**其它背景**
在这里添加和这个特性请求有关的背景说明、截图 | ---
name: 请求特性
about: 给这个项目提一些建议、想法
title: ''
labels: ''
assignees: ''
---
**你的特性请求和某个问题有关吗？请描述**
清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
**清晰简洁地描述一下你希望的解决方案**
**清晰简洁地描述一下这个特性的备选方案**
**其它背景**
在这里添加和这个特性请求有关的背景说明、截图 | -1 |
apolloconfig/apollo | 3,803 | feature: modify item comment valid size(#3799) | ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| chengasd | 2021-07-02T04:00:49Z | 2021-07-03T12:04:08Z | 39aa56001f699be83adf3024ff14429f2398e5f8 | 1afa5ade9bbe14ce3ead107c473532be6d693f64 | feature: modify item comment valid size(#3799). ## What's the purpose of this PR
修改openapi创建item校验的comment长度大小，兼容历史业务场景升级。
## Which issue(s) this PR fixes:
Fixes #3799
## Brief changelog
1、openapi入口ItemController.java comment校验长度大小改为256
2、portal前端入口valdr.js comment长度大小同步改为256
3、en.json 、zh-CN.json 修改对应数值
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/spi/configuration/AuthFilterConfiguration.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.configuration;
import com.ctrip.framework.apollo.openapi.filter.ConsumerAuthenticationFilter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AuthFilterConfiguration {
@Bean
public FilterRegistrationBean openApiAuthenticationFilter(ConsumerAuthUtil consumerAuthUtil,
ConsumerAuditUtil consumerAuditUtil) {
FilterRegistrationBean openApiFilter = new FilterRegistrationBean();
openApiFilter.setFilter(new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil));
openApiFilter.addUrlPatterns("/openapi/*");
return openApiFilter;
}
}
| /*
* 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.configuration;
import com.ctrip.framework.apollo.openapi.filter.ConsumerAuthenticationFilter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AuthFilterConfiguration {
@Bean
public FilterRegistrationBean openApiAuthenticationFilter(ConsumerAuthUtil consumerAuthUtil,
ConsumerAuditUtil consumerAuditUtil) {
FilterRegistrationBean openApiFilter = new FilterRegistrationBean();
openApiFilter.setFilter(new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil));
openApiFilter.addUrlPatterns("/openapi/*");
return openApiFilter;
}
}
| -1 |
apolloconfig/apollo | 3,786 | feature: shared session for multi apollo portal | ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-06-24T12:21:54Z | 2021-06-27T13:17:09Z | f1eca02f4033d050bd71ede288d1707954d3dea4 | bf80850aab4f70647d6217fc6995588085b91719 | feature: shared session for multi apollo portal. ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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)
* [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)
------------------
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)
* [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)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| 1 |
apolloconfig/apollo | 3,786 | feature: shared session for multi apollo portal | ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-06-24T12:21:54Z | 2021-06-27T13:17:09Z | f1eca02f4033d050bd71ede288d1707954d3dea4 | bf80850aab4f70647d6217fc6995588085b91719 | feature: shared session for multi apollo portal. ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/pom.xml | <?xml version="1.0" encoding="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.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-portal</artifactId>
<name>Apollo Portal</name>
<properties>
<github.path>${project.artifactId}</github.path>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<!-- yml processing -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!-- end of yml processing -->
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
<!-- test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${project.build.directory}</basedir>
<includes>
<include>classes/static/*.html</include>
<include>classes/static/**/*.html</include>
</includes>
<replacements>
<replacement>
<token>\.css\"</token>
<value>.css?v=${maven.build.timestamp}\"</value>
</replacement>
<replacement>
<token>\.js\"</token>
<value>.js?v=${maven.build.timestamp}\"</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ctrip</id>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-portal</artifactId>
<name>Apollo Portal</name>
<properties>
<github.path>${project.artifactId}</github.path>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-jdbc</artifactId>
<scope>runtime</scope>
</dependency>
<!-- yml processing -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!-- end of yml processing -->
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
<!-- test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${project.build.directory}</basedir>
<includes>
<include>classes/static/*.html</include>
<include>classes/static/**/*.html</include>
</includes>
<replacements>
<replacement>
<token>\.css\"</token>
<value>.css?v=${maven.build.timestamp}\"</value>
</replacement>
<replacement>
<token>\.js\"</token>
<value>.js?v=${maven.build.timestamp}\"</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ctrip</id>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| 1 |
apolloconfig/apollo | 3,786 | feature: shared session for multi apollo portal | ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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).
| vdiskg | 2021-06-24T12:21:54Z | 2021-06-27T13:17:09Z | f1eca02f4033d050bd71ede288d1707954d3dea4 | bf80850aab4f70647d6217fc6995588085b91719 | feature: shared session for multi apollo portal. ## What's the purpose of this PR
shared session for multi apollo portal
## Which issue(s) this PR fixes:
Fixes #3672
## Brief changelog
add spring session support and configure the property `spring.session.store-type=none` on the `application.yml` as a default value
## How to use
### 1. No session data-store(dufault)
clear all of the property `spring.session.store-type` on the `properties files(such as application-github.properties)`, `environment variables` and `system properties`
### 2. Redis backed sessions
configure the properties `spring.session.store-type=redis`, `spring.redis.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
### 3. JDBC backed sessions
configure the properties `spring.session.store-type=jdbc`, `spring.datasource.*` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties`
configure the property `spring.session.jdbc.initialize-schema=always` on the `properties files(such as application-github.properties)`, `environment variables` or `system properties` to create the table automatically while first time startup and then configure the property `spring.session.jdbc.initialize-schema=never`
## Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [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/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
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: none
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 |